Skip to content
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

Use the full operator instead of the generic one #11312

Merged
merged 1 commit into from
Apr 24, 2021
Merged

Use the full operator instead of the generic one #11312

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 upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,7 @@ spec:
- --config-dir=/tmp/cilium/config-map
- --debug=$(CILIUM_DEBUG)
command:
- cilium-operator-generic
- cilium-operator
env:
- name: K8S_NODE_NAME
valueFrom:
Expand All @@ -817,7 +817,7 @@ spec:
value: "{{ $.MasterInternalName }}"
- name: KUBERNETES_SERVICE_PORT
value: "443"
image: "docker.io/cilium/operator-generic:{{ .Version }}"
image: "docker.io/cilium/operator:{{ .Version }}"
imagePullPolicy: IfNotPresent
name: cilium-operator
{{ if .EnablePrometheusMetrics }}
Expand Down
2 changes: 1 addition & 1 deletion upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ spec:
version: 1.17.0
- id: k8s-1.12
manifest: networking.cilium.io/k8s-1.12-v1.9.yaml
manifestHash: dea8534ba3aa267f877f7c2f68a1899fe869e1d3
manifestHash: 0e59024a8025c5a3beb4c2c707b03d5233e53c7c
name: networking.cilium.io
needsRollingUpdate: all
selector:
Expand Down