mirror of https://git.rancher.io/rke2-charts
111 lines
3.4 KiB
Diff
111 lines
3.4 KiB
Diff
--- charts-original/values.yaml
|
|
+++ charts/values.yaml
|
|
@@ -89,12 +89,10 @@
|
|
# -- Agent container image.
|
|
image:
|
|
override: ~
|
|
- repository: "quay.io/cilium/cilium"
|
|
+ repository: "rancher/mirrored-cilium-cilium"
|
|
tag: "v1.12.3"
|
|
pullPolicy: "IfNotPresent"
|
|
- # cilium-digest
|
|
- digest: "sha256:30de50c4dc0a1e1077e9e7917a54d5cab253058b3f779822aec00f5c817ca826"
|
|
- useDigest: true
|
|
+ useDigest: false
|
|
|
|
# -- Affinity for cilium-agent.
|
|
affinity:
|
|
@@ -361,7 +359,9 @@
|
|
# - flannel
|
|
# - generic-veth
|
|
# - portmap
|
|
- chainingMode: none
|
|
+
|
|
+ # Otherwise rke2 hostPort does not work! Used for nginx
|
|
+ chainingMode: portmap
|
|
|
|
# -- Make Cilium take ownership over the `/etc/cni/net.d` directory on the
|
|
# node, renaming all non-Cilium CNI configurations to `*.cilium_bak`.
|
|
@@ -652,7 +652,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.
|
|
@@ -1117,7 +1117,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.
|
|
@@ -1339,7 +1339,7 @@
|
|
|
|
# -- Configure prometheus metrics on the configured port at /metrics
|
|
prometheus:
|
|
- enabled: false
|
|
+ enabled: true
|
|
port: 9962
|
|
serviceMonitor:
|
|
# -- Enable service monitors.
|
|
@@ -1537,17 +1537,9 @@
|
|
# -- cilium-operator image.
|
|
image:
|
|
override: ~
|
|
- repository: "quay.io/cilium/operator"
|
|
+ repository: "rancher/mirrored-cilium-operator"
|
|
tag: "v1.12.3"
|
|
- # operator-generic-digest
|
|
- genericDigest: "sha256:816ec1da586139b595eeb31932c61a7c13b07fb4a0255341c0e0f18608e84eff"
|
|
- # operator-azure-digest
|
|
- azureDigest: "sha256:1effb4b91d55349a7c2d3b0b011e96a29d27562911580c57fbdde11657967086"
|
|
- # operator-aws-digest
|
|
- awsDigest: "sha256:08b2d6fa24cbd6e8a5b0647aabb1d8ee3bfd2763adcaed35835a6976aded74d0"
|
|
- # operator-alibabacloud-digest
|
|
- alibabacloudDigest: "sha256:208ef027af5b6c41807107a086849529eff2ca7f906a2a303b208067daa9a867"
|
|
- useDigest: true
|
|
+ useDigest: false
|
|
pullPolicy: "IfNotPresent"
|
|
suffix: ""
|
|
|
|
@@ -1659,7 +1651,7 @@
|
|
# -- Enable prometheus metrics for cilium-operator on the configured port at
|
|
# /metrics
|
|
prometheus:
|
|
- enabled: false
|
|
+ enabled: true
|
|
port: 9963
|
|
serviceMonitor:
|
|
# -- Enable service monitors.
|
|
@@ -1772,11 +1764,9 @@
|
|
# -- Cilium pre-flight image.
|
|
image:
|
|
override: ~
|
|
- repository: "quay.io/cilium/cilium"
|
|
+ repository: "rancher/mirrored-cilium-cilium"
|
|
tag: "v1.12.3"
|
|
- # cilium-digest
|
|
- digest: "sha256:30de50c4dc0a1e1077e9e7917a54d5cab253058b3f779822aec00f5c817ca826"
|
|
- useDigest: true
|
|
+ useDigest: false
|
|
pullPolicy: "IfNotPresent"
|
|
|
|
# -- The priority class to use for the preflight pod.
|
|
@@ -2126,3 +2116,11 @@
|
|
proxyPort: 0
|
|
# -- The maximum time the DNS proxy holds an allowed DNS response before sending it along. Responses are sent as soon as the datapath is updated with the new IP information.
|
|
proxyResponseMaxDelay: 100ms
|
|
+
|
|
+portmapPlugin:
|
|
+ image:
|
|
+ repository: "rancher/hardened-cni-plugins"
|
|
+ tag: "v1.0.1-build20221011"
|
|
+
|
|
+global:
|
|
+ systemDefaultRegistry: ""
|