mirror of https://git.rancher.io/rke2-charts
192 lines
5.6 KiB
Diff
192 lines
5.6 KiB
Diff
--- charts-original/values.yaml
|
|
+++ charts/values.yaml
|
|
@@ -81,12 +81,10 @@
|
|
|
|
# -- Agent container image.
|
|
image:
|
|
- repository: quay.io/cilium/cilium
|
|
+ repository: rancher/mirrored-cilium-cilium
|
|
tag: v1.11.2
|
|
pullPolicy: IfNotPresent
|
|
- # cilium-digest
|
|
- digest: "sha256:4332428fbb528bda32fffe124454458c9b716c86211266d1a03c4ddf695d7f60"
|
|
- useDigest: true
|
|
+ useDigest: false
|
|
|
|
# -- Pod affinity for cilium-agent.
|
|
affinity:
|
|
@@ -98,12 +96,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:
|
|
@@ -561,7 +553,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.
|
|
@@ -696,7 +688,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: {}
|
|
@@ -866,7 +859,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/
|
|
@@ -927,7 +921,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.
|
|
@@ -1124,7 +1118,7 @@
|
|
|
|
# -- Configure prometheus metrics on the configured port at /metrics
|
|
prometheus:
|
|
- enabled: false
|
|
+ enabled: true
|
|
port: 9090
|
|
serviceMonitor:
|
|
# -- Enable service monitors.
|
|
@@ -1252,7 +1246,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: {}
|
|
@@ -1312,17 +1307,9 @@
|
|
|
|
# -- cilium-operator image.
|
|
image:
|
|
- repository: quay.io/cilium/operator
|
|
+ repository: rancher/mirrored-cilium-operator
|
|
tag: v1.11.2
|
|
- # operator-generic-digest
|
|
- genericDigest: "sha256:4c8bea6818ee3e4932f99e9c1d7efa88b8c0f3cd516160caec878406531e45e7"
|
|
- # operator-azure-digest
|
|
- azureDigest: "sha256:6221ea3e47ae6ad4ab226d7dc886d74ad666e54f50b85863b09d913ae06a497d"
|
|
- # operator-aws-digest
|
|
- awsDigest: "sha256:abb7af69d6679e64dab9d7a87eae73377b3e9b880ff90ab8689ad1bf9e6ff3cd"
|
|
- # operator-alibabacloud-digest
|
|
- alibabacloudDigest: "sha256:a4c04d3af0a8b44d66f7fa04361023c082b4a5112bc357f6c9ed95ee5e073213"
|
|
- useDigest: true
|
|
+ useDigest: false
|
|
pullPolicy: IfNotPresent
|
|
suffix: ""
|
|
|
|
@@ -1391,7 +1378,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: {}
|
|
@@ -1431,7 +1419,7 @@
|
|
# -- Enable prometheus metrics for cilium-operator on the configured port at
|
|
# /metrics
|
|
prometheus:
|
|
- enabled: false
|
|
+ enabled: true
|
|
port: 6942
|
|
serviceMonitor:
|
|
# -- Enable service monitors.
|
|
@@ -1448,11 +1436,11 @@
|
|
|
|
nodeinit:
|
|
# -- Enable the node initialization DaemonSet
|
|
- enabled: false
|
|
+ enabled: true
|
|
|
|
# -- node-init image.
|
|
image:
|
|
- repository: quay.io/cilium/startup-script
|
|
+ repository: rancher/mirrored-cilium-startup-script
|
|
tag: 62bfbe88c17778aad7bef9fa57ff9e2d4a9ba0d8
|
|
pullPolicy: IfNotPresent
|
|
|
|
@@ -1495,7 +1483,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: {}
|
|
@@ -1530,11 +1519,9 @@
|
|
|
|
# -- Cilium pre-flight image.
|
|
image:
|
|
- repository: quay.io/cilium/cilium
|
|
+ repository: rancher/mirrored-cilium-cilium
|
|
tag: v1.11.2
|
|
- # cilium-digest
|
|
- digest: "sha256:4332428fbb528bda32fffe124454458c9b716c86211266d1a03c4ddf695d7f60"
|
|
- useDigest: true
|
|
+ useDigest: false
|
|
pullPolicy: IfNotPresent
|
|
|
|
# -- The priority class to use for the preflight pod.
|
|
@@ -1584,7 +1571,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: {}
|
|
@@ -1669,7 +1657,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 clustermesh-apiserver pods
|
|
podAnnotations: {}
|
|
@@ -1795,3 +1784,6 @@
|
|
# -- Configure whether to enable auto detect of terminating state for endpoints
|
|
# in order to support graceful termination.
|
|
enableK8sTerminatingEndpoint: true
|
|
+
|
|
+global:
|
|
+ systemDefaultRegistry: ""
|