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 new file mode 100644 index 0000000000..3f0595dadb --- /dev/null +++ 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 index abd7d27f40..283fbce662 100644 --- 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 index a3ae8a9d9b..43a5d59d7c 100644 --- 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 index 63d52526e2..58811c4819 100644 --- 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 index 2788f00c0d..e753a88c67 100644 --- 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 index 901c35abaa..ea0ba2cfed 100644 --- 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 index c6d7422a79..28fd6f8fd3 100644 --- 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 index 22d018b913..1e235c0f36 100644 --- 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 index d7cdd38ce4..3e40104791 100644 --- 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 index c685bd4504..1227bec606 100644 --- 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 index 4a178e268e..4577185b8b 100644 --- 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 index 6a5c2420f7..6fcc0ea5b3 100644 --- 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 index f3640fa434..478ad3d6a3 100644 --- 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 index 201b604a82..46e652c65b 100644 --- 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: