[ci skip] 2024.11.12-32392

cybozu-go · Nov 12, 2024 · fdb4299 · fdb4299
2 parents 334076c + 2affc5c
commit fdb4299
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/artifacts.go b/artifacts.go
diff --git a/cilium/prod/upstream.yaml b/cilium/prod/upstream.yaml
@@ -34,6 +34,7 @@ metadata:
   name: cilium-config
   namespace: kube-system
 data:
+  conntrack-gc-max-interval: "30m"
 
   # Identity allocation mode selects how identities are shared between cilium
   # nodes by setting how they are stored. The options are "crd" or "kvstore".
@@ -824,7 +825,7 @@ spec:
         prometheus.io/port: "9962"
         prometheus.io/scrape: "true"
         # ensure pods roll when configmap updates
-        cilium.io/cilium-configmap-checksum: "d5a6358f3358cdc61bf73eddd0be4f8a5b8909d0f95d0236cd095e308678a1a0"
+        cilium.io/cilium-configmap-checksum: "7188fd0419596c94ed545f61231bf8ad68dfbdb39bc79447cb2d063a0c4c6a50"
         # Set app AppArmor's profile to "unconfined". The value of this annotation
         # can be modified as long users know which profiles they have available
         # in AppArmor.
@@ -1295,7 +1296,7 @@ spec:
     metadata:
       annotations:
         # ensure pods roll when configmap updates
-        cilium.io/cilium-configmap-checksum: "d5a6358f3358cdc61bf73eddd0be4f8a5b8909d0f95d0236cd095e308678a1a0"
+        cilium.io/cilium-configmap-checksum: "7188fd0419596c94ed545f61231bf8ad68dfbdb39bc79447cb2d063a0c4c6a50"
         prometheus.io/port: "9963"
         prometheus.io/scrape: "true"
       labels:

diff --git a/cilium/prod/values.yaml b/cilium/prod/values.yaml
@@ -13,6 +13,7 @@ cgroup:
 cni:
   chainingMode: "generic-veth"
   customConf: true
+conntrackGCMaxInterval: 30m
 datapathMode: "veth"
 devices: "eth+ eno1+ eno2+"
 enableIPv4Masquerade: false

diff --git a/etc/cilium.yaml b/etc/cilium.yaml
@@ -555,6 +555,7 @@ data:
   cluster-pool-ipv4-mask-size: "24"
   cni-chaining-mode: generic-veth
   cnp-node-status-gc-interval: 0s
+  conntrack-gc-max-interval: 30m
   custom-cni-conf: "true"
   debug: "false"
   debug-verbose: ""
@@ -760,7 +761,7 @@ spec:
   template:
     metadata:
       annotations:
-        cilium.io/cilium-configmap-checksum: d5a6358f3358cdc61bf73eddd0be4f8a5b8909d0f95d0236cd095e308678a1a0
+        cilium.io/cilium-configmap-checksum: 7188fd0419596c94ed545f61231bf8ad68dfbdb39bc79447cb2d063a0c4c6a50
         prometheus.io/port: "9963"
         prometheus.io/scrape: "true"
       labels:
@@ -1044,7 +1045,7 @@ spec:
   template:
     metadata:
       annotations:
-        cilium.io/cilium-configmap-checksum: d5a6358f3358cdc61bf73eddd0be4f8a5b8909d0f95d0236cd095e308678a1a0
+        cilium.io/cilium-configmap-checksum: 7188fd0419596c94ed545f61231bf8ad68dfbdb39bc79447cb2d063a0c4c6a50
         container.apparmor.security.beta.kubernetes.io/cilium-agent: unconfined
         container.apparmor.security.beta.kubernetes.io/clean-cilium-state: unconfined
         prometheus.io/port: "9962"