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.

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

fix: generate config with only globalImageRegistryMirror set #362

Merged
merged 4 commits into from
Feb 15, 2024

Conversation

dkoshkin
Copy link
Contributor

@dkoshkin dkoshkin commented Feb 14, 2024

Follow up to #359

I noticed that when the only setting globalImageRegistryMirror without imageRegistries that the credential provider configs were not being generated.

Tested locally and verified in the Docker container :

kubectl get kubeadmconfig.bootstrap.cluster.x-k8s.io/docker-quick-start-helm-addon-cilium-dgz8d-dk7c5 -o yaml | grep "path:"
        audit-log-path: /var/log/audit/kube-apiserver-audit.log
    path: /etc/kubernetes/audit-policy/apiserver-audit-policy.yaml
    path: /etc/konvoy/install-kubelet-credential-providers.sh
    path: /etc/kubernetes/image-credential-provider-config.yaml
    path: /etc/kubernetes/dynamic-credential-provider-config.yaml
    path: /etc/kubernetes/static-image-credentials.json
    path: /etc/containerd/certs.d/_default/hosts.toml
root@docker-quick-start-helm-addon-cilium-md-0-7zv45-plbrx-wv86j:/# ls -lat /etc/kubernetes/
total 44
drwxr-xr-x 1 root root 4096 Feb 14 23:02 ..
drwxr-xr-x 1 root root 4096 Feb 14 22:59 .
drwxr-xr-x 4 root root 4096 Feb 14 22:59 node-feature-discovery
-rw------- 1 root root 1911 Feb 14 22:59 kubelet.conf
drwxr-xr-x 2 root root 4096 Feb 14 22:59 pki
drwxr-xr-x 2 root root 4096 Feb 14 22:59 image-credential-provider
-rw------- 1 root root  248 Feb 14 22:59 static-image-credentials.json
-rw------- 1 root root  694 Feb 14 22:59 dynamic-credential-provider-config.yaml
-rw------- 1 root root  383 Feb 14 22:59 image-credential-provider-config.yaml
drwxr-xr-x 2 root root 4096 May 25  2023 manifests

@dkoshkin dkoshkin self-assigned this Feb 14, 2024
@github-actions github-actions bot added the fix label Feb 14, 2024
@dkoshkin

This comment was marked as resolved.

@dkoshkin dkoshkin force-pushed the dkoshkin/fix-only-globalImageRegistryMirror branch 2 times, most recently from abb1e9c to 54085f5 Compare February 15, 2024 04:19
@dkoshkin dkoshkin force-pushed the dkoshkin/fix-only-globalImageRegistryMirror branch from 54085f5 to f59c0f0 Compare February 15, 2024 06:22
@dkoshkin dkoshkin changed the title fix: generate config with only globalImageRegistryMirror set" fix: generate config with only globalImageRegistryMirror set Feb 15, 2024
@github-actions github-actions bot added fix and removed fix labels Feb 15, 2024
Copy link
Member

@jimmidyson jimmidyson left a comment

Choose a reason for hiding this comment

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

Thank you for updating the comments! Now I understand! 😅

@dkoshkin dkoshkin merged commit 9f81d40 into main Feb 15, 2024
12 checks passed
@dkoshkin dkoshkin deleted the dkoshkin/fix-only-globalImageRegistryMirror branch February 15, 2024 17:50
@github-actions github-actions bot mentioned this pull request Feb 15, 2024
dkoshkin pushed a commit that referenced this pull request Feb 15, 2024
🤖 I have created a release *beep* *boop*
---


## 0.4.2 (2024-02-15)

<!-- Release notes generated using configuration in .github/release.yaml
at main -->

## What's Changed
### Fixes 🔧
* fix: remove word konvoy/ and use cre/ by @dkoshkin in
#365
* fix: v2/ in Containerd mirror path by @dkoshkin in
#363
* fix: set config_path in Containerd config by @dkoshkin in
#364
* fix: generate config with only globalImageRegistryMirror set by
@dkoshkin in
#362
### Other Changes
* refactor: Fix formatting issue by @jimmidyson in
#368
* build: Include CAPX APis by @jimmidyson in
#367
* build: Upgrade golangci-lint to 1.56.1 by @jimmidyson in
#369
* docs: Update examples to be clusterctl templates by @jimmidyson in
#361


**Full Changelog**:
v0.4.1...v0.4.2

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
dkoshkin added a commit that referenced this pull request Feb 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants