Fix tests

Signed-off-by: Yann Liu <[email protected]>

operator/pkg/apis/istio/v1alpha1/values_types.proto

@@ -635,6 +635,9 @@ message PilotConfig {
   // Controls whether Pilot is enabled.
   google.protobuf.BoolValue enabled = 1;
 
+  // Controls whether Pilot is runing in federation mode
+  google.protobuf.BoolValue  enableFederation = 54;
+
   // Controls whether a HorizontalPodAutoscaler is installed for Pilot.
   google.protobuf.BoolValue autoscaleEnabled = 2;
 

pkg/kube/client.go

@@ -454,7 +454,10 @@ func EnableCrdWatcher(c Client) Client {
 	return c
 }
 
-var NewCrdWatcher func(Client) kubetypes.CrdWatcher
+var (
+	NewCrdWatcher     func(Client) kubetypes.CrdWatcher
+	NewFastCrdWatcher func(Client) kubetypes.CrdWatcher
+)
 
 // NewDefaultClient returns a default client, using standard Kubernetes config resolution to determine
 // the cluster to access.

pkg/kube/kclient/crdwatcher.go

@@ -43,6 +43,7 @@ type crdWatcher struct {
 func init() {
 	// Unfortunate hack needed to avoid circular imports
 	kube.NewCrdWatcher = newCrdWatcher
+	kube.NewFastCrdWatcher = newFastCrdWatcher
 }
 
 // newCrdWatcher returns a new CRD watcher controller.
@@ -61,6 +62,15 @@ func newCrdWatcher(client kube.Client) kubetypes.CrdWatcher {
 	return c
 }
 
+func newFastCrdWatcher(client kube.Client) kubetypes.CrdWatcher {
+	c := &crdWatcher{
+		running:   make(chan struct{}),
+		callbacks: map[string][]func(){},
+	}
+
+	return c
+}
+
 // HasSynced returns whether the underlying cache has synced and the callback has been called at least once.
 func (c *crdWatcher) HasSynced() bool {
 	return c.crds == nil || c.queue.HasSynced()

pkg/servicemesh/federation/common/resources.go

@@ -19,7 +19,6 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	discoveryv1 "k8s.io/api/discovery/v1"
-
 	maistrainformersfederationv1 "maistra.io/api/client/informers/externalversions/federation/v1"
 	maistraclient "maistra.io/api/client/versioned"
 	maistraxnsinformer "maistra.io/api/client/xnsinformer"

pkg/servicemesh/federation/discovery/controller_test.go

@@ -221,6 +221,8 @@ func TestReconcile(t *testing.T) {
 	namespace := "test"
 	resyncPeriod := 30 * time.Second
 	options := newTestOptions("test.address")
+	newCrdWatcher := kube.NewCrdWatcher
+	kube.NewCrdWatcher = kube.NewFastCrdWatcher
 	kubeClient := kube.NewFakeClient(
 		&corev1.ConfigMap{
 			ObjectMeta: metav1.ObjectMeta{
@@ -232,6 +234,7 @@ func TestReconcile(t *testing.T) {
 			},
 		},
 	)
+	kube.NewCrdWatcher = newCrdWatcher
 	rm, err := common.NewResourceManager(common.ControllerOptions{
 		KubeClient:   kubeClient,
 		MaistraCS:    fake.NewSimpleClientset(),
@@ -285,6 +288,7 @@ func TestReconcile(t *testing.T) {
 	}
 	stopCh := make(chan struct{})
 	defer close(stopCh)
+	go kubeClient.RunAndWait(stopCh)
 	go rm.Start(stopCh)
 	fedAdded := make(chan struct{})
 	fedDeleted := make(chan struct{})

pkg/servicemesh/federation/status/manager_test.go

@@ -694,9 +694,12 @@ func TestStatusManager(t *testing.T) {
 	log.Configure(logOpts)
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
+			newCrdWatcher := kube.NewCrdWatcher
+			kube.NewCrdWatcher = kube.NewFastCrdWatcher
 			kubeClient := kube.NewFakeClient(&corev1.Pod{
 				ObjectMeta: istiodName,
 			})
+			kube.NewCrdWatcher = newCrdWatcher
 			stop := make(chan struct{})
 			defer func() { close(stop) }()
 			cs := fake.NewSimpleClientset(
@@ -712,6 +715,7 @@ func TestStatusManager(t *testing.T) {
 			}
 			stopChan := make(chan struct{})
 			defer close(stopChan)
+			go kubeClient.RunAndWait(stopChan)
 			go rm.Start(stopChan)
 			cs.FederationV1().ServiceMeshPeers(namespace).Create(context.TODO(), &v1.ServiceMeshPeer{
 				ObjectMeta: meshName,

security/pkg/k8s/chiron/test-data/example-ca-cert.pem

@@ -1,19 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDCzCCAfOgAwIBAgIQbfOzhcKTldFipQ1X2WXpHDANBgkqhkiG9w0BAQsFADAv
-MS0wKwYDVQQDEyRhNzU5YzcyZC1lNjcyLTQwMzYtYWMzYy1kYzAxMDBmMTVkNWUw
-HhcNMTkwNTE2MjIxMTI2WhcNMjQwNTE0MjMxMTI2WjAvMS0wKwYDVQQDEyRhNzU5
-YzcyZC1lNjcyLTQwMzYtYWMzYy1kYzAxMDBmMTVkNWUwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC6sSAN80Ci0DYFpNDumGYoejMQai42g6nSKYS+ekvs
-E7uT+eepO74wj8o6nFMNDu58+XgIsvPbWnn+3WtUjJfyiQXxmmTg8om4uY1C7R1H
-gMsrL26pUaXZ/lTE8ZV5CnQJ9XilagY4iZKeptuZkxrWgkFBD7tr652EA3hmj+3h
-4sTCQ+pBJKG8BJZDNRrCoiABYBMcFLJsaKuGZkJ6KtxhQEO9QxJVaDoSvlCRGa8R
-fcVyYQyXOZ+0VHZJQgaLtqGpiQmlFttpCwDiLfMkk3UAd79ovkhN1MCq+O5N7YVt
-eVQWaTUqUV2tKUFvVq21Zdl4dRaq+CF5U8uOqLY/4Kg9AgMBAAGjIzAhMA4GA1Ud
-DwEB/wQEAwICBDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCg
-oF71Ey2b1QY22C6BXcANF1+wPzxJovFeKYAnUqwh3rF7pIYCS/adZXOKlgDBsbcS
-MxAGnCRi1s+A7hMYj3sQAbBXttc31557lRoJrx58IeN5DyshT53t7q4VwCzuCXFT
-3zRHVRHQnO6LHgZx1FuKfwtkhfSXDyYU2fQYw2Hcb9krYU/alViVZdE0rENXCClq
-xO7AQk5MJcGg6cfE5wWAKU1ATjpK4CN+RTn8v8ODLoI2SW3pfsnXxm93O+pp9HN4
-+O+1PQtNUWhCfh+g6BN2mYo2OEZ8qGSxDlMZej4YOdVkW8PHmFZTK0w9iJKqM5o1
-V6g5gZlqSoRhICK09tpc
+MIIDnzCCAoegAwIBAgIJAON1ifrBZ2/BMA0GCSqGSIb3DQEBCwUAMIGLMQswCQYD
+VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTESMBAGA1UEBwwJU3Vubnl2YWxl
+MQ4wDAYDVQQKDAVJc3RpbzENMAsGA1UECwwEVGVzdDEQMA4GA1UEAwwHUm9vdCBD
+QTEiMCAGCSqGSIb3DQEJARYTdGVzdHJvb3RjYUBpc3Rpby5pbzAgFw0xODAxMjQx
+OTE1NTFaGA8yMTE3MTIzMTE5MTU1MVowWTELMAkGA1UEBhMCVVMxEzARBgNVBAgT
+CkNhbGlmb3JuaWExEjAQBgNVBAcTCVN1bm55dmFsZTEOMAwGA1UEChMFSXN0aW8x
+ETAPBgNVBAMTCElzdGlvIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAyzCxr/xu0zy5rVBiso9ffgl00bRKvB/HF4AX9/ytmZ6Hqsy13XIQk8/u/By9
+iCvVwXIMvyT0CbiJq/aPEj5mJUy0lzbrUs13oneXqrPXf7ir3HzdRw+SBhXlsh9z
+APZJXcF93DJU3GabPKwBvGJ0IVMJPIFCuDIPwW4kFAI7R/8A5LSdPrFx6EyMXl7K
+M8jekC0y9DnTj83/fY72WcWX7YTpgZeBHAeeQOPTZ2KYbFal2gLsar69PgFS0Tom
+ESO9M14Yit7mzB1WDK2z9g3r+zLxENdJ5JG/ZskKe+TO4Diqi5OJt/h8yspS1ck8
+LJtCole9919umByg5oruflqIlQIDAQABozUwMzALBgNVHQ8EBAMCAgQwDAYDVR0T
+BAUwAwEB/zAWBgNVHREEDzANggtjYS5pc3Rpby5pbzANBgkqhkiG9w0BAQsFAAOC
+AQEAltHEhhyAsve4K4bLgBXtHwWzo6SpFzdAfXpLShpOJNtQNERb3qg6iUGQdY+w
+A2BpmSkKr3Rw/6ClP5+cCG7fGocPaZh+c+4Nxm9suMuZBZCtNOeYOMIfvCPcCS+8
+PQ/0hC4/0J3WJKzGBssaaMufJxzgFPPtDJ998kY8rlROghdSaVt423/jXIAYnP3Y
+05n8TGERBj7TLdtIVbtUIx3JHAo3PWJywA6mEDovFMJhJERp9sDHIr1BbhXK1TFN
+Z6HNH6gInkSSMtvC4Ptejb749PTaePRPF7ID//eq/3AH8UK50F3TQcLjEqWUsJUn
+aFKltOc+RAjzDklcUPeG4Y6eMA==
 -----END CERTIFICATE-----

security/pkg/k8s/chiron/test-data/example-ca-cert2.pem

@@ -1,19 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIDDDCCAfSgAwIBAgIRALsN8ND73NbYSKTZZa4jf2EwDQYJKoZIhvcNAQELBQAw
-LzEtMCsGA1UEAxMkZTNlM2RlZWQtYzIyNi00OWM2LThmOTktNDU3NmRmMzQ0YWQ1
-MB4XDTE5MDYwMTE1NTU0M1oXDTI0MDUzMDE2NTU0M1owLzEtMCsGA1UEAxMkZTNl
-M2RlZWQtYzIyNi00OWM2LThmOTktNDU3NmRmMzQ0YWQ1MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA43oeK/hS92ANjmg50LCl3tM7eYAlBB/XgCl+bfp3
-KwEf+uW5yEvzSVHd2VPFI/kJJeLFrsyCRaU4FwxWcEr2Ld07DPL34oyZRRXQF0w6
-4ZNSVmevBNdZLqHcoIUtR1iFJbkctE93HpGw5Kg1NXRLDu47wQtzcC3GDOEk1amu
-mL916R2OcYEeOcyRDnlbLcsTYRvK5WBQsux4E0iu2Eo9GIajKmbxVLxA9fsmqG4i
-/HoVkLmCg+ZRPR/66AFLPFV1J3RWp0K4HKGzBeCyd2RC+o0g8tJX3EVSuQpqzS8p
-i2t71cYu/Sf5gt3wXsNHyzE6bF1o+acyzWvJlBym/HsbAQIDAQABoyMwITAOBgNV
-HQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEA
-kJXGkFEybCp7RxUSILuIqMtKcYcQU9ulKmLSn51VrpcRHP4SH7UJ0aXMjAdRLsop
-em7YgbvToGNingqcmSJlunR3jXDecSXJLUO1xcfw6N+B2BXRgUv8wV42btr2EV6q
-4HKou+MnKdrQkMUx218AT8TNPBb/Yx01m8YUS7mGUTApAhBneGEcKJ8xOznIuR5v
-CihWQA9AmUvfixpXNpJc4vqiYErwIXrYpuwc79SRtLuO70vV7FCctz+4JPpR7mp9
-dHMZfGO1KXMbYT9P5bm+itlWSyrnn0qK/Cn5RHBoFyY91VcQJTgABS/z5O0pZ662
-sNzF00Jhi0gU7th75QT3MA==
+MIIFeTCCA2GgAwIBAgIUQchu+RczGG1A4BnmrCcpkURQGTAwDQYJKoZIhvcNAQEL
+BQAwIjEOMAwGA1UECgwFSXN0aW8xEDAOBgNVBAMMB1Jvb3QgQ0EwHhcNMjMxMjEx
+MTYyNTI1WhcNMzMxMjA4MTYyNTI1WjA9MQ4wDAYDVQQKDAVJc3RpbzEYMBYGA1UE
+AwwPSW50ZXJtZWRpYXRlIENBMREwDwYDVQQHDAhjbHVzdGVyMTCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBAJCkq9Y68g9n0i4xkyYo4mygXIgaj94cvmu3
+X81CLEu/hYrl08acaKZMno+57ibAfxKBsWfA0FMp1eXZ3T9KYlNsSarC8c6RCPbX
+Lzp4iPGMq5n/+OgCGaVUbaLuZB7F6gCJebyM3Du6Zap7X1xm3w2EpiVqHW6iAJqv
+oBNtm7/uzFQiIU3UMeea/XBzo1FpDqNcuc/GgyILs1GA2+U4LfmcwhvUjF36bZ1q
+WMnPfCMHwHTNiGikAJKSXqADz8+rthOyNZq3yFGV/ZOJf6yHOWiyP1BjojRbHCt1
+P8u2nWuD40iqreVrQw3h5Hsz6+mCIkUYFZ45yO0fyRZ/q46M8RKHluD1VI7X6R98
+wB+XPqh12tbXUQJw1/QdtUotszhQq/WUbewX9v4joGIel3MFpoBCoaHh4N4/S1Vk
+9k32c4lEYeV5wO6DZSV9fuasN6KzaiPNNiufP2MnIzJSbal0uZJ0dmyhmHGLGsGc
+t6zxAQpV8reqWZE1mZt94T4TnDpm61BDKRPRu7s6sP42iq6055c+5x3DhVqTInnB
+uTi7oikTykZ2s0budYyjATNMUuz2RHZXxfb6ScqC5mEL0kbKCDgRzS0NS15LHpUX
+Ue65PG8hiuWLuDTcQohWFkeIQyKUGL9uQ5qmmGK8FZwUU/9gY1JjrMw5sa+rVN/C
+hkbRsHmBAgMBAAGjgYswgYgwHQYDVR0OBBYEFP/KjsSWWC+hw1cIaZLn1ZV3IeMq
+MBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgLkMCIGA1UdEQQbMBmC
+F2lzdGlvZC5pc3Rpby1zeXN0ZW0uc3ZjMB8GA1UdIwQYMBaAFL3svuf0yV+M2BHp
+EvDmo37j045gMA0GCSqGSIb3DQEBCwUAA4ICAQBO6P+y7UQ7HRyA7dOf2Dvze6xv
+HKgjh8z5uKNbfvmgUT2gECQ+3g0LvDRYHU7w/isSmhCQxIGf+xc7r3+Rtyjg+uEc
+8z0UBysbqrn8pZXPr+FPU5X5czUnwXlZwj02e1fY250LCmfHXFYuPzgwtlbJs2Ec
+2exDG7EZWWX6l/mRFQR8HiF/jum2i06yjO1v+phUVenW/ym2fq+/lY/ZWebQasD7
+7PT3yT/Eage4AIj5zYmZzqJex3OKDiVltAUefnekFJBKqv1UIcWlijRPZPK8uYQk
+IYHRL5fpa9E/HkwY8QopXPJi6Yfx76acY+dQd1xovY3noUVGzQV5wuaICS9V6H9B
+5vkxDYbbABQQ9OJcy8XR7cqlkUATiH5hVRjMSKJiostO+CiVDWjZyJdNgR0kZeaa
+9cSYBdTBxN82A/Vtq4ETq/PG5rR08KQY4HqIlOlo16OxGcJ2zVKSk5lTeI1wx/in
+uOnJTo5mDJHOJrtYGuCLiqZp/Fbcz/Tb9Qccc1yw78feYiNV6JXKx3uPvfsNbXkY
+KnsorT6OQ9G2d/zKPYUw+JEc1BJpk8okvGT8oTfvnfXty63ccN4+iyohQP/GwtQ9
+XiIJ0gGGQjY1VA/L2MOYV0hSMLgddvl4Pt8KXsxQ72gGl8a/s1oOKkYfpm/xchpd
+3ldrrKbAwExwhsARrA==
 -----END CERTIFICATE-----

security/pkg/k8s/chiron/utils_test.go

@@ -43,43 +43,49 @@ import (
 
 const (
 	exampleCACert = `-----BEGIN CERTIFICATE-----
-MIIDCzCCAfOgAwIBAgIQbfOzhcKTldFipQ1X2WXpHDANBgkqhkiG9w0BAQsFADAv
-MS0wKwYDVQQDEyRhNzU5YzcyZC1lNjcyLTQwMzYtYWMzYy1kYzAxMDBmMTVkNWUw
-HhcNMTkwNTE2MjIxMTI2WhcNMjQwNTE0MjMxMTI2WjAvMS0wKwYDVQQDEyRhNzU5
-YzcyZC1lNjcyLTQwMzYtYWMzYy1kYzAxMDBmMTVkNWUwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC6sSAN80Ci0DYFpNDumGYoejMQai42g6nSKYS+ekvs
-E7uT+eepO74wj8o6nFMNDu58+XgIsvPbWnn+3WtUjJfyiQXxmmTg8om4uY1C7R1H
-gMsrL26pUaXZ/lTE8ZV5CnQJ9XilagY4iZKeptuZkxrWgkFBD7tr652EA3hmj+3h
-4sTCQ+pBJKG8BJZDNRrCoiABYBMcFLJsaKuGZkJ6KtxhQEO9QxJVaDoSvlCRGa8R
-fcVyYQyXOZ+0VHZJQgaLtqGpiQmlFttpCwDiLfMkk3UAd79ovkhN1MCq+O5N7YVt
-eVQWaTUqUV2tKUFvVq21Zdl4dRaq+CF5U8uOqLY/4Kg9AgMBAAGjIzAhMA4GA1Ud
-DwEB/wQEAwICBDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCg
-oF71Ey2b1QY22C6BXcANF1+wPzxJovFeKYAnUqwh3rF7pIYCS/adZXOKlgDBsbcS
-MxAGnCRi1s+A7hMYj3sQAbBXttc31557lRoJrx58IeN5DyshT53t7q4VwCzuCXFT
-3zRHVRHQnO6LHgZx1FuKfwtkhfSXDyYU2fQYw2Hcb9krYU/alViVZdE0rENXCClq
-xO7AQk5MJcGg6cfE5wWAKU1ATjpK4CN+RTn8v8ODLoI2SW3pfsnXxm93O+pp9HN4
-+O+1PQtNUWhCfh+g6BN2mYo2OEZ8qGSxDlMZej4YOdVkW8PHmFZTK0w9iJKqM5o1
-V6g5gZlqSoRhICK09tpc
+MIIDnzCCAoegAwIBAgIJAON1ifrBZ2/BMA0GCSqGSIb3DQEBCwUAMIGLMQswCQYD
+VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTESMBAGA1UEBwwJU3Vubnl2YWxl
+MQ4wDAYDVQQKDAVJc3RpbzENMAsGA1UECwwEVGVzdDEQMA4GA1UEAwwHUm9vdCBD
+QTEiMCAGCSqGSIb3DQEJARYTdGVzdHJvb3RjYUBpc3Rpby5pbzAgFw0xODAxMjQx
+OTE1NTFaGA8yMTE3MTIzMTE5MTU1MVowWTELMAkGA1UEBhMCVVMxEzARBgNVBAgT
+CkNhbGlmb3JuaWExEjAQBgNVBAcTCVN1bm55dmFsZTEOMAwGA1UEChMFSXN0aW8x
+ETAPBgNVBAMTCElzdGlvIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAyzCxr/xu0zy5rVBiso9ffgl00bRKvB/HF4AX9/ytmZ6Hqsy13XIQk8/u/By9
+iCvVwXIMvyT0CbiJq/aPEj5mJUy0lzbrUs13oneXqrPXf7ir3HzdRw+SBhXlsh9z
+APZJXcF93DJU3GabPKwBvGJ0IVMJPIFCuDIPwW4kFAI7R/8A5LSdPrFx6EyMXl7K
+M8jekC0y9DnTj83/fY72WcWX7YTpgZeBHAeeQOPTZ2KYbFal2gLsar69PgFS0Tom
+ESO9M14Yit7mzB1WDK2z9g3r+zLxENdJ5JG/ZskKe+TO4Diqi5OJt/h8yspS1ck8
+LJtCole9919umByg5oruflqIlQIDAQABozUwMzALBgNVHQ8EBAMCAgQwDAYDVR0T
+BAUwAwEB/zAWBgNVHREEDzANggtjYS5pc3Rpby5pbzANBgkqhkiG9w0BAQsFAAOC
+AQEAltHEhhyAsve4K4bLgBXtHwWzo6SpFzdAfXpLShpOJNtQNERb3qg6iUGQdY+w
+A2BpmSkKr3Rw/6ClP5+cCG7fGocPaZh+c+4Nxm9suMuZBZCtNOeYOMIfvCPcCS+8
+PQ/0hC4/0J3WJKzGBssaaMufJxzgFPPtDJ998kY8rlROghdSaVt423/jXIAYnP3Y
+05n8TGERBj7TLdtIVbtUIx3JHAo3PWJywA6mEDovFMJhJERp9sDHIr1BbhXK1TFN
+Z6HNH6gInkSSMtvC4Ptejb749PTaePRPF7ID//eq/3AH8UK50F3TQcLjEqWUsJUn
+aFKltOc+RAjzDklcUPeG4Y6eMA==
 -----END CERTIFICATE-----`
 
 	exampleIssuedCert = `-----BEGIN CERTIFICATE-----
-MIIDGDCCAgCgAwIBAgIRAKvYcPLFqnJcwtshCGfNzTswDQYJKoZIhvcNAQELBQAw
-LzEtMCsGA1UEAxMkYTc1OWM3MmQtZTY3Mi00MDM2LWFjM2MtZGMwMTAwZjE1ZDVl
-MB4XDTE5MDgwNjE5NTU0NVoXDTI0MDgwNDE5NTU0NVowCzEJMAcGA1UEChMAMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyLIFJU5yJ5VXhbmizir+7Glm
-1tVEYXKGiqYbMRbfsFm7V6Z4l00D9/eHvfTXaFpqhv6HBm31MArjYB3OaaV6krvT
-whBUEPSkGBFe/eMPSFWBW27a0nw0cK2s/5yuFhTRtcUrZ9+ojJg4IS3oSm2UZ6UJ
-DuNI3qwB6OlPQOcWX8uEp4eAaolD1lIbLRQYvxYrBqnyCZBLE+MJgA1/VB3dAECB
-TxPtAqcwLFcvsM5ABys8yK8FrqRn5Bx54NiztgG+yU30W33xjdqzmEmuIIk4JjPU
-ZQRsug7XClDvQKM6lbYcYS1td2zT08hdgURFXJ9VR64ALFp00/bvglpryu8FmQID
-AQABo1MwUTAMBgNVHRMBAf8EAjAAMEEGA1UdEQQ6MDiCHHByb3RvbXV0YXRlLmlz
-dGlvLXN5c3RlbS5zdmOCGHByb3RvbXV0YXRlLmlzdGlvLXN5c3RlbTANBgkqhkiG
-9w0BAQsFAAOCAQEAhcVEZSuNMqMUJrWVb3b+6pmw9o1f7j6a51KWxOiIl6YuTYFS
-WaR0lHSW8wLesjsjm1awWO/F3QRuYWbalANy7434GMAGF53u/uc+Z8aE3EItER9o
-SpAJos6OfJqyok7JXDdOYRDD5/hBerj68R9llWzNJd27/1jZ0NF2sIE1W4QFddy/
-+8YA4+IqwkWB5/LbeRznl3EjFZDpCEJk0gg5XwAR5eIEy4QU8GueTwrDkssFdBGq
-0naco7/Es7CWQscYdKHAgYgk0UAyu8sGV235Uw3hlOrbZ/kqvyUmsSujgT8irmDV
-e+5z6MTAO6ktvHdQlSuH6ARn47bJrZOlkttAhg==
+MIIDnzCCAoegAwIBAgIJAON1ifrBZ2/BMA0GCSqGSIb3DQEBCwUAMIGLMQswCQYD
+VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTESMBAGA1UEBwwJU3Vubnl2YWxl
+MQ4wDAYDVQQKDAVJc3RpbzENMAsGA1UECwwEVGVzdDEQMA4GA1UEAwwHUm9vdCBD
+QTEiMCAGCSqGSIb3DQEJARYTdGVzdHJvb3RjYUBpc3Rpby5pbzAgFw0xODAxMjQx
+OTE1NTFaGA8yMTE3MTIzMTE5MTU1MVowWTELMAkGA1UEBhMCVVMxEzARBgNVBAgT
+CkNhbGlmb3JuaWExEjAQBgNVBAcTCVN1bm55dmFsZTEOMAwGA1UEChMFSXN0aW8x
+ETAPBgNVBAMTCElzdGlvIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAyzCxr/xu0zy5rVBiso9ffgl00bRKvB/HF4AX9/ytmZ6Hqsy13XIQk8/u/By9
+iCvVwXIMvyT0CbiJq/aPEj5mJUy0lzbrUs13oneXqrPXf7ir3HzdRw+SBhXlsh9z
+APZJXcF93DJU3GabPKwBvGJ0IVMJPIFCuDIPwW4kFAI7R/8A5LSdPrFx6EyMXl7K
+M8jekC0y9DnTj83/fY72WcWX7YTpgZeBHAeeQOPTZ2KYbFal2gLsar69PgFS0Tom
+ESO9M14Yit7mzB1WDK2z9g3r+zLxENdJ5JG/ZskKe+TO4Diqi5OJt/h8yspS1ck8
+LJtCole9919umByg5oruflqIlQIDAQABozUwMzALBgNVHQ8EBAMCAgQwDAYDVR0T
+BAUwAwEB/zAWBgNVHREEDzANggtjYS5pc3Rpby5pbzANBgkqhkiG9w0BAQsFAAOC
+AQEAltHEhhyAsve4K4bLgBXtHwWzo6SpFzdAfXpLShpOJNtQNERb3qg6iUGQdY+w
+A2BpmSkKr3Rw/6ClP5+cCG7fGocPaZh+c+4Nxm9suMuZBZCtNOeYOMIfvCPcCS+8
+PQ/0hC4/0J3WJKzGBssaaMufJxzgFPPtDJ998kY8rlROghdSaVt423/jXIAYnP3Y
+05n8TGERBj7TLdtIVbtUIx3JHAo3PWJywA6mEDovFMJhJERp9sDHIr1BbhXK1TFN
+Z6HNH6gInkSSMtvC4Ptejb749PTaePRPF7ID//eq/3AH8UK50F3TQcLjEqWUsJUn
+aFKltOc+RAjzDklcUPeG4Y6eMA==
 -----END CERTIFICATE-----
 `
 	DefaulCertTTL = 24 * time.Hour
@@ -138,21 +144,23 @@ func TestReadCACert(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		cert, err := readCACert(tc.certPath)
-		if tc.shouldFail {
-			if err == nil {
-				t.Errorf("should have failed at readCACert()")
-			} else {
-				// Should fail, skip the current case.
-				continue
+		t.Run(tc.certPath, func(t *testing.T) {
+			cert, err := readCACert(tc.certPath)
+			if tc.shouldFail {
+				if err == nil {
+					t.Errorf("should have failed at readCACert()")
+				} else {
+					// Should fail, skip the current case.
+					return
+				}
+			} else if err != nil {
+				t.Errorf("failed at readCACert(): %v", err)
 			}
-		} else if err != nil {
-			t.Errorf("failed at readCACert(): %v", err)
-		}
 
-		if !bytes.Equal(tc.expectedCert, cert) {
-			t.Error("the certificate read is unexpected")
-		}
+			if !bytes.Equal(tc.expectedCert, cert) {
+				t.Error("the certificate read is unexpected")
+			}
+		})
 	}
 }