kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use quay images for cilium

This commit is contained in:
Ole Markus With 2021-06-08 22:39:50 +02:00
parent 424ed25f25
commit c162013a3c
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodeup/pkg/model/networking/cilium.go
View File

@ -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)

8
upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.8.yaml.template
View File

@ -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"

8
upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template
View File

@ -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

8
upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.16-v1.10.yaml.template
View File

@ -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

2
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
View File

@ -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: