Fix MRC status (#4856)

* Fix MRC status Signed-off-by: Keith Mattix II <[email protected]> * Address PR comments Signed-off-by: Keith Mattix II <[email protected]>
openservicemesh · Jun 29, 2022 · bb007fd · bb007fd
1 parent 4a1b993
commit bb007fd
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 8 deletions.
diff --git a/charts/osm/templates/osm-rbac.yaml b/charts/osm/templates/osm-rbac.yaml
@@ -43,6 +43,9 @@ rules:
   - apiGroups: ["config.openservicemesh.io"]
     resources: ["meshconfigs", "meshrootcertificates"]
     verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
+  - apiGroups: ["config.openservicemesh.io"]
+    resources: ["meshrootcertificates/status"]
+    verbs: ["update"]
   - apiGroups: ["split.smi-spec.io"]
     resources: ["trafficsplits"]
     verbs: ["list", "get", "watch"]

diff --git a/cmd/osm-bootstrap/crds/config_mesh_root_certificate.yaml b/cmd/osm-bootstrap/crds/config_mesh_root_certificate.yaml
@@ -36,7 +36,7 @@ spec:
       storage: true
       additionalPrinterColumns:
         - description: Current state of the MeshRootCertificate config
-          jsonPath: .status.currentState
+          jsonPath: .status.state
           name: State
           type: string
       schema:

diff --git a/cmd/osm-bootstrap/osm-bootstrap.go b/cmd/osm-bootstrap/osm-bootstrap.go
@@ -395,7 +395,7 @@ func (b *bootstrap) createMeshRootCertificate() error {
 	if err != nil {
 		return err
 	}
-	_, err = b.configClient.ConfigV1alpha2().MeshRootCertificates(b.namespace).Create(context.TODO(), defaultMeshRootCertificate, metav1.CreateOptions{})
+	createdMRC, err := b.configClient.ConfigV1alpha2().MeshRootCertificates(b.namespace).Create(context.TODO(), defaultMeshRootCertificate, metav1.CreateOptions{})
 	if apierrors.IsAlreadyExists(err) {
 		log.Info().Msgf("MeshRootCertificate already exists in %s. Skip creating.", b.namespace)
 		return nil
@@ -404,6 +404,19 @@ func (b *bootstrap) createMeshRootCertificate() error {
 		return err
 	}
 
+	createdMRC.Status = configv1alpha2.MeshRootCertificateStatus{
+		State: constants.MRCStateActive,
+	}
+
+	_, err = b.configClient.ConfigV1alpha2().MeshRootCertificates(b.namespace).UpdateStatus(context.Background(), createdMRC, metav1.UpdateOptions{})
+	if apierrors.IsAlreadyExists(err) {
+		log.Info().Msgf("MeshRootCertificate statys already exists in %s. Skip creating.", b.namespace)
+	}
+
+	if err != nil {
+		return err
+	}
+
 	log.Info().Msgf("Successfully created MeshRootCertificate %s in %s.", meshRootCertificateName, b.namespace)
 	return nil
 }
@@ -428,9 +441,6 @@ func buildMeshRootCertificate(presetMeshRootCertificateConfigMap *corev1.ConfigM
 			},
 		},
 		Spec: presetMeshRootCertificateSpec,
-		Status: configv1alpha2.MeshRootCertificateStatus{
-			State: constants.MRCStateActive,
-		},
 	}
 
 	return mrc, util.CreateApplyAnnotation(mrc, unstructured.UnstructuredJSONScheme)

diff --git a/cmd/osm-bootstrap/osm-bootstrap_test.go b/cmd/osm-bootstrap/osm-bootstrap_test.go
@@ -356,10 +356,19 @@ func TestCreateMeshRootCertificate(t *testing.T) {
 			}
 
 			err := b.createMeshRootCertificate()
-			assert.Equal(tc.expectErr, err != nil)
+			if !tc.expectErr {
+				assert.NoError(err)
+			} else {
+				assert.Error(err)
+			}
 
-			_, err = b.configClient.ConfigV1alpha2().MeshRootCertificates(b.namespace).Get(context.TODO(), meshRootCertificateName, metav1.GetOptions{})
-			assert.Equal(tc.expectDefaultMeshRootCertificate, err == nil)
+			mrc, err := b.configClient.ConfigV1alpha2().MeshRootCertificates(b.namespace).Get(context.TODO(), meshRootCertificateName, metav1.GetOptions{})
+			if tc.expectDefaultMeshRootCertificate {
+				assert.NoError(err)
+				assert.Equal(constants.MRCStateActive, mrc.Status.State)
+			} else {
+				assert.Error(err)
+			}
 		})
 	}
 }