Skip to content

Commit

Permalink
docs: Remove old annotations (argoproj#12168)
Browse files Browse the repository at this point in the history
* Remove old annotations

This commit removes a few annotations and updates the secret that argocd uses for tls.

1. Removes the ingress class annotation, it's been replaced by the ingressClassName argument in the spec: https://kubernetes.io/docs/concepts/services-networking/ingress/#deprecated-annotation
2. Removes an old annotation used by cert-manager: https://cert-manager.io/docs/usage/ingress/#optional-configuration
3. Updates the serverName to the new argocd-server-tls secret.

Signed-off-by: Chris Wiggins <5607419+cwiggs@users.noreply.github.com>

* Remote whitespace

Signed-off-by: Chris Wiggins <5607419+cwiggs@users.noreply.github.com>

---------

Signed-off-by: Chris Wiggins <5607419+cwiggs@users.noreply.github.com>
  • Loading branch information
cwiggs authored and xiaowu.zhu committed Aug 9, 2023
1 parent 35ed5f4 commit 2fd8aa3
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions docs/operator-manual/ingress.md
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ metadata:
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
nginx.ingress.kubernetes.io/ssl-passthrough: "true"
spec:
ingressClassName: "nginx"
ingressClassName: nginx
rules:
- host: argocd.example.com
http:
Expand Down Expand Up @@ -218,14 +218,13 @@ metadata:
namespace: argocd
annotations:
cert-manager.io/cluster-issuer: letsencrypt-prod
kubernetes.io/tls-acme: "true"
nginx.ingress.kubernetes.io/ssl-passthrough: "true"
# If you encounter a redirect loop or are getting a 307 response code
# then you need to force the nginx ingress to connect to the backend using HTTPS.
#
nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
spec:
ingressClassName: "nginx"
ingressClassName: nginx
rules:
- host: argocd.example.com
http:
Expand Down Expand Up @@ -259,7 +258,7 @@ metadata:
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
spec:
ingressClassName: "nginx"
ingressClassName: nginx
rules:
- http:
paths:
Expand All @@ -274,7 +273,7 @@ spec:
tls:
- hosts:
- argocd.example.com
secretName: argocd-secret # do not change, this is provided by Argo CD
secretName: argocd-server-tls # do not change, this is provided by Argo CD
```

gRPC Ingress:
Expand All @@ -287,7 +286,7 @@ metadata:
annotations:
nginx.ingress.kubernetes.io/backend-protocol: "GRPC"
spec:
ingressClassName: "nginx"
ingressClassName: nginx
rules:
- http:
paths:
Expand All @@ -302,7 +301,7 @@ spec:
tls:
- hosts:
- grpc.argocd.example.com
secretName: argocd-secret # do not change, this is provided by Argo CD
secretName: argocd-server-tls # do not change, this is provided by Argo CD
```

The API server should then be run with TLS disabled. Edit the `argocd-server` deployment to add the
Expand Down

0 comments on commit 2fd8aa3

Please sign in to comment.