Merge branch 'main' into david/agent-deamonset-hostproc

otterize · Nov 19, 2024 · cd8bc6c · cd8bc6c
2 parents e80756b + e5b935c
commit cd8bc6c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/intents-operator/Chart.yaml b/intents-operator/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: intents-operator
 description: Otterize intents operator
 type: application
-version: 3.0.46
-appVersion: v2.0.27
+version: 3.0.49
+appVersion: v2.0.29
 home: https://github.com/otterize/intents-operator
 sources:
   - https://github.com/otterize/intents-operator
diff --git a/intents-operator/templates/intents-operator-deployment.yaml b/intents-operator/templates/intents-operator-deployment.yaml
@@ -207,6 +207,10 @@ spec:
           - name: OTTERIZE_SEPARATE_NETPOLS_FOR_INGRESS_AND_EGRESS
             value: "true"
           {{- end }}
+          {{- if eq true .Values.operator.enableGroupIPsByCIDR }}
+          - name: OTTERIZE_ENABLE_GROUP_INTERNET_IPS_BY_CIDR
+            value: "true"
+          {{- end }}
           {{- if .Values.global.aws.rolesAnywhere.enabled }}
           - name: OTTERIZE_ENABLE_AWS_IAM_ROLESANYWHERE
             value: "true"

diff --git a/intents-operator/values.yaml b/intents-operator/values.yaml
@@ -63,6 +63,10 @@ operator:
   # If set to true, the operator will create separate network policies for ingress and egress traffic.
   # (Only available with enableEgressNetworkPolicyCreation set to true)
   separateNetpolsForIngressAndEgress: false
+
+  # If set to true, the operator will try to consolidate IPs into /24 networks when creating egress network policies to the internet.
+  enableGroupIPsByCIDR: false
+
   ingressControllerAWSALBExempt: false
   extraEnvVars:
 

diff --git a/otterize-kubernetes/Chart.yaml b/otterize-kubernetes/Chart.yaml
@@ -3,7 +3,7 @@ name: otterize-kubernetes
 description: |
   This chart contains the Otterize credentials-operator, SPIRE (server+agent), the Otterize intents operator, and the Otterize network mapper.
 type: application
-version: 4.0.62
+version: 4.0.65
 home: https://github.com/otterize/helm-charts
 kubeVersion: ">=1.19.0-0"
 dependencies: