cleanup: delete skipper-ingress-redis and remove toggles to enable disable valkey

cluster/config-defaults.yaml

@@ -216,34 +216,10 @@ skipper_idle_timeout_server: "352s"
 skipper_termination_grace_period: "392"
 
 # skipper redis settings
-skipper_redis_cleanup_enabled: "false" # if set to true we should be able to cleanup all of the cfg items below
-skipper_redis_cpu: "100m"
-skipper_redis_memory: "512Mi"
-skipper_redis_dial_timeout: "25ms"
-skipper_redis_pool_timeout: "250ms"
-skipper_redis_read_timeout: "25ms"
-skipper_redis_write_timeout: "25ms"
-skipper_redis_min_conns: 25
-skipper_redis_max_conns: 100
-skipper_ingress_redis_swarm_enabled: "true"
-skipper_ingress_redis_target_average_utilization_cpu: "30"
-skipper_ingress_redis_target_average_utilization_memory: "60"
-skipper_ingress_redis_min_replicas: "1"
-skipper_ingress_redis_max_replicas: "100"
-skipper_ingress_redis_cluster_scaling_schedules: ""
-skipper_ingress_redis_hpa_scale_down_wait: "600"
+skipper_redis_cleanup_enabled: "true"
 # requires cleanup in cluster.yaml
 skipper_ingress_redis_swim_enabled: "false"
 
-# to switch redis/valkey force and back
-# switch to redis: "redis"
-# switch to valkey: "valkey"
-{{if eq .Cluster.Environment "production"}}
-skipper_ingress_swarm_type: "redis"
-{{else}}
-skipper_ingress_swarm_type: "valkey"
-{{end}}
-
 # skipper valkey settings
 skipper_valkey_cpu: "100m"
 skipper_valkey_memory: "512Mi"

cluster/manifests/03-skipper-validation-webhook/deployment.yaml

@@ -54,43 +54,6 @@ spec:
       priorityClassName: system-cluster-critical
       serviceAccountName: skipper-validation-webhook
       containers:
-{{- if eq .Cluster.ConfigItems.skipper_ingress_swarm_type "redis" }}
-      - name: redis-sidecar
-        image: container-registry.zalando.net/library/redis-7-alpine:7.2-alpine-20250805
-        args:
-        - /usr/local/bin/docker-entrypoint.sh
-        - --save
-        - ""  # Disable persistence for sidecar use
-        - --maxmemory
-        - "256mb"
-        - --maxmemory-policy
-        - "allkeys-lru"
-        ports:
-        - containerPort: 6379
-          protocol: TCP
-          name: redis
-        readinessProbe:
-          exec:
-            command:
-            - redis-cli
-            - ping
-          failureThreshold: 3
-          initialDelaySeconds: 5
-          periodSeconds: 10
-          successThreshold: 1
-          timeoutSeconds: 1
-        resources:
-          requests:
-            cpu: "100m"
-            memory: "128Mi"
-          limits:
-            cpu: "100m"
-            memory: "128Mi"
-        lifecycle:
-          preStop:
-            sleep:
-              seconds: 10
-{{- else if eq .Cluster.ConfigItems.skipper_ingress_swarm_type "valkey" }}
       - name: valkey-sidecar
         image: container-registry.zalando.net/library/valkey-9-alpine:9-alpine3.22-20260406
         args:
@@ -126,7 +89,6 @@ spec:
           preStop:
             sleep:
               seconds: 10
-{{ end }}
       - name: skipper-admission-webhook
         image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/skipper:v0.24.70
         env:
@@ -190,20 +152,9 @@ spec:
           - "-enable-ratelimits"
           - "-enable-swarm"
           - "-cluster-ratelimit-max-group-shards={{ .Cluster.ConfigItems.skipper_cluster_ratelimit_max_group_shards }}"
-{{- if eq .Cluster.ConfigItems.skipper_ingress_swarm_type "valkey" }}
           - "-swarm-valkey-conn-timeout=5s"
           - "-swarm-valkey-update-interval=720h"
           - "-swarm-valkey-urls=127.0.0.1:6379"
-{{- else if eq .Cluster.ConfigItems.skipper_ingress_swarm_type "redis" }}
-          - "-swarm-redis-dial-timeout=5s"
-          - "-swarm-redis-pool-timeout=5s"
-          - "-swarm-redis-read-timeout=5s"
-          - "-swarm-redis-write-timeout=5s"
-          - "-swarm-redis-heartbeat-frequency=720h"
-          - "-swarm-redis-min-conns=1"
-          - "-swarm-redis-max-conns=1"
-          - "-swarm-redis-urls=127.0.0.1:6379"
-{{ end }}
           - "-lua-sources={{ .Cluster.ConfigItems.skipper_lua_sources }}"
           - "-default-filters-dir=/etc/config/default-filters"
           - '-default-filters-prepend={{ .Cluster.ConfigItems.skipper_default_filters }}'

cluster/manifests/skipper/deployment.yaml

@@ -268,18 +268,8 @@ spec:
           - "-max-audit-body=0"
           - "-enable-swarm"
           - "-cluster-ratelimit-max-group-shards={{ .Cluster.ConfigItems.skipper_cluster_ratelimit_max_group_shards }}"
-{{ if eq .Cluster.ConfigItems.skipper_ingress_swarm_type "redis" }}
-          - "-swarm-redis-dial-timeout={{ .Cluster.ConfigItems.skipper_redis_dial_timeout }}"
-          - "-swarm-redis-pool-timeout={{ .Cluster.ConfigItems.skipper_redis_pool_timeout }}"
-          - "-swarm-redis-read-timeout={{ .Cluster.ConfigItems.skipper_redis_read_timeout }}"
-          - "-swarm-redis-write-timeout={{ .Cluster.ConfigItems.skipper_redis_write_timeout }}"
-          - "-swarm-redis-min-conns={{ .Cluster.ConfigItems.skipper_redis_min_conns }}"
-          - "-swarm-redis-max-conns={{ .Cluster.ConfigItems.skipper_redis_max_conns }}"
-          - "-swarm-redis-remote=http://skipper-ingress-routesrv.kube-system.svc.cluster.local/swarm/redis/shards"
-{{ else if eq .Cluster.ConfigItems.skipper_ingress_swarm_type "valkey" }}
           - "-swarm-valkey-conn-timeout={{ .Cluster.ConfigItems.skipper_valkey_conn_timeout }}"
           - "-swarm-valkey-remote=http://skipper-ingress-routesrv.kube-system.svc.cluster.local/swarm/valkey/shards"
-{{ end }}
           - "-histogram-metric-buckets=.0001,.00025,.0005,.00075,.001,.0025,.005,.0075,.01,.025,.05,.075,.1,.2,.3,.4,.5,.75,1,2,3,4,5,7,10,15,20,30,60,120,300,600"
 {{if ne .Cluster.ConfigItems.skipper_ingress_response_size_buckets ""}}
           - "-response-size-buckets={{ .Cluster.ConfigItems.skipper_ingress_response_size_buckets }}"
@@ -649,15 +639,9 @@ spec:
           - '-default-filters-append={{ .Cluster.ConfigItems.skipper_default_filters_authentication }}'
           - '-default-filters-append={{ .Cluster.ConfigItems.skipper_default_filters_append }}'
           - "-enable-swarm"
-{{ if eq .Cluster.ConfigItems.skipper_ingress_swarm_type "redis" }}
-          - "-kubernetes-redis-service-namespace=kube-system"
-          - "-kubernetes-redis-service-name=skipper-ingress-redis"
-          - "-kubernetes-redis-service-port=6379"
-{{ else if eq .Cluster.ConfigItems.skipper_ingress_swarm_type "valkey" }}
           - "-kubernetes-valkey-service-namespace=kube-system"
           - "-kubernetes-valkey-service-name=skipper-ingress-valkey"
           - "-kubernetes-valkey-service-port=6379"
-{{ end }}
 {{ if eq .Cluster.ConfigItems.skipper_oauth2_ui_login "true" }}
           - "-enable-oauth2-grant-flow"
           - "-oauth2-callback-path={{ .Cluster.ConfigItems.skipper_oauth2_redirect_uri_path }}"

cluster/manifests/skipper/hpa-valkey.yaml

@@ -1,4 +1,3 @@
-{{- if eq .Cluster.ConfigItems.skipper_ingress_swarm_type "valkey" }}
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
@@ -54,4 +53,3 @@ spec:
         value: 100
         periodSeconds: 60
       selectPolicy: Min
-{{ end }}

cluster/manifests/skipper/skipper-valkey-service.yaml

@@ -1,4 +1,3 @@
-{{- if eq .Cluster.ConfigItems.skipper_ingress_swarm_type "valkey" }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -17,4 +16,3 @@ spec:
     application: skipper-ingress
     component: valkey
   type: ClusterIP
-{{ end }}

cluster/manifests/skipper/skipper-valkey.yaml

@@ -1,6 +1,5 @@
 # {{ $image := "container-registry.zalando.net/library/valkey-9-alpine:9-alpine3.22-20260413" }}
 # {{ $version := index (split $image ":") 1 }}
-{{- if eq .Cluster.ConfigItems.skipper_ingress_swarm_type "valkey" }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -116,4 +115,3 @@ spec:
         operator: Exists
         effect: NoSchedule
 {{ end }}
-{{- end }}