Skip to content

Commit b393ea3

Browse files
authored
Merge pull request #9494 from zalando-incubator/image-volumes
Enable and allow to configure feature gate for image volumes
2 parents 3be910f + d85fd43 commit b393ea3

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

cluster/config-defaults.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,6 +1090,9 @@ config_provider_service: "false"
10901090
# enable SizeMemoryBackedVolumes feature flag
10911091
enable_size_memory_backed_volumes: "true"
10921092

1093+
# enable ImageVolume feature flag
1094+
enable_image_volumes: "false"
1095+
10931096
# enable StatefulSetAutoDeletePVC feature flag
10941097
# https://kubernetes.io/blog/2021/12/16/kubernetes-1-23-statefulset-pvc-auto-deletion/
10951098
enable_statefulset_autodelete_pvc: "true"

cluster/manifests/kube-proxy/configmap.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ data:
2525
featureGates:
2626
TopologyAwareHints: {{ .Cluster.ConfigItems.enable_topology_aware_hints }}
2727
SizeMemoryBackedVolumes: {{ .Cluster.ConfigItems.enable_size_memory_backed_volumes }}
28+
{{- if eq .Cluster.ConfigItems.enable_image_volumes "true" }}
29+
ImageVolume: true
30+
{{- end }}
2831
healthzBindAddress: 127.0.0.1:10256
2932
hostnameOverride: ""
3033
iptables:

cluster/node-pools/master-default/userdata.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ write_files:
2929
{{- end }}
3030
featureGates:
3131
SizeMemoryBackedVolumes: {{ .Cluster.ConfigItems.enable_size_memory_backed_volumes }}
32+
{{- if eq .Cluster.ConfigItems.enable_image_volumes "true" }}
33+
ImageVolume: true
34+
{{- end }}
3235
podPidsLimit: {{ .NodePool.ConfigItems.pod_max_pids }}
3336
maxPods: {{ nodeCIDRMaxPods (parseInt64 .Cluster.ConfigItems.node_cidr_mask_size) 8 }}
3437
{{- if ne .Cluster.ConfigItems.serialize_image_pulls "true" }}
@@ -152,7 +155,7 @@ write_files:
152155
- "--oidc-username-prefix=okta:"
153156
- --oidc-groups-claim=groups
154157
- "--oidc-groups-prefix=okta:"
155-
- --feature-gates=HPAScaleToZero={{ .Cluster.ConfigItems.enable_hpa_scale_to_zero }},StatefulSetAutoDeletePVC={{ .Cluster.ConfigItems.enable_statefulset_autodelete_pvc }},TopologyAwareHints={{ .Cluster.ConfigItems.enable_topology_aware_hints }},MaxUnavailableStatefulSet={{.Cluster.ConfigItems.max_unavailable_statefulset_enabled}},KMSv1=true
158+
- --feature-gates=HPAScaleToZero={{ .Cluster.ConfigItems.enable_hpa_scale_to_zero }},StatefulSetAutoDeletePVC={{ .Cluster.ConfigItems.enable_statefulset_autodelete_pvc }},TopologyAwareHints={{ .Cluster.ConfigItems.enable_topology_aware_hints }},MaxUnavailableStatefulSet={{.Cluster.ConfigItems.max_unavailable_statefulset_enabled}},KMSv1=true{{if eq .Cluster.ConfigItems.enable_image_volumes "true"}},ImageVolume=true{{end}}
156159
- --service-account-key-file=/etc/kubernetes/ssl/service-account-public-key.pem
157160
- --service-account-signing-key-file=/etc/kubernetes/ssl/service-account-private-key.pem
158161
- --service-account-issuer={{ .Cluster.APIServerURL }}
@@ -617,7 +620,7 @@ write_files:
617620
- --root-ca-file=/etc/kubernetes/ssl/ca.pem
618621
- --cloud-provider=external
619622
- --cloud-config=/etc/kubernetes/cloud-config.ini
620-
- --feature-gates=StatefulSetAutoDeletePVC={{ .Cluster.ConfigItems.enable_statefulset_autodelete_pvc }},TopologyAwareHints={{ .Cluster.ConfigItems.enable_topology_aware_hints }},MaxUnavailableStatefulSet={{.Cluster.ConfigItems.max_unavailable_statefulset_enabled}}
623+
- --feature-gates=StatefulSetAutoDeletePVC={{ .Cluster.ConfigItems.enable_statefulset_autodelete_pvc }},TopologyAwareHints={{ .Cluster.ConfigItems.enable_topology_aware_hints }},MaxUnavailableStatefulSet={{.Cluster.ConfigItems.max_unavailable_statefulset_enabled}}{{if eq .Cluster.ConfigItems.enable_image_volumes "true"}},ImageVolume=true{{end}}
621624
- --use-service-account-credentials=true
622625
- --configure-cloud-routes=false
623626
- --allocate-node-cidrs=true

cluster/node-pools/worker-splitaz/userdata.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ write_files:
7979
{{- end }}
8080
featureGates:
8181
SizeMemoryBackedVolumes: {{ .Cluster.ConfigItems.enable_size_memory_backed_volumes }}
82+
{{- if eq .Cluster.ConfigItems.enable_image_volumes "true" }}
83+
ImageVolume: true
84+
{{- end }}
8285
{{- if eq .NodePool.ConfigItems.exec_probe_timeout_enabled "false" }}
8386
ExecProbeTimeout: false
8487
{{- end }}

0 commit comments

Comments
 (0)