Add toggle for Multi-cluster Pod-to-Pod connectivity

antrea-io · Feb 15, 2023 · 99f2680 · 99f2680
1 parent ee18aa2
commit 99f2680
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/build/yamls/antrea-aks.yml b/build/yamls/antrea-aks.yml
@@ -4299,7 +4299,11 @@ spec:
         kubectl.kubernetes.io/default-container: antrea-agent
         # Automatically restart Pods with a RollingUpdate if the ConfigMap changes
         # See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
+<<<<<<< HEAD
         checksum/config: be4d7318350c398a0362a44ff0d4ff779150a303e577ed1e2265aaa75c00546e
+=======
+        checksum/config: 5e86a889fca88734845bed60765a31dd090ba17830f29aaecc0b162e83e725ba
+>>>>>>> 259c89b1 (Add toggle for Multi-cluster Pod-to-Pod connectivity)
       labels:
         app: antrea
         component: antrea-agent
@@ -4540,7 +4544,11 @@ spec:
       annotations:
         # Automatically restart Pod if the ConfigMap changes
         # See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
+<<<<<<< HEAD
         checksum/config: be4d7318350c398a0362a44ff0d4ff779150a303e577ed1e2265aaa75c00546e
+=======
+        checksum/config: 5e86a889fca88734845bed60765a31dd090ba17830f29aaecc0b162e83e725ba
+>>>>>>> 259c89b1 (Add toggle for Multi-cluster Pod-to-Pod connectivity)
       labels:
         app: antrea
         component: antrea-controller

diff --git a/build/yamls/antrea-gke.yml b/build/yamls/antrea-gke.yml
@@ -4299,7 +4299,11 @@ spec:
         kubectl.kubernetes.io/default-container: antrea-agent
         # Automatically restart Pods with a RollingUpdate if the ConfigMap changes
         # See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
+<<<<<<< HEAD
         checksum/config: fca1f2d4967020380202ef0c2394b560055830ee2770e41f791af76b42559659
+=======
+        checksum/config: 498f6060a4d4397c8ce36007eebbe29ac4650f30b393a45bdef064db89eff868
+>>>>>>> 259c89b1 (Add toggle for Multi-cluster Pod-to-Pod connectivity)
       labels:
         app: antrea
         component: antrea-agent
@@ -4538,7 +4542,11 @@ spec:
       annotations:
         # Automatically restart Pod if the ConfigMap changes
         # See https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
+<<<<<<< HEAD
         checksum/config: fca1f2d4967020380202ef0c2394b560055830ee2770e41f791af76b42559659
+=======
+        checksum/config: 498f6060a4d4397c8ce36007eebbe29ac4650f30b393a45bdef064db89eff868
+>>>>>>> 259c89b1 (Add toggle for Multi-cluster Pod-to-Pod connectivity)
       labels:
         app: antrea
         component: antrea-controller