Merge pull request #1 from Mirantis/rename-to-blueprint

BOP-43 Rename the CRD from Cluster to Blueprint

PROJECT

@@ -26,7 +26,7 @@ resources:
   controller: true
   domain: mirantis.com
   group: boundless
-  kind: Cluster
+  kind: Blueprint
   path: github.com/mirantis/boundless-operator/api/v1alpha1
   version: v1alpha1
 - api:

api/v1alpha1/cluster_types.go → api/v1alpha1/blueprint_types.go

@@ -7,8 +7,8 @@ import (
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
-// ClusterSpec defines the desired state of Cluster
-type ClusterSpec struct {
+// BlueprintSpec defines the desired state of Blueprint
+type BlueprintSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
@@ -26,33 +26,33 @@ type Core struct {
 	Ingress IngressSpec `json:"ingress,omitempty"`
 }
 
-// ClusterStatus defines the observed state of Cluster
-type ClusterStatus struct {
+// BlueprintStatus defines the observed state of Blueprint
+type BlueprintStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 }
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 
-// Cluster is the Schema for the clusters API
-type Cluster struct {
+// Blueprint is the Schema for the blueprints API
+type Blueprint struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   ClusterSpec   `json:"spec,omitempty"`
-	Status ClusterStatus `json:"status,omitempty"`
+	Spec   BlueprintSpec   `json:"spec,omitempty"`
+	Status BlueprintStatus `json:"status,omitempty"`
 }
 
 //+kubebuilder:object:root=true
 
-// ClusterList contains a list of Cluster
-type ClusterList struct {
+// BlueprintList contains a list of Blueprint
+type BlueprintList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Cluster `json:"items"`
+	Items           []Blueprint `json:"items"`
 }
 
 func init() {
-	SchemeBuilder.Register(&Cluster{}, &ClusterList{})
+	SchemeBuilder.Register(&Blueprint{}, &BlueprintList{})
 }

config/crd/bases/boundless.mirantis.com_clusters.yaml → config/crd/bases/boundless.mirantis.com_blueprints.yaml

@@ -5,20 +5,20 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.11.1
   creationTimestamp: null
-  name: clusters.boundless.mirantis.com
+  name: blueprints.boundless.mirantis.com
 spec:
   group: boundless.mirantis.com
   names:
-    kind: Cluster
-    listKind: ClusterList
-    plural: clusters
-    singular: cluster
+    kind: Blueprint
+    listKind: BlueprintList
+    plural: blueprints
+    singular: blueprint
   scope: Namespaced
   versions:
   - name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: Cluster is the Schema for the clusters API
+        description: Blueprint is the Schema for the blueprints API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -33,7 +33,7 @@ spec:
           metadata:
             type: object
           spec:
-            description: ClusterSpec defines the desired state of Cluster
+            description: BlueprintSpec defines the desired state of Blueprint
             properties:
               components:
                 description: Components contains all the components that should be
@@ -100,7 +100,7 @@ spec:
                 type: object
             type: object
           status:
-            description: ClusterStatus defines the observed state of Cluster
+            description: BlueprintStatus defines the observed state of Blueprint
             type: object
         type: object
     served: true

config/crd/kustomization.yaml

@@ -3,8 +3,8 @@
 # It should be run by config/default
 resources:
 - bases/boundless.mirantis.com_addons.yaml
-- bases/boundless.mirantis.com_clusters.yaml
 - bases/boundless.mirantis.com_ingresses.yaml
+- bases/boundless.mirantis.com_blueprints.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 patchesStrategicMerge:
@@ -13,13 +13,15 @@ patchesStrategicMerge:
 #- patches/webhook_in_addons.yaml
 #- patches/webhook_in_clusters.yaml
 #- patches/webhook_in_ingresses.yaml
+#- patches/webhook_in_blueprints.yaml
 #+kubebuilder:scaffold:crdkustomizewebhookpatch
 
 # [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix.
 # patches here are for enabling the CA injection for each CRD
 #- patches/cainjection_in_addons.yaml
 #- patches/cainjection_in_clusters.yaml
 #- patches/cainjection_in_ingresses.yaml
+#- patches/cainjection_in_blueprints.yaml
 #+kubebuilder:scaffold:crdkustomizecainjectionpatch
 
 # the following config is for teaching kustomize how to do kustomization for CRDs.

config/crd/patches/cainjection_in_clusters.yaml → config/crd/patches/cainjection_in_blueprints.yaml

@@ -4,4 +4,4 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
-  name: clusters.boundless.mirantis.com
+  name: blueprints.boundless.mirantis.com

config/crd/patches/webhook_in_clusters.yaml → config/crd/patches/webhook_in_blueprints.yaml

@@ -2,7 +2,7 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: clusters.boundless.mirantis.com
+  name: blueprints.boundless.mirantis.com
 spec:
   conversion:
     strategy: Webhook

config/rbac/cluster_editor_role.yaml → config/rbac/blueprint_editor_role.yaml

@@ -1,20 +1,20 @@
-# permissions for end users to edit clusters.
+# permissions for end users to edit blueprints.
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/name: clusterrole
-    app.kubernetes.io/instance: cluster-editor-role
+    app.kubernetes.io/instance: blueprint-editor-role
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: boundless-operator
     app.kubernetes.io/part-of: boundless-operator
     app.kubernetes.io/managed-by: kustomize
-  name: cluster-editor-role
+  name: blueprint-editor-role
 rules:
 - apiGroups:
   - boundless.mirantis.com
   resources:
-  - clusters
+  - blueprints
   verbs:
   - create
   - delete
@@ -26,6 +26,6 @@ rules:
 - apiGroups:
   - boundless.mirantis.com
   resources:
-  - clusters/status
+  - blueprints/status
   verbs:
   - get

config/rbac/cluster_viewer_role.yaml → config/rbac/blueprint_viewer_role.yaml

@@ -1,27 +1,27 @@
-# permissions for end users to view clusters.
+# permissions for end users to view blueprints.
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/name: clusterrole
-    app.kubernetes.io/instance: cluster-viewer-role
+    app.kubernetes.io/instance: blueprint-viewer-role
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: boundless-operator
     app.kubernetes.io/part-of: boundless-operator
     app.kubernetes.io/managed-by: kustomize
-  name: cluster-viewer-role
+  name: blueprint-viewer-role
 rules:
 - apiGroups:
   - boundless.mirantis.com
   resources:
-  - clusters
+  - blueprints
   verbs:
   - get
   - list
   - watch
 - apiGroups:
   - boundless.mirantis.com
   resources:
-  - clusters/status
+  - blueprints/status
   verbs:
   - get

config/rbac/role.yaml

@@ -34,7 +34,7 @@ rules:
 - apiGroups:
   - boundless.mirantis.com
   resources:
-  - clusters
+  - blueprints
   verbs:
   - create
   - delete
@@ -46,13 +46,13 @@ rules:
 - apiGroups:
   - boundless.mirantis.com
   resources:
-  - clusters/finalizers
+  - blueprints/finalizers
   verbs:
   - update
 - apiGroups:
   - boundless.mirantis.com
   resources:
-  - clusters/status
+  - blueprints/status
   verbs:
   - get
   - patch