Merge pull request #674 from percona/K8SPS-310

K8SPS-310 update tls certificate issuer name

Author: nmarukovich

e2e-tests/tests/gr-finalizer/02-assert.yaml

@@ -13,7 +13,7 @@ spec:
   isCA: true
   issuerRef:
     kind: Issuer
-    name: gr-finalizer-pso-ca-issuer
+    name: gr-finalizer-ps-ca-issuer
   renewBefore: 730h0m0s
   secretName: gr-finalizer-ca-cert
 status:
@@ -33,7 +33,7 @@ metadata:
 spec:
   issuerRef:
     kind: Issuer
-    name: gr-finalizer-pso-issuer
+    name: gr-finalizer-ps-issuer
   secretName: test-ssl
 status:
   conditions:
@@ -90,7 +90,7 @@ metadata:
     cert-manager.io/certificate-name: gr-finalizer-ca-cert
     cert-manager.io/common-name: gr-finalizer-ca
     cert-manager.io/issuer-kind: Issuer
-    cert-manager.io/issuer-name: gr-finalizer-pso-ca-issuer
+    cert-manager.io/issuer-name: gr-finalizer-ps-ca-issuer
   labels:
     controller.cert-manager.io/fao: "true"
   name: gr-finalizer-ca-cert
@@ -102,7 +102,7 @@ metadata:
   annotations:
     cert-manager.io/certificate-name: gr-finalizer-ssl
     cert-manager.io/issuer-kind: Issuer
-    cert-manager.io/issuer-name: gr-finalizer-pso-issuer
+    cert-manager.io/issuer-name: gr-finalizer-ps-issuer
   labels:
     controller.cert-manager.io/fao: "true"
   name: test-ssl
@@ -112,15 +112,15 @@ apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   generation: 1
-  name: gr-finalizer-pso-ca-issuer
+  name: gr-finalizer-ps-ca-issuer
 spec:
   selfSigned: {}
 ---
 apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   generation: 1
-  name: gr-finalizer-pso-issuer
+  name: gr-finalizer-ps-issuer
 spec:
   ca:
     secretName: gr-finalizer-ca-cert

e2e-tests/tests/gr-finalizer/07-errors.yaml

@@ -36,12 +36,12 @@ metadata:
 apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
-  name: gr-finalizer-pso-ca-issuer
+  name: gr-finalizer-ps-ca-issuer
 ---
 apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
-  name: gr-finalizer-pso-issuer
+  name: gr-finalizer-ps-issuer
 ---
 apiVersion: apps/v1
 kind: StatefulSet

e2e-tests/tests/gr-tls-cert-manager/02-assert.yaml

@@ -12,7 +12,7 @@ spec:
   isCA: true
   issuerRef:
     kind: Issuer
-    name: gr-tls-cert-manager-pso-ca-issuer
+    name: gr-tls-cert-manager-ps-ca-issuer
   renewBefore: 730h0m0s
   secretName: gr-tls-cert-manager-ca-cert
 status:
@@ -31,7 +31,7 @@ metadata:
 spec:
   issuerRef:
     kind: Issuer
-    name: gr-tls-cert-manager-pso-issuer
+    name: gr-tls-cert-manager-ps-issuer
   secretName: test-ssl
 status:
   conditions:

e2e-tests/tests/gr-tls-cert-manager/04-assert.yaml

@@ -12,7 +12,7 @@ spec:
   isCA: true
   issuerRef:
     kind: Issuer
-    name: gr-tls-cert-manager-pso-ca-issuer
+    name: gr-tls-cert-manager-ps-ca-issuer
   renewBefore: 730h0m0s
   secretName: gr-tls-cert-manager-ca-cert
 status:
@@ -31,7 +31,7 @@ metadata:
 spec:
   issuerRef:
     kind: Issuer
-    name: gr-tls-cert-manager-pso-issuer
+    name: gr-tls-cert-manager-ps-issuer
   secretName: test-ssl
 status:
   conditions:

