Issue 625: updated pravega default version and fixed e2e

.github/workflows/CI.yml

@@ -51,12 +51,12 @@ jobs:
     - name: Creating nodes
       run: |
         cd .. && tar -czvf pravega-operator.tar.gz pravega-operator
-        packet-cli device create  -H  $CLUSTER_NAME"-master"  -o "ubuntu_20_04" -P c3.small.x86 -p 454b8b42-33d3-4e7e-8acf-1d1a5fec7e85 -f da11
+        packet-cli device create  -H  $CLUSTER_NAME"-master"  -o "ubuntu_20_04" -P c3.medium.x86 -p 454b8b42-33d3-4e7e-8acf-1d1a5fec7e85 -f da11
         packet-cli device get -p 454b8b42-33d3-4e7e-8acf-1d1a5fec7e85 | grep $CLUSTER_NAME"-master" | awk '{print $2}'
         CLUSTER_ID=$(packet-cli device get -p 454b8b42-33d3-4e7e-8acf-1d1a5fec7e85 | grep $CLUSTER_NAME"-master" | awk '{print $2}' | tr -d ' ')
         echo "cluster id is $CLUSTER_ID"
-        packet-cli device create  -H  $CLUSTER_NAME"-worker1"  -o "ubuntu_20_04" -P c3.small.x86 -p 454b8b42-33d3-4e7e-8acf-1d1a5fec7e85 -f  da11
-        packet-cli device create  -H  $CLUSTER_NAME"-worker2"  -o "ubuntu_20_04" -P c3.small.x86 -p 454b8b42-33d3-4e7e-8acf-1d1a5fec7e85 -f  da11
+        packet-cli device create  -H  $CLUSTER_NAME"-worker1"  -o "ubuntu_20_04" -P c3.medium.x86 -p 454b8b42-33d3-4e7e-8acf-1d1a5fec7e85 -f  da11
+        packet-cli device create  -H  $CLUSTER_NAME"-worker2"  -o "ubuntu_20_04" -P c3.medium.x86 -p 454b8b42-33d3-4e7e-8acf-1d1a5fec7e85 -f  da11
         MASTER_STATE=$(packet-cli device get -p 454b8b42-33d3-4e7e-8acf-1d1a5fec7e85 | grep $CLUSTER_NAME"-master" | awk '{print $10}' | tr -d ' ')
         while [ "$MASTER_STATE" != "active" ]; do MASTER_STATE=`packet-cli device get -p 454b8b42-33d3-4e7e-8acf-1d1a5fec7e85 | grep $CLUSTER_NAME"-master" | awk '{print $10}' | tr -d ' '`;sleep 30;done
         CLUSTER_IP=$(packet-cli device get -i $CLUSTER_ID -y | grep "\- address:" | head -1 |awk '{print $3}' | tr -d ' ')
@@ -105,7 +105,6 @@ jobs:
         ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "kubectl -n default create -f /root/pravega-operator/test/e2e/resources/bk/bkoperator/certificate.yaml"
         ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "kubectl -n default create -f /root/pravega-operator/test/e2e/resources/bk/bkoperator/webhook.yaml"
         ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "kubectl -n default create -f /root/pravega-operator/test/e2e/resources/bk/bkoperator/bk-config-map.yaml"
-        ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "kubectl -n default create -f /root/pravega-operator/test/e2e/resources/bk/bkoperator/bk-version-map.yaml"
         ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "kubectl -n default create -f /root/pravega-operator/test/e2e/resources/bk/bkoperator/service_account.yaml"
         ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "kubectl -n default create -f /root/pravega-operator/test/e2e/resources/bk/bkoperator/role.yaml"
         ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "kubectl -n default create -f /root/pravega-operator/test/e2e/resources/bk/bkoperator/role_binding.yaml"
