Skip to content

Commit 096c15b

Browse files
committed
remove beta and alpha annotation for cert-manager
1 parent 4122d88 commit 096c15b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

api/kubernetes/deploy_via_helm.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ controller:
131131
networking/traffic-allowed: "yes"
132132
replicaCount: "${NGINX_INGRESS_CONTROLLER_REPLICA_COUNT}"
133133
nodeSelector:
134-
beta.kubernetes.io/os: "linux"
134+
kubernetes.io/os: "linux"
135135
service:
136136
labels:
137137
networking/traffic-allowed: "yes"
@@ -143,7 +143,7 @@ defaultBackend:
143143
podLabels:
144144
networking/traffic-allowed: "yes"
145145
nodeSelector:
146-
"beta.kubernetes.io/os": "linux"
146+
"kubernetes.io/os": "linux"
147147
148148
EOF
149149

@@ -175,19 +175,19 @@ if [[ "${CERT_MANAGER_ENABLED:-false}" == "true" ]]; then
175175
--wait \
176176
--timeout "${CERT_MANAGER_INSTALL_WAIT_TIMEOUT:-3m}" \
177177
--set installCRDs=true \
178-
--set nodeSelector."beta\.kubernetes\.io/os"=linux \
178+
--set nodeSelector."kubernetes\.io/os"=linux \
179179
--set podLabels."networking/traffic-allowed"=yes \
180180
--set webhook.podLabels."networking/traffic-allowed"=yes \
181181
--set cainjector.podLabels."networking/traffic-allowed"=yes
182182

183183
if [[ "${COSMOTECH_API_DNS_NAME:-}" != "" && "${TLS_CERTIFICATE_LET_S_ENCRYPT_CONTACT_EMAIL:-}" != "" ]]; then
184184
# Wait few seconds until the CertManager WebHook pod is ready.
185185
# Otherwise, we might run into the following issue :
186-
# Error from server: error when creating "STDIN": conversion webhook for cert-manager.io/v1alpha2,
186+
# Error from server: error when creating "STDIN": conversion webhook for cert-manager.io/v1,
187187
# Kind=Certificate failed: Post "https://cert-manager-webhook.${NAMESPACE}.svc:443/convert?timeout=30s"
188188
sleep 25
189189
cat <<EOF | kubectl --namespace "${NAMESPACE}" apply --validate=false -f -
190-
apiVersion: cert-manager.io/v1alpha2
190+
apiVersion: cert-manager.io/v1
191191
kind: ClusterIssuer
192192
metadata:
193193
name: letsencrypt-${CERT_MANAGER_ACME}
@@ -211,7 +211,7 @@ spec:
211211
212212
---
213213
214-
apiVersion: cert-manager.io/v1alpha2
214+
apiVersion: cert-manager.io/v1
215215
kind: Certificate
216216
metadata:
217217
name: ${TLS_SECRET_NAME}

0 commit comments

Comments
 (0)