update topology aware annotation key for k8s 1.27+ (#3878)

* update annotation key for k8s 1.27+ * add changelog * add backward compatability
wireapp · Feb 7, 2024 · fd9628a · fd9628a
1 parent 8266c4c
commit fd9628a
Show file tree

Hide file tree

Showing 14 changed files with 53 additions and 0 deletions.
diff --git a/changelog.d/5-internal/update-k8s-annotation-for-topology-aware-routing b/changelog.d/5-internal/update-k8s-annotation-for-topology-aware-routing
@@ -0,0 +1 @@
+updated annotation for enabling Topology Aware Routing to service.kubernetes.io/topology-mode for k8s 1.27+
diff --git a/charts/background-worker/templates/service.yaml b/charts/background-worker/templates/service.yaml
@@ -8,7 +8,11 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   annotations:
+    {{- if ge (.Capabilities.KubeVersion.Minor|int) 26 }}
+    service.kubernetes.io/topology-mode: Auto
+    {{- else }}
     service.kubernetes.io/topology-aware-hints: auto
+    {{- end }}
 spec:
   type: ClusterIP
   ports:

diff --git a/charts/backoffice/templates/service.yaml b/charts/backoffice/templates/service.yaml
@@ -8,7 +8,11 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   annotations:
+    {{- if ge (.Capabilities.KubeVersion.Minor|int) 26 }}
+    service.kubernetes.io/topology-mode: Auto
+    {{- else }}
     service.kubernetes.io/topology-aware-hints: auto
+    {{- end }}
 spec:
   type: ClusterIP
   ports:

diff --git a/charts/brig/templates/service.yaml b/charts/brig/templates/service.yaml
@@ -8,7 +8,11 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   annotations:
+    {{- if ge (.Capabilities.KubeVersion.Minor|int) 26 }}
+    service.kubernetes.io/topology-mode: Auto
+    {{- else }}
     service.kubernetes.io/topology-aware-hints: auto
+    {{- end }}
 spec:
   type: ClusterIP
   ports:

diff --git a/charts/cannon/templates/headless-service.yaml b/charts/cannon/templates/headless-service.yaml
@@ -14,7 +14,11 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   annotations:
+    {{- if ge (.Capabilities.KubeVersion.Minor|int) 26 }}
+    service.kubernetes.io/topology-mode: Auto
+    {{- else }}
     service.kubernetes.io/topology-aware-hints: auto
+    {{- end }}
 spec:
   type: ClusterIP
   # This is what makes it a Headless Service

diff --git a/charts/cannon/templates/nginz-service.yaml b/charts/cannon/templates/nginz-service.yaml
@@ -18,7 +18,11 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   annotations:
+    {{- if ge (.Capabilities.KubeVersion.Minor|int) 26 }}
+    service.kubernetes.io/topology-mode: Auto
+    {{- else }}
     service.kubernetes.io/topology-aware-hints: auto
+    {{- end }}
     {{- if .Values.service.nginz.externalDNS.enabled }}
     external-dns.alpha.kubernetes.io/ttl: {{ .Values.service.nginz.externalDNS.ttl | quote }}
     external-dns.alpha.kubernetes.io/hostname: {{ required "Please provide .service.nginz.hostname when .service.nginz.enabled and .service.nginz.externalDNS.enabled are True" .Values.service.nginz.hostname | quote }}

diff --git a/charts/cargohold/templates/service.yaml b/charts/cargohold/templates/service.yaml
@@ -8,7 +8,11 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   annotations:
+    {{- if ge (.Capabilities.KubeVersion.Minor|int) 26 }}
+    service.kubernetes.io/topology-mode: Auto
+    {{- else }}
     service.kubernetes.io/topology-aware-hints: auto
+    {{- end }}
 spec:
   type: ClusterIP
   ports:

diff --git a/charts/federator/templates/service.yaml b/charts/federator/templates/service.yaml
@@ -8,7 +8,11 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   annotations:
+    {{- if ge (.Capabilities.KubeVersion.Minor|int) 26 }}
+    service.kubernetes.io/topology-mode: Auto
+    {{- else }}
     service.kubernetes.io/topology-aware-hints: auto
+    {{- end }}
 spec:
   type: ClusterIP
   ports:

diff --git a/charts/galley/templates/service.yaml b/charts/galley/templates/service.yaml
@@ -8,7 +8,11 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   annotations:
+    {{- if ge (.Capabilities.KubeVersion.Minor|int) 26 }}
+    service.kubernetes.io/topology-mode: Auto
+    {{- else }}
     service.kubernetes.io/topology-aware-hints: auto
+    {{- end }}
 spec:
   type: ClusterIP
   ports:

diff --git a/charts/gundeck/templates/service.yaml b/charts/gundeck/templates/service.yaml
@@ -8,7 +8,11 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   annotations:
+    {{- if ge (.Capabilities.KubeVersion.Minor|int) 26 }}
+    service.kubernetes.io/topology-mode: Auto
+    {{- else }}
     service.kubernetes.io/topology-aware-hints: auto
+    {{- end }}
 spec:
   type: ClusterIP
   ports:

diff --git a/charts/legalhold/templates/service.yaml b/charts/legalhold/templates/service.yaml
@@ -3,7 +3,11 @@ kind: Service
 metadata:
   name: "{{ .Release.Name }}-hold"
   annotations:
+    {{- if ge (.Capabilities.KubeVersion.Minor|int) 26 }}
+    service.kubernetes.io/topology-mode: Auto
+    {{- else }}
     service.kubernetes.io/topology-aware-hints: auto
+    {{- end }}
 spec:
   type: ClusterIP
   selector:

diff --git a/charts/nginz/templates/service.yaml b/charts/nginz/templates/service.yaml
@@ -8,7 +8,11 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   annotations:
+    {{- if ge (.Capabilities.KubeVersion.Minor|int) 26 }}
+    service.kubernetes.io/topology-mode: Auto
+    {{- else }}
     service.kubernetes.io/topology-aware-hints: auto
+    {{- end }}
 spec:
   type: ClusterIP
   ports:

diff --git a/charts/proxy/templates/service.yaml b/charts/proxy/templates/service.yaml
@@ -8,7 +8,11 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   annotations:
+    {{- if ge (.Capabilities.KubeVersion.Minor|int) 26 }}
+    service.kubernetes.io/topology-mode: Auto
+    {{- else }}
     service.kubernetes.io/topology-aware-hints: auto
+    {{- end }}
 spec:
   type: ClusterIP
   ports:

diff --git a/charts/spar/templates/service.yaml b/charts/spar/templates/service.yaml
@@ -8,7 +8,11 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
   annotations:
+    {{- if ge (.Capabilities.KubeVersion.Minor|int) 26 }}
+    service.kubernetes.io/topology-mode: Auto
+    {{- else }}
     service.kubernetes.io/topology-aware-hints: auto
+    {{- end }}
 spec:
   type: ClusterIP
   ports: