15308555518/ kubekey
1
0
Fork 0
mirror of https://github.com/kubesphere/kubekey.git synced 2025-12-25 17:12:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugfix: Push Image Credential (#2879)

This commit is contained in:
Mr-Mu 2025-12-02 15:20:59 +08:00 committed by GitHub
parent 67fd6098c1
commit b64db7134d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/core/playbooks/artifact_images.yaml
View File

@ -59,13 +59,12 @@
- name: PushImage | Push images package to image registry
image:
push:
auths:
- repo: "{{ .image_registry.auth.registry }}"
username: "{{ .image_registry.auth.username }}"
password: "{{ .image_registry.auth.password }}"
insecure: true
images_dir: >-
{{ .binary_dir }}/images/
dest: >-
{{ .image_registry.auth.registry }}/{{ .module.image.src.reference.repository }}:{{ .module.image.src.reference.reference }}
username: >-
{{ .image_registry.auth.username }}
password: >-
{{ .image_registry.auth.password }}
skip_tls_verify: true

10
builtin/core/roles/image-registry/tasks/main.yaml
View File

@ -32,12 +32,12 @@
run_once: true
image:
push:
auths:
- repo: "{{ .image_registry.auth.registry }}"
username: "{{ .image_registry.auth.username }}"
password: "{{ .image_registry.auth.password }}"
insecure: true
images_dir: >-
{{ .binary_dir }}/images/
dest: >-
{{ .image_registry.auth.registry }}/{{ .module.image.src.reference.repository }}:{{ .module.image.src.reference.reference }}
username: >-
{{ .image_registry.auth.username }}
password: >-
{{ .image_registry.auth.password }}
skip_tls_verify: true

4
cmd/kk/app/options/builtin/init.go
View File

@ -93,9 +93,9 @@ func (o *InitOSOptions) completeConfig() error {
} else {
// set binary dir if not set
if _, _, err := unstructured.NestedString(o.CommonOptions.Config.Value(), _const.BinaryDir); err != nil {
// workdir should set by CommonOptions
// binary should set by CommonOptions
if err := unstructured.SetNestedField(o.CommonOptions.Config.Value(), filepath.Join(wd, "kubekey"), _const.BinaryDir); err != nil {
return errors.Wrapf(err, "failed to set %q in config", _const.Workdir)
return errors.Wrapf(err, "failed to set %q in config", _const.BinaryDir)
}
}
}