Skip to content

Commit 7ebbf1d

Browse files
committed
Merge remote-tracking branch 'origin/dev' into karpenter-update
2 parents 59f22e7 + e0ec987 commit 7ebbf1d

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

cluster/config-defaults.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ skipper_open_policy_agent_styra_token: ""
317317
# - production: runs the controller
318318
#
319319
fabric_gateway_controller_mode: "disabled"
320-
fabric_gateway_controller_version: "master-234"
320+
fabric_gateway_controller_version: "master-237"
321321
fabric_gateway_controller_cpu: "50m"
322322
fabric_gateway_controller_memory: "150Mi"
323323
fabric_gateway_crd_v1_enabled: "false"
@@ -841,6 +841,9 @@ enable_hpa_container_metrics: "true"
841841
# https://kubernetes.io/docs/tasks/debug-application-cluster/debug-running-pod/
842842
enable_ephemeral_containers: "false"
843843

844+
# Enable FeatureGate MaxUnavailableStatefulSet
845+
max_unavailable_statefulset_enabled: "false"
846+
844847
# enable encryption of secrets in etcd
845848
# this flag can be switched between true and false
846849
# to ensure all secrets are encrypted/decrypted all secrets need to be rewritten after masters have been rolled

cluster/manifests/skipper/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{ $internal_version := "v0.19.32-783" }}
1+
{{ $internal_version := "v0.19.44-795" }}
22
{{ $canary_internal_version := "v0.19.44-795" }}
33

44
{{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# {{ if eq .Cluster.ConfigItems.skipper_oauth2_ui_login "true" }}
2-
# {{ $version := "main-9" }}
2+
# {{ $version := "main-11" }}
33
apiVersion: v1
44
kind: ServiceAccount
55
metadata:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ write_files:
143143
- --oidc-groups-claim=groups
144144
- "--oidc-groups-prefix=okta:"
145145
{{- end }}
146-
- --feature-gates=HPAScaleToZero={{ .Cluster.ConfigItems.enable_hpa_scale_to_zero }},EphemeralContainers={{ .Cluster.ConfigItems.enable_ephemeral_containers }},HPAContainerMetrics={{ .Cluster.ConfigItems.enable_hpa_container_metrics }},StatefulSetAutoDeletePVC={{ .Cluster.ConfigItems.enable_statefulset_autodelete_pvc }},TopologyAwareHints={{ .Cluster.ConfigItems.enable_topology_aware_hints }},MinDomainsInPodTopologySpread={{ .Cluster.ConfigItems.min_domains_in_pod_topology_spread_enabled }},CronJobTimeZone={{.Cluster.ConfigItems.cronjob_time_zone_enabled}}
146+
- --feature-gates=HPAScaleToZero={{ .Cluster.ConfigItems.enable_hpa_scale_to_zero }},EphemeralContainers={{ .Cluster.ConfigItems.enable_ephemeral_containers }},HPAContainerMetrics={{ .Cluster.ConfigItems.enable_hpa_container_metrics }},StatefulSetAutoDeletePVC={{ .Cluster.ConfigItems.enable_statefulset_autodelete_pvc }},TopologyAwareHints={{ .Cluster.ConfigItems.enable_topology_aware_hints }},MinDomainsInPodTopologySpread={{ .Cluster.ConfigItems.min_domains_in_pod_topology_spread_enabled }},CronJobTimeZone={{.Cluster.ConfigItems.cronjob_time_zone_enabled}},MaxUnavailableStatefulSet={{.Cluster.ConfigItems.max_unavailable_statefulset_enabled}}
147147
- --service-account-key-file=/etc/kubernetes/ssl/service-account-public-key.pem
148148
- --service-account-signing-key-file=/etc/kubernetes/ssl/service-account-private-key.pem
149149
- --service-account-issuer={{ .Cluster.APIServerURL }}

0 commit comments

Comments
 (0)