@@ -125,13 +124,13 @@ jobs:
         ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "cd /root/pravega-operator/test/e2e/resources/key_tls"
         ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "cd /root/pravega-operator/test/e2e/resources/key_tls; kubectl create secret generic controller-tls \
         --from-file=./controller01.pem \
-        --from-file=./ca-cert \
+        --from-file=./tls.crt \
         --from-file=./controller01.key.pem \
         --from-file=./controller01.jks \
         --from-file=./pass-secret-tls"
         ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "cd /root/pravega-operator/test/e2e/resources/key_tls; kubectl create secret generic segmentstore-tls \
         --from-file=./segmentstore01.pem \
-        --from-file=./ca-cert \
+        --from-file=./tls.crt \
         --from-file=./segmentstore01.jks \
         --from-file=./pass-secret-tls \
         --from-file=./segmentstore01.key.pem"

api/v1beta1/pravegacluster_types.go

@@ -40,7 +40,7 @@ const (
 
 	// DefaultPravegaVersion is the default tag used for for the Pravega
 	// Docker image
-	DefaultPravegaVersion = "0.9.0"
+	DefaultPravegaVersion = "0.11.0"
 
 	// OperatorNameEnvVar is env variable for operator name
 	OperatorNameEnvVar = "OPERATOR_NAME"

api/v1beta1/pravegacluster_types_test.go

@@ -67,8 +67,8 @@ var _ = Describe("PravegaCluster Types Spec", func() {
 			Ω(p.Spec.ExternalAccess).ShouldNot(BeNil())
 		})
 
-		It("should set version to 0.9.0", func() {
-			Ω(p.Spec.Version).Should(Equal("0.9.0"))
+		It("should set version to 0.11.0", func() {
+			Ω(p.Spec.Version).Should(Equal("0.11.0"))
 		})
 
 		It("should set pravega spec", func() {

pkg/test/e2e/e2eutil/pravegacluster_util.go

@@ -172,17 +172,17 @@ func CreatePravegaClusterWithTlsAuth(t *testing.T, k8client client.Client, p *ap
 		"controller.security.tls.enable":                                    "true",
 		"controller.security.tls.server.certificate.location":               "/etc/secret-volume/controller01.pem",
 		"controller.security.tls.server.privateKey.location":                "/etc/secret-volume/controller01.key.pem",
-		"controller.security.tls.trustStore.location":                       "/etc/secret-volume/ca-cert",
+		"controller.security.tls.trustStore.location":                       "/etc/secret-volume/tls.crt",
 		"controller.security.tls.server.keyStore.location":                  "/etc/secret-volume/controller01.jks",
 		"controller.security.tls.server.keyStore.pwd.location":              "/etc/secret-volume/pass-secret-tls",
 		"controller.security.pwdAuthHandler.accountsDb.location":            "/etc/auth-passwd-volume/pass-secret-tls-auth.txt",
 		"pravegaservice.security.tls.enable":                                "true",
 		"pravegaservice.security.tls.server.certificate.location":           "/etc/secret-volume/segmentstore01.pem",
 		"pravegaservice.security.tls.server.privateKey.location":            "/etc/secret-volume/segmentstore01.key.pem",
 		"pravegaservice.security.tls.server.keyStore.location":              "/etc/secret-volume/segmentstore01.jks",
-		"pravegaservice.security.tls.truststore.location":                   "/etc/secret-volume/ca-cert",
+		"pravegaservice.security.tls.truststore.location":                   "/etc/secret-volume/tls.crt",
 		"autoScale.controller.connect.security.tls.enable":                  "true",
-		"autoScale.controller.connect.security.tls.truststore.location":     "/etc/secret-volume/ca-cert",
+		"autoScale.controller.connect.security.tls.truststore.location":     "/etc/secret-volume/tls.crt",
 		"bookkeeper.connect.security.tls.enable":                            "true",
 		"bookkeeper.connect.security.tls.trustStore.location":               "empty",
 		"autoScale.controller.connect.security.tls.validateHostName.enable": "true",
@@ -191,6 +191,10 @@ func CreatePravegaClusterWithTlsAuth(t *testing.T, k8client client.Client, p *ap
 		"autoScale.security.auth.token.signingKey.basis":                    "secret",
 		"pravega.client.auth.token":                                         "YWRtaW46MTExMV9hYWFh",
 		"pravega.client.auth.method":                                        "Basic",
+		"controller.security.tls.protocolVersion":                           "TLSv1.2",
+		"pravegaservice.security.tls.protocolVersion":                       "TLSv1.2",
+		"pravegaservice.security.tls.server.keyStore.pwd.location":          "/etc/secret-volume/pass-secret-tls",
+		"pravegaservice.security.tls.certificate.autoReload.enable":         "true",
 	}
 	p.Spec.Pravega.ControllerJvmOptions = []string{"-XX:MaxDirectMemorySize=1g"}
 

test/e2e/resources/bk/bkoperator/operator.yaml

@@ -36,12 +36,7 @@ spec:
             - name: webhook-cert
               mountPath: "/tmp/k8s-webhook-server/serving-certs"
               readOnly: true
-            - name: versions-volume
-              mountPath: "/tmp/config"
       volumes:
         - name: webhook-cert
           secret:
             secretName: selfsigned-cert-tls-bk
-        - name: versions-volume
-          configMap:
-            name: bk-supported-versions-map

test/e2e/resources/bk/bkoperator/webhook.yaml

@@ -7,7 +7,7 @@ spec:
   ports:
   - port: 443
     protocol: TCP
-    targetPort: 443
+    targetPort: 9443
   selector:
     component: bookkeeper-operator
   sessionAffinity: None
@@ -40,5 +40,5 @@ webhooks:
     - bookkeeperclusters
     scope: "*"
   admissionReviewVersions: ["v1beta1", "v1"]
-  sideEffects: None  
+  sideEffects: None
   timeoutSeconds: 30

test/e2e/resources/key_tls/ca-cert

@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDqTCCApGgAwIBAgIJAIOotIFrzAGkMA0GCSqGSIb3DQEBCwUAMGsxCzAJBgNV
+MIIDqTCCApGgAwIBAgIJAPhzNcyIwhL6MA0GCSqGSIb3DQEBCwUAMGsxCzAJBgNV
 BAYTAklOMRIwEAYDVQQIDAlrYXJuYXRha2ExEjAQBgNVBAcMCWJhbmdhbG9yZTEQ
 MA4GA1UECgwHcHJhdmVnYTEQMA4GA1UECwwHcHJhdmVnYTEQMA4GA1UEAwwHcHJh
-dmVnYTAeFw0yMDA2MjQxMjE5MTlaFw0yMTA2MjQxMjE5MTlaMGsxCzAJBgNVBAYT
+dmVnYTAeFw0yMTA2MDQxMDI1MTJaFw0yMzA2MDQxMDI1MTJaMGsxCzAJBgNVBAYT
 AklOMRIwEAYDVQQIDAlrYXJuYXRha2ExEjAQBgNVBAcMCWJhbmdhbG9yZTEQMA4G
 A1UECgwHcHJhdmVnYTEQMA4GA1UECwwHcHJhdmVnYTEQMA4GA1UEAwwHcHJhdmVn
-YTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN3WNoe2LJP9+BlL6w2r
-SSrNSNcC2Y2cFO4I1g+AV+CdjoiJo7FmDrwgEkpwk1Us1eFsZepr/4xZjh6lzyOl
-/GbnAA7xlLPFd9GcT/qEg2Zq3WelsrPQ5bgcNPlHlk05CtsPOhHhTRa8MUIoHHdl
-V+EHFWNaeDzrNvKHcFMO6qUmq0pVcJCiRU4r9jO4C4CEH7LbDIBzPHx0aBDYhWOD
-wR6+WYQhL/174KKVMVxQfkv6JodiWWl5W4bYUn634+TvrW8snz9Ha81Bo35hAF8z
-NZxbPfhTM8bS4AepvoYLvN9I0/iQVxcRoxMma7uIWmTh09Js8R/Fyx6G/b8uPtCD
-r3sCAwEAAaNQME4wHQYDVR0OBBYEFJ8Qo/WX1MWvgCAZOPmht1kdNPyHMB8GA1Ud
-IwQYMBaAFJ8Qo/WX1MWvgCAZOPmht1kdNPyHMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQELBQADggEBACFmuOtx5RIR4T0jY7txpCLZYq4R8E7TOxz7Sl0dcY4m+vU7
-TMmB7nQ21X+2wnpm0aMCsMgtVJ0q0/gy9jrJ3xgkMxTsJy1CqwTFiIhmhEwryQvs
-plRYbtWAomnvPoMBg/VKMqB+PrJ6fEisk9QMuEpAW8mMX8q6NujQYjbDDI8QzsOG
-nqkIv8dFQCWa8aECjFYWKELYCsaP/noHd+2xsFCQCmpk9D7FM3hUyXT/g0C/6NSN
-0J+S18s+P+hr2VzoydeCS2SXuv06mCt1HuOBsKbzXGFVKOaBmwDcqwpU0sUXuJjs
-huGoYOnoUa83TkIDvbEwQnoC1S1HraNmtYqQ37Y=
+YTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANVYia9lYoGuMkw+VvYp
+eiFLWg4TDyjRait/EoMKYPnL4q8y0UoidyBPqb1IhmbGWk9FtZ5BlekAQvhoLeEF
+UqmF+JFRcBwQsG47RsCie4yx71xPvD6BhGzG/jU+soaTDq/Z3D8ITHUeojSu2NdQ
+ZohRLyj8k9M0+x9fL18Jhj4JV0D8hD6ahIm+m3+PGocbj9ELPKewxAsm4BGg+UWF
+RgHbi4ot7dR66UvP8yBkh0ij5529vL+xVXTZixUd3J0r7Gxx0xZ8VD8EtB6QQryJ
+MPcjVhl3CLNKlnQqRGwoelw8SEldD8rSebo3yH1QSNRQNeJRO5pt4r5mQF+icJUJ
+OskCAwEAAaNQME4wHQYDVR0OBBYEFBO7FsjBG+9grr8uHoobc0HEYuRcMB8GA1Ud
+IwQYMBaAFBO7FsjBG+9grr8uHoobc0HEYuRcMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADggEBAIJPAj1ez8bofOIAGhYYgZ7wo8rAogRKpQdRPhpsmVcJiYs6
+gHLQhOAI3vmPmVl4frNuhvbnGDc7aLZVj45RmdJv9P45bVCxGqFyJwzx6NsMO+AW
+rbku+1ez2zOiCSPpswfZTLuaZgD7ds3KoJ6tnYv3QjmjmYNIBNBJsXE6F6IY4dfl
+czErQcmgcVTFzYEV1bgyAv96KD4IkalUlF/E29T0OhUf2NepZyR+WGXJvzqYHw/w
+RWzxfnxkAGjdMk6aqP/FIQPDQOyHtsu8SLTOoxRlmxHyrmL70We5T9ZaOx/XIkgV
+54wW8qj+9VjsdtfWLSNz8QqOggmN/gGLPvj6rWY=
 -----END CERTIFICATE-----

test/e2e/resources/key_tls/ca-cert.srl

@@ -1 +1 @@
-FC478FF97D8D48B5
+92BDABFB51C83F6D

test/e2e/resources/key_tls/ca-key

@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIFQkyPV8AN5YCAggA
-MBQGCCqGSIb3DQMHBAgNa/HhPo3IpwSCBMiXRVS1NCbmYvxapkkZLKPDIoXrfBpJ
-yYsens1lwZB3cGbccaQEESK6uYV6kMl32JvmKvOIQAB/EYjE5bVkymd89TVzOIw4
-IMNHddJSm7+BqlCXKoo4HxIHYuPDUrsLVsZm5qj34G1v9ShybW+P007pB22nkVLt
-wpBlRffiHfcWpd2VNPCM0U5+NGZ9U1ZEKhrJjVclw5iCa765tuYIZYbl24IRaBm8
-XAx+XuoQ35ODxw/sYCp8tCrpU0ogCA3TiHMeZQoM/UvQyukAWKSamIVRWrJ3LTMV
-RVUYuT5ffJjInnHg2TNJwCDX18Mqvw2Y77kJ9Bl3IVTTLCGCGqAHJp9zGjDK5vCW
-73yzW70UMNDsACuVY51wX9Lz4NLjOuyFu2mrcwbL9nEDFNnox50Rn8IBildZZwQE
-+ZgTr6xZdL+oUfKKKtoXnUcC9FXXicIXMx6299h1+IuUMjnq+yZ+RGW4M83RCkwL
-Xk8Cik4S6j/8GDON+ptfH8bUNor6AKupec6uWFTAtodR1EfOfj5N6Mv0idFA5ZEA
-KNLHZgVawzXK91UpdaSk97yeEfdeNlrFhvtIyHaIULWd+sNAHdr5R94b1riFoQip
-Wo+ACNReY0zBE56tYQ4Swibv7iU1fs0mt+Dd8cD6i68LhkfpdfAtQgTeJkwu0Lmv
-IONcHLjUTy6HLGAZJDoWMRreL3VYGBfy0COGLK7Cx3uWUXKvtQpbrOcvOjHehAos
-3Ii2Zpr/ENqWT77pjT+154sedT64csnBKLoXQ3kuCtmoMJzC6aEiYqkU+7gUhnxY
-5d1VaWAiTktd4j5rpxBX6Fj2jxMglzOHnew3bQzYhsT+uOQdsbz4URAes19Chuc1
-FdV/bjy6+EGVODreYL9sF1plkCKEkqELASGyGcll66HRXuSkWp7az42guNSCrFVD
-H+j3Wsg1Zo1S1kHzyOgHmbbyZ8MoXD9iQmHIIKKc0yWZ0AeWToROhvR6msLW9mwJ
-u0pLbmpZbGhfZ46WNeawDChhdWYMdelEQliZb697MZ9a6sQMAbCDGIl4uOp0xfXJ
-CJlnhziJSyAzaD0TDbssgmMvNJYxQuO3SOMY9vEKE9TMgI5TLfSpPAGWJ1ADehJ7
-dcl0os/rt/eRgXTmue8OsKNgP9nniJ9hilSfAVOEX+7N5tYtDa5vM8Q5Xu/6tZ+w
-9s2o/jARld70G70itxao+XeGqqsinwo8Lm4aNeV+3+pa0amLsbasqpKGKBHmmMFt
-grKfXmoHLTK3ZrsJhHly7vz9ADZZPP4JuCsJLSZOf4QqEr2pYpr8kSblYkpxOt8p
-3T36axaTMLw9hlZ18r0sfWdHZjN9SihYRzMa1I/T4npG3a/FH1imzeaNryfEAkxJ
-OEVZItZzyW2iIVvFzGxW9kJUivne3cPsCrCSWYSlsTTl9EEBc+C7zUNEVlhq8eM5
-79BGMNVzLHncNvAJabiC3RfrQAg6d9lJ6fJahkGqMZYA9NApskoQ4oaTabOxprlF
-u12KzyQWUmd7JN/ufwz9G4T7dgtJTcfT/yBmC1rB/aS+jTsDNNpPOq9q2ps0qwhw
-VvAePOiEfZCvbFvgjnvWD4jKiMrDyIjP/DfGTKCI5gh0bx7c8+s0uUUgVhSw4uTh
-lOk=
+MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIqyBfbew6fFcCAggA
+MBQGCCqGSIb3DQMHBAiC7qRRuGuuHwSCBMhe3Zf/3w4YRas/zETiY9arnz6Y9Pr8
+6K4v3/BPaEk/8wNwzrPAm0ilHEW6l5ajToxvLUecumTKs9j/8S1XFQNZgxckTkdG
+ok1dzjYkIrm286SIqE0wUXULhhUDOQRh8NEN7eCCv41nCdkhPYL5GCBmKF3iWHEV
+GR/hgFPmDhKn8YAnb+joFLzN/ssn4suKO6t0Ki5sJPQeuv0JFZBgYm4sR/4K5F6o
+2t7dn07o2bZxyLO5c6y78a5R7AwIqgKwgquecHH7K0kfGIChjHFYjfyKYPTRbpHT
+StvcitFsLSCKE/QGWR9VSp+bDhoBBk9zmUivknYJ12n3S37y6cwmPjYXhIAwMfq2
+RYqHcVWMQxMJVVHLKwK5udR6JG6KOzJVpr5oBlr/tAxuRAczWtuNcvn1SrxCQ0+l
+SJ/m0LG7Sut6NpOKPmeY9T4UKqtdV1Q1IxUvuR+UOFzyHJKQUQv5qWBmIE8ULua0
+Se979FVd+aBHFQ7Qqf0+5/cFRrg6nTV8G7rkFG2NtHZ+HDjVaVMMpcqM7mR3sFQX
+z6Jv/qwlLWxU0hstZ8dpMXR0Z2/PlFoOkn9THqmtD5yX3XemC5DhdwxIKulKUlau
+vBvzssqsCuJH2mZwjxQiPSNm234k5I7q9MSNaSBmOmXYxXN1OUbdIk+s/qnLVRZK
+yHdeJHSNDQGcAWdCCVeSQpsK76saYQZvDlZAaMRuor8o2uDwIBeokwqGGOZDTPgL
+wdXzode0PafhtCCz9Ki4ezRY5ng4Kk7zPdrXMZS20SVv7A0i10QE7JPB8X+LF9DC
+vp7Hw1qQIni6uECg8RLoq3QOjMETTOBRBZZeEf+uyko6opNeo3M2w8g3+Bi7fKDO
+CNx+tDAi9CCRrMXko9Om/WTtAOoKzdsTTPHFlwxPzTFIc8unOIwsSDwQQ8mHIGx8
+C9KFPvXhcb3NysnjDhuMlUaL48AXwR+HGWcT8xysOY3gQ0SgF0XW3+AW6paA3rBe
+W0tSEt2CEK1KsYZngL8mjRQxXI1dJ/fmsgEaBV76ThUDW4I42dOqzlGZIPW0aMtO
+SLqGOKt/mzcj8pp4IRzZq/ueyDw4L7HIrtj8+XpzAlM5IGiDADtPGTguG1z7hZ5M
+wYFc9R2jRV7+mzDWj2CdW/S8oeRuCafiVWbK0vMhFjzhB6I4nh0SEbsgQx1/9ai3
+69sODW7rlRTax6Ht4buxR80Dd9tlXxlSdX3DbhUWN2ZFxtqSr/Mk70KTRDaxkSrN
+HqJmBsuTaaNzwoPSblyr2hdaUr59oTgRYuBoCZExkMw+8p15UO+ZYZvH63LkbTNj
+pFKEtVuJ0SzOtp2U6nCNXXO3KhPXHsZyeGHXDDCjeVvJGz+mK3wp2I8iHuXiQTNy
+IWy1icGO8+xmEs6y04x2mcs2gEJoL+yGlZFOs8Xa5vMF7VQ2Oh/HKmBA2NTLfFuB
+pz3aNXYtjB8jsH50Yjbh0mkkSd00FTqkhc09N+V6rqeBpW7XwxDsa3MEqiYOeQqI
+n60AZqPSgumMLZC7idC8QdOhdNYjzuvC6xT3uc0o319Uh86xYfyZ71RmlvsMJaDe
+x9Q79+0PhLx5wH85/Q97wX+stR9un1o6brgBtA72XI/bhy2gsDh0G0NgUrJWwhXw
+7N8=
 -----END ENCRYPTED PRIVATE KEY-----

test/e2e/resources/key_tls/controller01.csr

@@ -2,17 +2,17 @@
 MIIC4DCCAcgCAQAwazELMAkGA1UEBhMCSU4xEjAQBgNVBAgTCWthcm5hdGFrYTES
 MBAGA1UEBxMJYmFuZ2Fsb3JlMRAwDgYDVQQKEwdwcmF2ZWdhMRAwDgYDVQQLEwdw
 cmF2ZWdhMRAwDgYDVQQDEwdwcmF2ZWdhMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAsalVYwUnDiGyCU8sB3DNxyh6RNuRtS+uW0ewY2aSZm5bTlEpEKxC
-slRYE9I2aVLBdkTRXm6j4U7YHLnCFnugWpvawBN/9ehfm9VIQouHMaKbXGkPFKmZ
-FIVLxbNObLP8wk6B7pJQA7r8byA6XbC1lhgiwcAHowgXpfMfEt/Yc4wQauS/emjS
-hEhSg9fvmVXjSa7S8zvmIkMMkqe0di+wDL+OXTSWRzrPq7HA4RugchbwdXO5BF1y
-h0vlfNDEe51oMQ7Yet1hPGTamWGw6y3otPq/7kGNuMLPEijCH3VOmE3PF1OiLu+V
-AJZZfn2gkBrsb5TWVdb82iGNgb349PigAQIDAQABoDAwLgYJKoZIhvcNAQkOMSEw
-HzAdBgNVHQ4EFgQU2/KZukWwAvxXD6n/sI1iedQzLckwDQYJKoZIhvcNAQELBQAD
-ggEBAFVimLUXhO54hkOAl8IR3RKhqcDoPuumVzeU2gR8ao9jP56wp1NStsYtm/l+
-1Z1XB7ij65sA2GCvbBdrwRhlBslLXRauEPXVIN59PWYBL5xSoK54xYrkEWtXcP3l
-z65TRWCPwKpE28Jov0M5mWyxzKnswQW3BeNe6URUF+hbDH/F6+DwITYJKPNmdjgc
-UZCRJgn0SPtHm76EI0g8cOPybKzxGNnk1SPvZOyLT5YCzcRjjOzzch965Apbxn5n
-7p9jmyNOzHnhxGD5Kr1+KGylOdxjRjheGG3I86N9GnvNH69OkAWoboQj7MuLZdNY
-bC+vo6PubRMg1aOARfO5AX8Iumo=
+MIIBCgKCAQEAoB1TK+eCYX61/jxItKzLihImhFGaMOxIoAkSrL6SClBcMpz7B5bU
+3y4B7+mukkb4l4tx7iw0fgAx7JOSHDDHWHw0ahPiEV5byFwPWl8NikHU/XoKDW6+
+ZZUZPGYHtq/fugyXustUESCt/1OmgGWxXtmjnwzJhaePWo2yhALIO9OcpPJec4LN
+z0aQv13oI68d7s2n2nMhTmzHaPh3QyCODaW5Cugwypwk3t7cpflz1peGOtVLlkgs
+kdiMhpDDZB/n269WBpd3Md2OJ9U2MSt2Uc6rGtxesBJ5z5odJPO4SGR4KxoL14TG
+pGonAjqHffuFXfgN6LrGIQcfX7H4+r4mPQIDAQABoDAwLgYJKoZIhvcNAQkOMSEw
+HzAdBgNVHQ4EFgQUfPnH9+l3m68pfQXel1/cIgSh9KowDQYJKoZIhvcNAQELBQAD
+ggEBADavAqNMrx62odVuSpVQxHgKqHpjYS/cfRojFy2Tk+tONTxWBL1+BcbGzoKN
+CyXbCghBVPIroNHuxo+Q14CABaHkCf7CihqIbUpOrkhLv5WEalhcM+HV/Vj4cVky
+hy0CoQWTOzodv4iZUWJ4RWwxhCagBjrfc8ltnyjvHCF2Zd1+RRqTbbsAJhBC161r
+UCdqBhdY9k7WyENJnu0R5lQDqbWQAgSihZdPcrEJAGUBGb92BTIGASA7JZ2UJp0z
+Oaw4rNePjBMEhEq4N8SEt0S2AXI5SQ6S7XigApSHF9bp3JNC/RniVyKocUTKivsh
+9SY3uG0sXpncdelRvh3V7W3vCgE=
 -----END NEW CERTIFICATE REQUEST-----