rke2-charts/packages/rke2-cilium/generated-changes/patch/values.yaml.patch

183 lines
5.3 KiB
Diff

--- charts-original/values.yaml
+++ charts/values.yaml
@@ -82,12 +82,10 @@
# -- Agent container image.
image:
override: ~
- repository: quay.io/cilium/cilium
+ repository: rancher/mirrored-cilium-cilium
tag: v1.11.4
pullPolicy: IfNotPresent
- # cilium-digest
- digest: "sha256:d9d4c7759175db31aa32eaa68274bb9355d468fbc87e23123c80052e3ed63116"
- useDigest: true
+ useDigest: false
# -- Pod affinity for cilium-agent.
affinity:
@@ -99,12 +97,6 @@
operator: In
values:
- linux
- # Compatible with Kubernetes 1.12.x and 1.13.x
- - matchExpressions:
- - key: beta.kubernetes.io/os
- operator: In
- values:
- - linux
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector:
@@ -569,7 +561,7 @@
hubble:
# -- Enable Hubble (true by default).
- enabled: true
+ enabled: false
# -- Buffer size of the channel Hubble uses to receive monitor events. If this
# value is not set, the queue size is set to the default monitor queue size.
@@ -705,7 +697,8 @@
# -- Node labels for pod assignment
# ref: https://kubernetes.io/docs/user-guide/node-selection/
- nodeSelector: {}
+ nodeSelector:
+ kubernetes.io/os: linux
# -- Annotations to be added to hubble-relay pods
podAnnotations: {}
@@ -878,7 +871,8 @@
# -- Node labels for pod assignment
# ref: https://kubernetes.io/docs/user-guide/node-selection/
- nodeSelector: {}
+ nodeSelector:
+ kubernetes.io/os: linux
# -- Node tolerations for pod assignment on nodes with taints
# ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
@@ -939,7 +933,7 @@
ipam:
# -- Configure IP Address Management mode.
# ref: https://docs.cilium.io/en/stable/concepts/networking/ipam/
- mode: "cluster-pool"
+ mode: "kubernetes"
operator:
# -- Deprecated in favor of ipam.operator.clusterPoolIPv4PodCIDRList.
# IPv4 CIDR range to delegate to individual nodes for IPAM.
@@ -1136,7 +1130,7 @@
# -- Configure prometheus metrics on the configured port at /metrics
prometheus:
- enabled: false
+ enabled: true
port: 9090
serviceMonitor:
# -- Enable service monitors.
@@ -1265,7 +1259,8 @@
# -- Node labels for cilium-etcd-operator pod assignment
# ref: https://kubernetes.io/docs/user-guide/node-selection/
- nodeSelector: {}
+ nodeSelector:
+ kubernetes.io/os: linux
# -- Annotations to be added to cilium-etcd-operator pods
podAnnotations: {}
@@ -1326,17 +1321,9 @@
# -- cilium-operator image.
image:
override: ~
- repository: quay.io/cilium/operator
+ repository: rancher/mirrored-cilium-operator
tag: v1.11.4
- # operator-generic-digest
- genericDigest: "sha256:bf75ad0dc47691a3a519b8ab148ed3a792ffa2f1e309e6efa955f30a40e95adc"
- # operator-azure-digest
- azureDigest: "sha256:e507e3ece5a3cb45daf2e879bd3888681f297c76523661551ecdd38d8c46c798"
- # operator-aws-digest
- awsDigest: "sha256:3ef7a13d962d977815d12846c04fade989195722ba6628bffaf865fb46d4b6a0"
- # operator-alibabacloud-digest
- alibabacloudDigest: "sha256:bb6eb1d389d87d435b6ddb7c32955459ccdea15d6542da2bcb38738c8dca15d9"
- useDigest: true
+ useDigest: false
pullPolicy: IfNotPresent
suffix: ""
@@ -1405,7 +1392,8 @@
# -- Node labels for cilium-operator pod assignment
# ref: https://kubernetes.io/docs/user-guide/node-selection/
- nodeSelector: {}
+ nodeSelector:
+ kubernetes.io/os: linux
# -- Annotations to be added to cilium-operator pods
podAnnotations: {}
@@ -1445,7 +1433,7 @@
# -- Enable prometheus metrics for cilium-operator on the configured port at
# /metrics
prometheus:
- enabled: false
+ enabled: true
port: 6942
serviceMonitor:
# -- Enable service monitors.
@@ -1462,12 +1450,12 @@
nodeinit:
# -- Enable the node initialization DaemonSet
- enabled: false
+ enabled: true
# -- node-init image.
image:
override: ~
- repository: quay.io/cilium/startup-script
+ repository: rancher/mirrored-cilium-startup-script
tag: 62bfbe88c17778aad7bef9fa57ff9e2d4a9ba0d8
pullPolicy: IfNotPresent
@@ -1510,7 +1498,8 @@
# -- Node labels for nodeinit pod assignment
# ref: https://kubernetes.io/docs/user-guide/node-selection/
- nodeSelector: {}
+ nodeSelector:
+ kubernetes.io/os: linux
# -- Annotations to be added to node-init pods.
podAnnotations: {}
@@ -1546,11 +1535,9 @@
# -- Cilium pre-flight image.
image:
override: ~
- repository: quay.io/cilium/cilium
+ repository: rancher/mirrored-cilium-cilium
tag: v1.11.4
- # cilium-digest
- digest: "sha256:d9d4c7759175db31aa32eaa68274bb9355d468fbc87e23123c80052e3ed63116"
- useDigest: true
+ useDigest: false
pullPolicy: IfNotPresent
# -- The priority class to use for the preflight pod.
@@ -1600,7 +1587,8 @@
# -- Node labels for preflight pod assignment
# ref: https://kubernetes.io/docs/user-guide/node-selection/
- nodeSelector: {}
+ nodeSelector:
+ kubernetes.io/os: linux
# -- Annotations to be added to preflight pods
podAnnotations: {}
@@ -1840,3 +1828,6 @@
# -- Configure whether to enable auto detect of terminating state for endpoints
# in order to support graceful termination.
enableK8sTerminatingEndpoint: true
+
+global:
+ systemDefaultRegistry: ""