Skip to content

fix: hardcode the kubectl tag in registry syncer Pods #1262

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

Merged
merged 1 commit into from
Aug 13, 2025
Merged

fix: hardcode the kubectl tag in registry syncer Pods #1262

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
4 changes: 2 additions & 2 deletions charts/cluster-api-runtime-extensions-nutanix/addons/registry-syncer/values-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ initContainers:
# In the case when it runs as a Job, it will prematurely exit.
# This init container will wait for the destination registry to be ready.
- name: wait-for-registry
image: ghcr.io/d2iq-labs/kubectl-betterwait:{{ .KubernetesVersion }}
image: ghcr.io/d2iq-labs/kubectl-betterwait:v1.33.3
args:
- --for=condition=Ready
- --timeout=-1s # a negative number here means wait forever
Expand All @@ -17,7 +17,7 @@ initContainers:
name: kubeconfig
readOnly: true
- name: port-forward-registry
image: ghcr.io/d2iq-labs/kubectl-betterwait:{{ .KubernetesVersion }}
image: ghcr.io/d2iq-labs/kubectl-betterwait:v1.33.3
command:
- /bin/kubectl
args:
Expand Down
5 changes: 1 addition & 4 deletions pkg/handlers/generic/lifecycle/registry/syncer/syncer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,6 @@ func templateValues(cluster *clusterv1.Cluster, text string) (string, error) {
type input struct {
CusterName string

KubernetesVersion string

SourceRegistryAddress string

DestinationRegistryAnyPodName string
Expand All @@ -224,8 +222,7 @@ func templateValues(cluster *clusterv1.Cluster, text string) (string, error) {
}

templateInput := input{
CusterName: cluster.Name,
KubernetesVersion: cluster.Spec.Topology.Version,
CusterName: cluster.Name,
// FIXME: This assumes that the source and destination registry names are the same.
// This is true now with a single registry addon provider, but may not be true in the future.
SourceRegistryAddress: registryMetadata.AddressFromClusterNetwork,
Expand Down
4 changes: 2 additions & 2 deletions pkg/handlers/generic/lifecycle/registry/syncer/testdata/registry-syncer-template.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ initContainers:
# In the case when it runs as a Job, it will prematurely exit.
# This init container will wait for the destination registry to be ready.
- name: wait-for-registry
image: ghcr.io/d2iq-labs/kubectl-betterwait:{{ .KubernetesVersion }}
image: ghcr.io/d2iq-labs/kubectl-betterwait:v1.30.100
args:
- --for=condition=Ready
- --timeout=-1s # a negative number here means wait forever
Expand All @@ -17,7 +17,7 @@ initContainers:
name: kubeconfig
readOnly: true
- name: port-forward-registry
image: ghcr.io/d2iq-labs/kubectl-betterwait:{{ .KubernetesVersion }}
image: ghcr.io/d2iq-labs/kubectl-betterwait:v1.30.100
command:
- /bin/kubectl
args:
Expand Down
Loading