Skip to content

Commit

Permalink
Switch to registry.k8s.io registry (#193)
Browse files Browse the repository at this point in the history
  • Loading branch information
@afritzler
afritzler authored Mar 31, 2023
1 parent 3955fd7 commit bcf20bf
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 15 deletions.
12 changes: 8 additions & 4 deletions config/crd/bases/matryoshka.onmetal.de_kubeapiservers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,8 @@ spec:
defined in spec.resourceClaims, that are used
by this container. \n This is an alpha field and
requires enabling the DynamicResourceAllocation
feature gate. \n This field is immutable."
feature gate. \n This field is immutable. It can
only be set for containers."
items:
description: ResourceClaim references one entry
in PodSpec.ResourceClaims.
Expand Down Expand Up @@ -2324,7 +2325,8 @@ spec:
defined in spec.resourceClaims, that are used
by this container. \n This is an alpha field and
requires enabling the DynamicResourceAllocation
feature gate. \n This field is immutable."
feature gate. \n This field is immutable. It can
only be set for containers."
items:
description: ResourceClaim references one entry
in PodSpec.ResourceClaims.
Expand Down Expand Up @@ -3486,7 +3488,8 @@ spec:
that are used by this container. \n
This is an alpha field and requires
enabling the DynamicResourceAllocation
feature gate. \n This field is immutable."
feature gate. \n This field is immutable.
It can only be set for containers."
items:
description: ResourceClaim references
one entry in PodSpec.ResourceClaims.
Expand Down Expand Up @@ -5752,7 +5755,8 @@ spec:
defined in spec.resourceClaims, that are used by
this container. \n This is an alpha field and requires
enabling the DynamicResourceAllocation feature gate.
\n This field is immutable."
\n This field is immutable. It can only be set for
containers."
items:
description: ResourceClaim references one entry
in PodSpec.ResourceClaims.
Expand Down
12 changes: 8 additions & 4 deletions config/crd/bases/matryoshka.onmetal.de_kubecontrollermanagers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,8 @@ spec:
defined in spec.resourceClaims, that are used
by this container. \n This is an alpha field and
requires enabling the DynamicResourceAllocation
feature gate. \n This field is immutable."
feature gate. \n This field is immutable. It can
only be set for containers."
items:
description: ResourceClaim references one entry
in PodSpec.ResourceClaims.
Expand Down Expand Up @@ -2323,7 +2324,8 @@ spec:
defined in spec.resourceClaims, that are used
by this container. \n This is an alpha field and
requires enabling the DynamicResourceAllocation
feature gate. \n This field is immutable."
feature gate. \n This field is immutable. It can
only be set for containers."
items:
description: ResourceClaim references one entry
in PodSpec.ResourceClaims.
Expand Down Expand Up @@ -3485,7 +3487,8 @@ spec:
that are used by this container. \n
This is an alpha field and requires
enabling the DynamicResourceAllocation
feature gate. \n This field is immutable."
feature gate. \n This field is immutable.
It can only be set for containers."
items:
description: ResourceClaim references
one entry in PodSpec.ResourceClaims.
Expand Down Expand Up @@ -5755,7 +5758,8 @@ spec:
defined in spec.resourceClaims, that are used by
this container. \n This is an alpha field and requires
enabling the DynamicResourceAllocation feature gate.
\n This field is immutable."
\n This field is immutable. It can only be set for
containers."
items:
description: ResourceClaim references one entry
in PodSpec.ResourceClaims.
Expand Down
12 changes: 8 additions & 4 deletions config/crd/bases/matryoshka.onmetal.de_kubeschedulers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -959,7 +959,8 @@ spec:
defined in spec.resourceClaims, that are used
by this container. \n This is an alpha field and
requires enabling the DynamicResourceAllocation
feature gate. \n This field is immutable."
feature gate. \n This field is immutable. It can
only be set for containers."
items:
description: ResourceClaim references one entry
in PodSpec.ResourceClaims.
Expand Down Expand Up @@ -2295,7 +2296,8 @@ spec:
defined in spec.resourceClaims, that are used
by this container. \n This is an alpha field and
requires enabling the DynamicResourceAllocation
feature gate. \n This field is immutable."
feature gate. \n This field is immutable. It can
only be set for containers."
items:
description: ResourceClaim references one entry
in PodSpec.ResourceClaims.
Expand Down Expand Up @@ -3457,7 +3459,8 @@ spec:
that are used by this container. \n
This is an alpha field and requires
enabling the DynamicResourceAllocation
feature gate. \n This field is immutable."
feature gate. \n This field is immutable.
It can only be set for containers."
items:
description: ResourceClaim references
one entry in PodSpec.ResourceClaims.
Expand Down Expand Up @@ -5838,7 +5841,8 @@ spec:
defined in spec.resourceClaims, that are used by
this container. \n This is an alpha field and requires
enabling the DynamicResourceAllocation feature gate.
\n This field is immutable."
\n This field is immutable. It can only be set for
containers."
items:
description: ResourceClaim references one entry
in PodSpec.ResourceClaims.
Expand Down
2 changes: 1 addition & 1 deletion controllers/matryoshka/internal/kubeapiserver/kubeapiserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ func (r *Resolver) probeForPath(ctx context.Context, s *memorystore.Store, serve
func (r *Resolver) apiServerContainer(server *matryoshkav1alpha1.KubeAPIServer) (*corev1.Container, error) {
container := &corev1.Container{
Name: "kube-apiserver",
Image: fmt.Sprintf("k8s.gcr.io/kube-apiserver:v%s", server.Spec.Version),
Image: fmt.Sprintf("registry.k8s.io/kube-apiserver:v%s", server.Spec.Version),
Command: r.apiServerCommand(server),
Ports: []corev1.ContainerPort{
{
Expand Down
2 changes: 1 addition & 1 deletion controllers/matryoshka/internal/kubecontrollermanager/kubecontrollermanager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ func (r *Resolver) updateDeploymentChecksums(ctx context.Context, s *memorystore
func (r *Resolver) controllerManagerContainer(_ context.Context, _ *memorystore.Store, kcm *matryoshkav1alpha1.KubeControllerManager) (*corev1.Container, error) {
container := &corev1.Container{
Name: "kube-controller-manager",
Image: fmt.Sprintf("k8s.gcr.io/kube-controller-manager:v%s", kcm.Spec.Version),
Image: fmt.Sprintf("registry.k8s.io/kube-controller-manager:v%s", kcm.Spec.Version),
Command: r.kubeControllerManagerCommand(kcm),
VolumeMounts: r.kubeControllerManagerVolumeMounts(kcm),
LivenessProbe: &corev1.Probe{
Expand Down
2 changes: 1 addition & 1 deletion controllers/matryoshka/internal/kubescheduler/kubescheduler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ func (r *Resolver) updateDeploymentChecksums(ctx context.Context, s *memorystore
func (r *Resolver) schedulerContainer(_ context.Context, _ *memorystore.Store, ks *matryoshkav1alpha1.KubeScheduler) (*corev1.Container, error) {
container := &corev1.Container{
Name: "kube-scheduler",
Image: fmt.Sprintf("k8s.gcr.io/kube-scheduler:v%s", ks.Spec.Version),
Image: fmt.Sprintf("registry.k8s.io/kube-scheduler:v%s", ks.Spec.Version),
Command: r.kubeSchedulerCommand(ks),
VolumeMounts: r.kubeSchedulerVolumeMounts(ks),
LivenessProbe: &corev1.Probe{
Expand Down

0 comments on commit bcf20bf

Please sign in to comment.