Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: move shell2http image to kb repository #8539

Closed
wants to merge 1 commit into from
Closed

feat: move shell2http image to kb repository #8539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions deploy/helm/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ spec:
value: {{ .Values.image.imagePullSecrets | toJson | quote }}
- name: KUBEBLOCKS_TOOLS_IMAGE
value: "{{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.tools.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
- name: KUBEBLOCKS_IMAGE_REGISTRY
value: "{{ .Values.image.registry | default "docker.io" }}"
- name: KUBEBLOCKS_SERVICEACCOUNT_NAME
value: {{ include "kubeblocks.serviceAccountName" . }}
{{- if .Capabilities.APIVersions.Has "snapshot.storage.k8s.io/v1" }}
Expand Down
1 change: 1 addition & 0 deletions pkg/constant/const.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const (
KBToolsImage = "KUBEBLOCKS_TOOLS_IMAGE"
KBImagePullPolicy = "KUBEBLOCKS_IMAGE_PULL_POLICY"
KBImagePullSecrets = "KUBEBLOCKS_IMAGE_PULL_SECRETS"
KBImageRegistry = "KUBEBLOCKS_IMAGE_REGISTRY"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/instanceset/object_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ func injectCustomRoleProbeContainer(its *workloads.InstanceSet, template *corev1
agentPath := strings.Join([]string{roleAgentVolumeMountPath, roleAgentName}, "/")
initContainer := corev1.Container{
Name: roleAgentInstallerName,
Image: shell2httpImage,
Image: strings.Join([]string{viper.GetString(constant.KBImageRegistry), shell2httpImage}, "/"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should change shell2httpImage to "apecloud/shell2http:1.16.0"? Because the original repository "msoap" is not under our control. @free6om

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not like that, the whole path is like "docker.io/msoap/shell2http:1.16.0" or "apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/msoap/shell2http:1.16.0".

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no any msoap group in apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com

ImagePullPolicy: corev1.PullIfNotPresent,
VolumeMounts: []corev1.VolumeMount{agentVolumeMount},
Command: []string{
Expand Down
Loading