fix: rm private ingress (#1712)

Author: srodenhuis

helmfile.d/snippets/defaults.yaml

@@ -333,14 +333,6 @@ environments:
               enabled: false
               block: false
               owasp: true
-            private:
-              enabled: false
-              autoscaling:
-                enabled: true
-                minReplicas: 2
-                maxReplicas: 10
-            service:
-              annotations: {}
             tracing:
               enabled: false
               samplingRatio: "0.01"
@@ -927,7 +919,6 @@ environments:
         ingress:
           platformClass:
             className: platform
-            network: public
           classes: []
         alerts:
           receivers:

tests/fixtures/env/apps/ingress-nginx-platform.yaml

@@ -18,7 +18,3 @@ apps:
             requests:
                 cpu: 100m
                 memory: 192Mi
-        service:
-            annotations:
-                - key: service.beta.kubernetes.io/do-loadbalancer-enable-proxy-protocol
-                  value: true

tests/fixtures/env/apps/ingress-nginx-private.yaml

@@ -26,16 +26,13 @@ e2e:
     enabled: false
 ingress:
     classes:
-        - className: private
-          entrypoint: ''
-          loadBalancerSubnet: subnet
-          network: private
         - className: net-a
           entrypoint: ''
           loadBalancerIP: 11.0.0.1
-          loadBalancerRG: myrg
-          network: public
           sourceIpAddressFiltering: 10.0.0.0/24
+          annotations:
+              - key: service.beta.kubernetes.io/do-loadbalancer-enable-proxy-protocol
+                value: true
     platformClass:
         entrypoint: ''
 kms:

tests/fixtures/env/settings.yaml

@@ -448,7 +448,6 @@ definitions:
         type: string
         enum:
           - public
-          - private
         default: public
       loadBalancerIP:
         title: Load balancer IP address
@@ -458,7 +457,10 @@ definitions:
         title: Source IP address filtering
         type: string
         description: 'Whitelist source IP address ranges. The value is a comma separated list of CIDRs, e.g. 10.0.0.0/24,172.10.0.1'
-
+      annotations:
+        properties:
+          annotations:
+            $ref: '#/definitions/annotations'
   ipV4Address:
     type: string
     pattern: ^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$

values-schema.yaml

@@ -5,7 +5,6 @@
 {{/* appDefaults - each ingress-nginx Helm realse will use default values defined in defaults.yaml in app.ingress-nginx context*/}}
 {{- $appDefaults := $v | get "apps.ingress-nginx" }}
 {{- $n := deepCopy $appDefaults | merge $app }}
-{{- $privateNetwork := eq "private" ($ingress | get "network" "public")  }}
 
 nameOverride: {{ .Release.Name }}
 
@@ -124,11 +123,11 @@ controller:
     {{- end }}
     annotations:
       dummy: 'true'
-    {{- with $n | get "service.annotations" nil }}
+    {{- with $ingress | get "annotations" nil }}
       {{- range . }}
       {{ .key }}: "{{ .value }}"
       {{- end }}
-    {{- end }}
+    {{- end }}   
   publishService:
     enabled: true