dev to beta

cluster/config-defaults.yaml

@@ -242,10 +242,13 @@ skipper_serve_method_metric: "false"
 # of the skipper_serve_host_duration_seconds_bucket metric.
 skipper_serve_status_code_metric: "false"
 
-# disabled|provisioned|enabled routegroup validation ( skipper webhook )
+# disabled|provisioned|enabled routegroup validation via skipper webhook
 # can be one of disabled|provisioned|enabled
 routegroups_validation: "enabled"
 
+# disabled|enabled ingress validation via skipper webhook
+ingresses_validation: "disabled"
+
 # tokeninfo
 {{if eq .Cluster.Environment "production"}}
 # production|bridge|disabled

cluster/manifests/01-admission-control/routegroups-webhook.yaml → cluster/manifests/01-admission-control/skipper-webhook.yaml

@@ -6,7 +6,7 @@ metadata:
     application: skipper-ingress
     component: webhook
 webhooks:
-{{ if eq .Cluster.ConfigItems.routegroups_validation "enabled" }}
+  # {{ if eq .Cluster.ConfigItems.routegroups_validation "enabled" }}
   - name: "routegroup-admitter.teapot.zalan.do"
     rules:
       - operations: ["CREATE", "UPDATE"]
@@ -19,7 +19,8 @@ webhooks:
     admissionReviewVersions: ["v1"]
     sideEffects: None
     timeoutSeconds: 5
-{{ end }}
+  # {{ end }}
+  # {{ if eq .Cluster.ConfigItems.ingresses_validation "enabled" }}
   - name: "ingress-admitter.teapot.zalan.do"
     rules:
       - operations: ["CREATE", "UPDATE"]
@@ -31,4 +32,5 @@ webhooks:
       caBundle: "{{ .ConfigItems.ca_cert_decompressed }}"
     admissionReviewVersions: ["v1"]
     sideEffects: None
-    timeoutSeconds: 5 
+    timeoutSeconds: 5
+  # {{ end }}

cluster/manifests/skipper/hostname-credentials-controller.yaml

@@ -1,5 +1,5 @@
 # {{ if eq .ConfigItems.skipper_oauth2_ui_login "true" }}
-# {{ $version := "main-6" }}
+# {{ $version := "main-9" }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -85,6 +85,7 @@ spec:
           containers:
             - name: controller
               image: "container-registry.zalando.net/gwproxy/hostname-credentials-controller:{{ $version }}"
+              terminationMessagePolicy: FallbackToLogsOnError
               args:
                 - -ingress-selector=application
                 - -credentials-namespace=kube-system

cluster/manifests/skipper/secret-combiner.yaml

@@ -1,5 +1,5 @@
-{{ if eq .ConfigItems.skipper_oauth2_ui_login "true" }}
-{{ $version := "main-2" }}
+# {{ if eq .ConfigItems.skipper_oauth2_ui_login "true" }}
+# {{ $version := "main-5" }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -74,6 +74,7 @@ spec:
           containers:
             - name: combiner
               image: "container-registry.zalando.net/gwproxy/secret-combiner:{{ $version }}"
+              terminationMessagePolicy: FallbackToLogsOnError
               env:
                 - name: NAMESPACE
                   valueFrom:
@@ -94,4 +95,4 @@ spec:
                 requests:
                   cpu: 10m
                   memory: 50Mi
-{{ end }}
+# {{ end }}

cluster/manifests/stackset-controller/01-stack-crd.yaml

@@ -349,6 +349,20 @@ spec:
                 - maxReplicas
                 - metrics
                 type: object
+# {{ if eq .Cluster.ConfigItems.stackset_ingress_in_stack_crd "true" }}
+              externalIngress:
+                description: Stack specific ExternalIngress, based on the parent StackSet
+                  at creation time.
+                properties:
+                  backendPort:
+                    anyOf:
+                    - type: integer
+                    - type: string
+                    x-kubernetes-int-or-string: true
+                required:
+                - backendPort
+                type: object
+# {{ end }}
 # {{ if eq .Cluster.ConfigItems.stackset_legacy_hpa_field_crd_enabled "true" }}
               horizontalPodAutoscaler:
                 description: HorizontalPodAutoscaler is the Autoscaling configuration
@@ -1290,8 +1304,6 @@ spec:
                                               the key and values.
                                             properties:
                                               key:
-                                                description: key is the label key
-                                                  that the selector applies to.
                                                 type: string
                                               operator:
                                                 type: string
@@ -1337,8 +1349,6 @@ spec:
                                               the key and values.
                                             properties:
                                               key:
-                                                description: key is the label key
-                                                  that the selector applies to.
                                                 type: string
                                               operator:
                                                 type: string
@@ -1569,8 +1579,6 @@ spec:
                                               the key and values.
                                             properties:
                                               key:
-                                                description: key is the label key
-                                                  that the selector applies to.
                                                 type: string
                                               operator:
                                                 type: string
@@ -1616,8 +1624,6 @@ spec:
                                               the key and values.
                                             properties:
                                               key:
-                                                description: key is the label key
-                                                  that the selector applies to.
                                                 type: string
                                               operator:
                                                 type: string