Skip to content

Commit

Permalink
Remove tolerate-unready-endpoints annotation
Browse files Browse the repository at this point in the history
* This annotation has been deprecated since Kuberneets 1.8 and the
  publishNotReadyAddresses parameter replacing it has been correctly
  implemented in Kubernetes 1.11 (see kubernetes/kubernetes#63742)
* See also: hashicorp#363
  • Loading branch information
trihoangvo committed Jan 21, 2025
1 parent aaea303 commit c64c698
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 30 deletions.
4 changes: 0 additions & 4 deletions templates/server-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
annotations:
# This must be set in addition to publishNotReadyAddresses due
# to an open issue where it may not work:
# https://github.com/kubernetes/kubernetes/issues/58662
service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
{{- if .Values.server.service.annotations }}
{{ toYaml .Values.server.service.annotations | indent 4 }}
{{- end }}
Expand Down
26 changes: 0 additions & 26 deletions test/unit/server-service.bats
Original file line number Diff line number Diff line change
Expand Up @@ -114,32 +114,6 @@ load _helpers
[ "${actual}" = "false" ]
}

# This can be seen as testing just what we put into the YAML raw, but
# this is such an important part of making everything work we verify it here.
@test "server/Service: tolerates unready endpoints" {
cd `chart_dir`
local actual=$(helm template \
-x templates/server-service.yaml \
--set 'server.dev.enabled=true' \
. | tee /dev/stderr |
yq -r '.metadata.annotations["service.alpha.kubernetes.io/tolerate-unready-endpoints"]' | tee /dev/stderr)
[ "${actual}" = "true" ]

local actual=$(helm template \
-x templates/server-service.yaml \
--set 'server.ha.enabled=true' \
. | tee /dev/stderr |
yq -r '.metadata.annotations["service.alpha.kubernetes.io/tolerate-unready-endpoints"]' | tee /dev/stderr)
[ "${actual}" = "true" ]

local actual=$(helm template \
-x templates/server-service.yaml \
--set 'server.standalone.enabled=true' \
. | tee /dev/stderr |
yq -r '.metadata.annotations["service.alpha.kubernetes.io/tolerate-unready-endpoints"]' | tee /dev/stderr)
[ "${actual}" = "true" ]
}

@test "server/Service: generic annotations" {
cd `chart_dir`
local actual=$(helm template \
Expand Down

0 comments on commit c64c698

Please sign in to comment.