From c162013a3cd93e27ee33e15ee7fa920f0988ddc5 Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Tue, 8 Jun 2021 22:39:50 +0200 Subject: [PATCH] Use quay images for cilium --- nodeup/pkg/model/networking/cilium.go | 2 +- .../networking.cilium.io/k8s-1.12-v1.8.yaml.template | 8 ++++---- .../networking.cilium.io/k8s-1.12-v1.9.yaml.template | 8 ++++---- .../networking.cilium.io/k8s-1.16-v1.10.yaml.template | 8 ++++---- .../tests/bootstrapchannelbuilder/cilium/manifest.yaml | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/nodeup/pkg/model/networking/cilium.go b/nodeup/pkg/model/networking/cilium.go index 667b694203..87bd5ec2c9 100644 --- a/nodeup/pkg/model/networking/cilium.go +++ b/nodeup/pkg/model/networking/cilium.go @@ -53,7 +53,7 @@ func (b *CiliumBuilder) Build(c *fi.ModelBuilderContext) error { return err } - image := "docker.io/cilium/cilium:" + cilium.Version + image := "quay.io/cilium/cilium:" + cilium.Version b.WarmPullImage(c, image) diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.8.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.8.yaml.template index 58aa7a3836..b373dfcf31 100644 --- a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.8.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.8.yaml.template @@ -488,7 +488,7 @@ spec: value: {{ . }} {{ end }} {{ with .Networking.Cilium }} - image: "docker.io/cilium/cilium:{{ .Version }}" + image: "quay.io/cilium/cilium:{{ .Version }}" imagePullPolicy: IfNotPresent lifecycle: postStart: @@ -612,7 +612,7 @@ spec: key: wait-bpf-mount name: cilium-config optional: true - image: "docker.io/cilium/cilium:{{ .Version }}" + image: "quay.io/cilium/cilium:{{ .Version }}" ## end of `with .Networking.Cilium` #{{ end }} imagePullPolicy: IfNotPresent @@ -774,7 +774,7 @@ spec: - name: KUBERNETES_SERVICE_PORT value: "443" {{ with .Networking.Cilium }} - image: "docker.io/cilium/operator:{{ .Version }}" + image: "quay.io/cilium/operator:{{ .Version }}" imagePullPolicy: IfNotPresent name: cilium-operator {{ if .EnablePrometheusMetrics }} @@ -901,7 +901,7 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: hubble-relay - image: "docker.io/cilium/hubble-relay:{{ .Version }}" + image: "quay.io/cilium/hubble-relay:{{ .Version }}" imagePullPolicy: IfNotPresent command: - "hubble-relay" diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template index c056ab4797..c290bfb5c7 100644 --- a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template @@ -608,7 +608,7 @@ spec: - name: CILIUM_ENABLE_POLICY value: {{ . }} {{ end }} - image: "docker.io/cilium/cilium:{{ .Version }}" + image: "quay.io/cilium/cilium:{{ .Version }}" imagePullPolicy: IfNotPresent lifecycle: postStart: @@ -702,7 +702,7 @@ spec: key: wait-bpf-mount name: cilium-config optional: true - image: "docker.io/cilium/cilium:{{ .Version }}" + image: "quay.io/cilium/cilium:{{ .Version }}" imagePullPolicy: IfNotPresent name: clean-cilium-state securityContext: @@ -849,7 +849,7 @@ spec: value: "{{ $.MasterInternalName }}" - name: KUBERNETES_SERVICE_PORT value: "443" - image: "docker.io/cilium/operator:{{ .Version }}" + image: "quay.io/cilium/operator:{{ .Version }}" imagePullPolicy: IfNotPresent name: cilium-operator {{ if .EnablePrometheusMetrics }} @@ -949,7 +949,7 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: hubble-relay - image: "docker.io/cilium/hubble-relay:{{ .Version }}" + image: "quay.io/cilium/hubble-relay:{{ .Version }}" imagePullPolicy: IfNotPresent command: - hubble-relay diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.10.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.10.yaml.template index bccf84fc3c..2633fbf71b 100644 --- a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.10.yaml.template +++ b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.10.yaml.template @@ -628,7 +628,7 @@ spec: - name: CILIUM_ENABLE_POLICY value: {{ . }} {{ end }} - image: "docker.io/cilium/cilium:{{ .Version }}" + image: "quay.io/cilium/cilium:{{ .Version }}" imagePullPolicy: IfNotPresent lifecycle: postStart: @@ -723,7 +723,7 @@ spec: key: wait-bpf-mount name: cilium-config optional: true - image: "docker.io/cilium/cilium:{{ .Version }}" + image: "quay.io/cilium/cilium:{{ .Version }}" imagePullPolicy: IfNotPresent name: clean-cilium-state securityContext: @@ -870,7 +870,7 @@ spec: value: "{{ $.MasterInternalName }}" - name: KUBERNETES_SERVICE_PORT value: "443" - image: "docker.io/cilium/operator:{{ .Version }}" + image: "quay.io/cilium/operator:{{ .Version }}" imagePullPolicy: IfNotPresent name: cilium-operator {{ if .EnablePrometheusMetrics }} @@ -970,7 +970,7 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: hubble-relay - image: "docker.io/cilium/hubble-relay:{{ .Version }}" + image: "quay.io/cilium/hubble-relay:{{ .Version }}" imagePullPolicy: IfNotPresent command: - hubble-relay diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml index 7ab8ebaa95..9cec09887a 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml @@ -61,7 +61,7 @@ spec: version: 1.17.0 - id: k8s-1.16 manifest: networking.cilium.io/k8s-1.16-v1.10.yaml - manifestHash: 461df69665b35c37bc1cc503edba447c205af8f3 + manifestHash: 27abb72e8f4dfeae4442a1fb3aa949b8ecc98917 name: networking.cilium.io needsRollingUpdate: all selector: