Explorar o código

HUE-8888 [k8s] Fix ssl certificate conflict between hue and docs

Romain %!s(int64=6) %!d(string=hai) anos
pai
achega
05eb5d88d6

+ 3 - 3
tools/kubernetes/helm/hue/README.md

@@ -66,7 +66,7 @@ Then based on Jetstack and Let's encrypt and nginx-ingress:
 
 Generate certificates:
 
-    kubectl apply -f tools/kubernetes/yaml/cert-manager/clusterissuer-letsencrypt-prod.yaml
+    kubectl apply -f tools/kubernetes/yaml/cert-manager/clusterissuer-letsencrypt-hue-prod.yaml
     kubectl apply -f tools/kubernetes/yaml/cert-manager/ingress-https.yaml
 
     kubectl get certificate
@@ -74,8 +74,8 @@ Generate certificates:
 
 Reset certificate:
 
-    kubectl delete certificate letsencrypt-prod
-    kubectl delete secrets letsencrypt-prod
+    kubectl delete certificate letsencrypt-hue-prod
+    kubectl delete secrets letsencrypt-hue-prod
 
 Debug certificate:
 

+ 2 - 2
tools/kubernetes/helm/hue/templates/clusterissuer-letsencrypt-prod.yaml

@@ -2,7 +2,7 @@
 apiVersion: certmanager.k8s.io/v1alpha1
 kind: ClusterIssuer
 metadata:
-  name: letsencrypt-prod
+  name: letsencrypt-hue-prod
 spec:
   acme:
     # The ACME server URL
@@ -11,7 +11,7 @@ spec:
     email: {{ .Values.ingress.email }}
     # Name of a secret used to store the ACME account private key
     privateKeySecretRef:
-      name: letsencrypt-prod
+      name: letsencrypt-hue-prod
     # Enable the HTTP-01 challenge provider
     http01: {}
 {{- end -}}

+ 1 - 1
tools/kubernetes/helm/hue/templates/ingress-http.yaml

@@ -2,7 +2,7 @@
 apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
-  name: hue-ingress
+  name: hue
   annotations:
     kubernetes.io/ingress.class: nginx
     nginx.ingress.kubernetes.io/affinity: "cookie"

+ 3 - 3
tools/kubernetes/helm/hue/templates/ingress-https.yaml

@@ -2,10 +2,10 @@
 apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
-  name: hue-ingress
+  name: hue
   annotations:
     kubernetes.io/ingress.class: nginx
-    certmanager.k8s.io/cluster-issuer: letsencrypt-prod
+    certmanager.k8s.io/cluster-issuer: letsencrypt-hue-prod
     certmanager.k8s.io/acme-challenge-type: http01
     nginx.ingress.kubernetes.io/ssl-redirect: "true"
     nginx.ingress.kubernetes.io/affinity: "cookie"
@@ -24,5 +24,5 @@ spec:
   tls:
   - hosts:
     - {{ .Values.ingress.domain }}
-    secretName: letsencrypt-pro
+    secretName: letsencrypt-hue-prod
 {{- end -}}

+ 1 - 1
tools/kubernetes/helm/website/templates/clusterissuer-letsencrypt-prod.yaml

@@ -11,7 +11,7 @@ spec:
     email: {{ .Values.ingress.email }}
     # Name of a secret used to store the ACME account private key
     privateKeySecretRef:
-      name: letsencrypt-prod
+      name: letsencrypt-website-prod
     # Enable the HTTP-01 challenge provider
     http01: {}
 {{- end -}}

+ 1 - 1
tools/kubernetes/helm/website/templates/ingress-https.yaml

@@ -24,5 +24,5 @@ spec:
   tls:
   - hosts:
     - {{ .Values.docs.domain }}
-    secretName: letsencrypt-pro
+    secretName: letsencrypt-website-prod
 {{- end -}}

+ 3 - 3
tools/kubernetes/yaml/cert-manager/clusterissuer-letsencrypt-prod.yaml

@@ -1,15 +1,15 @@
 apiVersion: certmanager.k8s.io/v1alpha1
 kind: ClusterIssuer
 metadata:
-  name: letsencrypt-prod
+  name: letsencrypt-hue-prod
 spec:
   acme:
     # The ACME server URL
     server: https://acme-v02.api.letsencrypt.org/directory
     # Email address used for ACME registration
-    email: romain.rigaux@gmail.com
+    email: team@gethue.com
     # Name of a secret used to store the ACME account private key
     privateKeySecretRef:
-      name: letsencrypt-prod
+      name: letsencrypt-hue-prod
     # Enable the HTTP-01 challenge provider
     http01: {}

+ 1 - 1
tools/kubernetes/yaml/cert-manager/clusterissuer-letsencrypt-staging.yaml

@@ -7,7 +7,7 @@ spec:
    # The ACME server URL
    server: https://acme-staging-v02.api.letsencrypt.org/directory
    # Email address used for ACME registration
-   email: romain.rigaux@gmail.com
+   email: team@gethue.com
    # Name of a secret used to store the ACME account private key
    privateKeySecretRef:
      name: letsencrypt-staging

+ 1 - 1
tools/kubernetes/yaml/cert-manager/ingress-http.yaml

@@ -19,4 +19,4 @@ spec:
   # tls:
   # - hosts:
   #   - demo.gethue.com
-  #   secretName: letsencrypt-pro
+  #   secretName: letsencrypt-prod

+ 2 - 2
tools/kubernetes/yaml/cert-manager/ingress-https.yaml

@@ -4,7 +4,7 @@ metadata:
   name: hue-ingress
   annotations:
     kubernetes.io/ingress.class: nginx
-    certmanager.k8s.io/cluster-issuer: letsencrypt-prod
+    certmanager.k8s.io/cluster-issuer: letsencrypt-hue-prod
     certmanager.k8s.io/acme-challenge-type: http01
     nginx.ingress.kubernetes.io/ssl-redirect: "true"
 spec:
@@ -19,4 +19,4 @@ spec:
   tls:
   - hosts:
     - demo.gethue.com
-    secretName: letsencrypt-pro
+    secretName: letsencrypt-hue-prod