providerState to State

Signed-off-by: Sarah Christoff <[email protected]>

Author: schristoff

cmd/osm-bootstrap/crds/config_mesh_root_certificate.yaml

@@ -36,8 +36,8 @@ spec:
       storage: true
       additionalPrinterColumns:
         - description: Provider state of the MeshRootCertificate config
-          jsonPath: .status.providerState
-          name: ProviderState
+          jsonPath: .status.currentState
+          name: State
           type: string
       schema:
         openAPIV3Schema:

cmd/osm-bootstrap/osm-bootstrap.go

@@ -423,7 +423,7 @@ func buildMeshRootCertificate(presetMeshRootCertificateConfigMap *corev1.ConfigM
 		},
 		Spec: presetMeshRootCertificateSpec,
 		Status: configv1alpha2.MeshRootCertificateStatus{
-			ProviderState: constants.MRCStateActive,
+			State: constants.MRCStateActive,
 		},
 	}
 

cmd/osm-bootstrap/osm-bootstrap_test.go

@@ -97,7 +97,7 @@ var testMeshRootCertificate *configv1alpha2.MeshRootCertificate = &configv1alpha
 	},
 	Spec: configv1alpha2.MeshRootCertificateSpec{},
 	Status: configv1alpha2.MeshRootCertificateStatus{
-		ProviderState: constants.MRCStateActive,
+		State: constants.MRCStateActive,
 	},
 }
 

pkg/apis/config/v1alpha2/meshrootcertificate.go

@@ -21,7 +21,7 @@ type MeshRootCertificate struct {
 	// +optional
 	Spec MeshRootCertificateSpec `json:"spec,omitempty"`
 
-	// Status of the MeshRootCertificateStatus resource
+	// Status of the MeshRootCertificate resource
 	// +optional
 	Status MeshRootCertificateStatus `json:"status,omitempty"`
 }
@@ -113,9 +113,9 @@ type TresorCASpec struct {
 
 // MeshRootCertificateStatus defines the status of the MeshRootCertificate resource
 type MeshRootCertificateStatus struct {
-	// ProviderState specifies the state of the certificate provider
+	// State specifies the state of the certificate provider
 	// All states are specified in constants.go
-	ProviderState string `json:"providerState"`
+	State string `json:"state"`
 }
 
 // MeshRootCertificateList defines the list of MeshRootCertificate objects

pkg/certificate/providers/config.go

@@ -69,7 +69,7 @@ func NewCertificateManager(kubeClient kubernetes.Interface, kubeConfig *rest.Con
 			},
 			// TODO(#4502): Detect if an actual MRC exists, and set the status accordingly.
 			Status: v1alpha2.MeshRootCertificateStatus{
-				ProviderState: constants.MRCStateActive,
+				State: constants.MRCStateActive,
 			},
 		},
 	}

pkg/constants/constants.go

@@ -166,25 +166,25 @@ const (
 	// MRCVersionAnnotation is the annotation used for the version of the MeshRootCertificate
 	MRCVersionAnnotation = "openservicemesh.io/mrc-version"
 
-	// MRCStateValidatingRollout is the validating rollout status option for the ProviderState of the MeshRootCertificate
+	// MRCStateValidatingRollout is the validating rollout status option for the State of the MeshRootCertificate
 	MRCStateValidatingRollout = "validatingRollout"
 
-	// MRCStateIssuingRollout is the issuing rollout status option for the ProviderState of the MeshRootCertificate
+	// MRCStateIssuingRollout is the issuing rollout status option for the State of the MeshRootCertificate
 	MRCStateIssuingRollout = "issuingRollout"
 
-	// MRCStateActive is the active status option for the ProviderState of the MeshRootCertificate
+	// MRCStateActive is the active status option for the State of the MeshRootCertificate
 	MRCStateActive = "active"
 
-	// MRCStateIssuingRollback is the issuing rollback status option for the ProviderState of the MeshRootCertificate
+	// MRCStateIssuingRollback is the issuing rollback status option for the State of the MeshRootCertificate
 	MRCStateIssuingRollback = "issuingRollback"
 
-	// MRCStateValidatingRollback is the validating rollback status option for the ProviderState of the MeshRootCertificate
+	// MRCStateValidatingRollback is the validating rollback status option for the State of the MeshRootCertificate
 	MRCStateValidatingRollback = "validatingRollback"
 
-	// MRCStateInactive is the inactive status option for the ProviderState of the MeshRootCertificate
+	// MRCStateInactive is the inactive status option for the State of the MeshRootCertificate
 	MRCStateInactive = "inactive"
 
-	// MRCStateError is the error status option for the ProviderState of the MeshRootCertificate
+	// MRCStateError is the error status option for the State of the MeshRootCertificate
 	MRCStateError = "error"
 )