From 3c417a5a0bf15c4ca9e642fccbd388e025170478 Mon Sep 17 00:00:00 2001 From: Dimitri Koshkin Date: Thu, 15 Feb 2024 00:02:15 -0800 Subject: [PATCH] fix: remove word konvoy/ and use cre/ (#365) The word "konvoy" doesn't mean anything in this repo, renamed it to more generic "cre". We can rename it to something else if this repo is renamed in future. --- .../credential_provider_install_files.go | 2 +- .../credentials/tests/generate_patches.go | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/credential_provider_install_files.go b/pkg/handlers/generic/mutation/imageregistries/credentials/credential_provider_install_files.go index 4cb6dd633..ff3614b26 100644 --- a/pkg/handlers/generic/mutation/imageregistries/credentials/credential_provider_install_files.go +++ b/pkg/handlers/generic/mutation/imageregistries/credentials/credential_provider_install_files.go @@ -14,7 +14,7 @@ import ( const ( //nolint:gosec // Does not contain hard coded credentials. - installKubeletCredentialProvidersScriptOnRemote = "/etc/konvoy/install-kubelet-credential-providers.sh" + installKubeletCredentialProvidersScriptOnRemote = "/etc/cre/install-kubelet-credential-providers.sh" installKubeletCredentialProvidersScriptOnRemoteCommand = "/bin/bash " + installKubeletCredentialProvidersScriptOnRemote diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/tests/generate_patches.go b/pkg/handlers/generic/mutation/imageregistries/credentials/tests/generate_patches.go index 7f15ae67a..e77d79448 100644 --- a/pkg/handlers/generic/mutation/imageregistries/credentials/tests/generate_patches.go +++ b/pkg/handlers/generic/mutation/imageregistries/credentials/tests/generate_patches.go @@ -69,7 +69,7 @@ func TestGeneratePatches( Path: "/spec/template/spec/kubeadmConfigSpec/files", ValueMatcher: gomega.ContainElements( gomega.HaveKeyWithValue( - "path", "/etc/konvoy/install-kubelet-credential-providers.sh", + "path", "/etc/cre/install-kubelet-credential-providers.sh", ), gomega.HaveKeyWithValue( "path", "/etc/kubernetes/image-credential-provider-config.yaml", @@ -83,7 +83,7 @@ func TestGeneratePatches( Operation: "add", Path: "/spec/template/spec/kubeadmConfigSpec/preKubeadmCommands", ValueMatcher: gomega.ContainElement( - "/bin/bash /etc/konvoy/install-kubelet-credential-providers.sh", + "/bin/bash /etc/cre/install-kubelet-credential-providers.sh", ), }, { @@ -132,7 +132,7 @@ func TestGeneratePatches( Path: "/spec/template/spec/kubeadmConfigSpec/files", ValueMatcher: gomega.ContainElements( gomega.HaveKeyWithValue( - "path", "/etc/konvoy/install-kubelet-credential-providers.sh", + "path", "/etc/cre/install-kubelet-credential-providers.sh", ), gomega.HaveKeyWithValue( "path", "/etc/kubernetes/image-credential-provider-config.yaml", @@ -149,7 +149,7 @@ func TestGeneratePatches( Operation: "add", Path: "/spec/template/spec/kubeadmConfigSpec/preKubeadmCommands", ValueMatcher: gomega.ContainElement( - "/bin/bash /etc/konvoy/install-kubelet-credential-providers.sh", + "/bin/bash /etc/cre/install-kubelet-credential-providers.sh", ), }, { @@ -198,7 +198,7 @@ func TestGeneratePatches( Path: "/spec/template/spec/files", ValueMatcher: gomega.ContainElements( gomega.HaveKeyWithValue( - "path", "/etc/konvoy/install-kubelet-credential-providers.sh", + "path", "/etc/cre/install-kubelet-credential-providers.sh", ), gomega.HaveKeyWithValue( "path", "/etc/kubernetes/image-credential-provider-config.yaml", @@ -212,7 +212,7 @@ func TestGeneratePatches( Operation: "add", Path: "/spec/template/spec/preKubeadmCommands", ValueMatcher: gomega.ContainElement( - "/bin/bash /etc/konvoy/install-kubelet-credential-providers.sh", + "/bin/bash /etc/cre/install-kubelet-credential-providers.sh", ), }, { @@ -258,7 +258,7 @@ func TestGeneratePatches( Path: "/spec/template/spec/files", ValueMatcher: gomega.ContainElements( gomega.HaveKeyWithValue( - "path", "/etc/konvoy/install-kubelet-credential-providers.sh", + "path", "/etc/cre/install-kubelet-credential-providers.sh", ), gomega.HaveKeyWithValue( "path", "/etc/kubernetes/image-credential-provider-config.yaml", @@ -275,7 +275,7 @@ func TestGeneratePatches( Operation: "add", Path: "/spec/template/spec/preKubeadmCommands", ValueMatcher: gomega.ContainElement( - "/bin/bash /etc/konvoy/install-kubelet-credential-providers.sh", + "/bin/bash /etc/cre/install-kubelet-credential-providers.sh", ), }, {