e2e-tests/tests/gr-tls-cert-manager/06-assert.yaml

@@ -12,7 +12,7 @@ spec:
   isCA: true
   issuerRef:
     kind: Issuer
-    name: gr-tls-cert-manager-pso-ca-issuer
+    name: gr-tls-cert-manager-ps-ca-issuer
   renewBefore: 730h0m0s
   secretName: gr-tls-cert-manager-ca-cert
 status:
@@ -31,7 +31,7 @@ metadata:
 spec:
   issuerRef:
     kind: Issuer
-    name: gr-tls-cert-manager-pso-issuer
+    name: gr-tls-cert-manager-ps-issuer
   secretName: test-ssl
 status:
   conditions:

e2e-tests/tests/tls-cert-manager/02-assert.yaml

@@ -12,7 +12,7 @@ spec:
   isCA: true
   issuerRef:
     kind: Issuer
-    name: tls-cert-manager-pso-ca-issuer
+    name: tls-cert-manager-ps-ca-issuer
   renewBefore: 730h0m0s
   secretName: tls-cert-manager-ca-cert
 status:
@@ -31,7 +31,7 @@ metadata:
 spec:
   issuerRef:
     kind: Issuer
-    name: tls-cert-manager-pso-issuer
+    name: tls-cert-manager-ps-issuer
   secretName: test-ssl
 status:
   conditions:

e2e-tests/tests/tls-cert-manager/04-assert.yaml

@@ -12,7 +12,7 @@ spec:
   isCA: true
   issuerRef:
     kind: Issuer
-    name: tls-cert-manager-pso-ca-issuer
+    name: tls-cert-manager-ps-ca-issuer
   renewBefore: 730h0m0s
   secretName: tls-cert-manager-ca-cert
 status:
@@ -31,7 +31,7 @@ metadata:
 spec:
   issuerRef:
     kind: Issuer
-    name: tls-cert-manager-pso-issuer
+    name: tls-cert-manager-ps-issuer
   secretName: test-ssl
 status:
   conditions:

e2e-tests/tests/tls-cert-manager/06-assert.yaml

@@ -12,7 +12,7 @@ spec:
   isCA: true
   issuerRef:
     kind: Issuer
-    name: tls-cert-manager-pso-ca-issuer
+    name: tls-cert-manager-ps-ca-issuer
   renewBefore: 730h0m0s
   secretName: tls-cert-manager-ca-cert
 status:
@@ -31,7 +31,7 @@ metadata:
 spec:
   issuerRef:
     kind: Issuer
-    name: tls-cert-manager-pso-issuer
+    name: tls-cert-manager-ps-issuer
   secretName: test-ssl
 status:
   conditions:

pkg/controller/ps/controller.go

@@ -285,8 +285,8 @@ func (r *PerconaServerMySQLReconciler) deleteCerts(ctx context.Context, cr *apiv
 	log.Info("Deleting SSL certificates")
 
 	issuers := []string{
-		cr.Name + "-pso-ca-issuer",
-		cr.Name + "-pso-issuer",
+		cr.Name + "-ps-ca-issuer",
+		cr.Name + "-ps-issuer",
 	}
 	for _, issuerName := range issuers {
 		issuer := &cm.Issuer{}

pkg/controller/ps/tls.go

@@ -110,8 +110,8 @@ func (r *PerconaServerMySQLReconciler) checkTLSIssuer(ctx context.Context, cr *a
 }
 
 func (r *PerconaServerMySQLReconciler) ensureSSLByCertManager(ctx context.Context, cr *apiv1alpha1.PerconaServerMySQL) error {
-	issuerName := cr.Name + "-pso-issuer"
-	caIssuerName := cr.Name + "-pso-ca-issuer"
+	issuerName := cr.Name + "-ps-issuer"
+	caIssuerName := cr.Name + "-ps-ca-issuer"
 	issuerKind := "Issuer"
 	issuerGroup := ""
 	if cr.Spec.TLS != nil && cr.Spec.TLS.IssuerConf != nil {