Merge pull request #1921 from barney-s/getter-config-rename

Rename Getter CRD to GetterConfiguration

experiments/compositions/composition/PROJECT

@@ -59,7 +59,7 @@ resources:
   controller: true
   domain: google.com
   group: composition
-  kind: Getter
+  kind: GetterConfiguration
   path: google.com/composition/api/v1alpha1
   version: v1alpha1
 version: "3"

experiments/compositions/composition/api/v1alpha1/getter_types.go

@@ -50,44 +50,44 @@ type ValuesFrom struct {
 	FieldRef    []FieldRef  `json:"fieldRef"`
 }
 
-// GetterSpec defines the desired state of Getter
-type GetterSpec struct {
+// GetterConfigurationSpec defines the desired state of GetterConfiguration
+type GetterConfigurationSpec struct {
 	ValuesFrom []ValuesFrom `json:"valuesFrom,omitempty"`
 }
 
-// GetterStatus defines the observed state of Getter
-type GetterStatus struct {
+// GetterConfigurationStatus defines the observed state of GetterConfiguration
+type GetterConfigurationStatus struct {
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 
-// Getter is the Schema for the getters API
-type Getter struct {
+// GetterConfiguration is the Schema for the getters API
+type GetterConfiguration struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   GetterSpec   `json:"spec,omitempty"`
-	Status GetterStatus `json:"status,omitempty"`
+	Spec   GetterConfigurationSpec   `json:"spec,omitempty"`
+	Status GetterConfigurationStatus `json:"status,omitempty"`
 }
 
 //+kubebuilder:object:root=true
 
-// GetterList contains a list of Getter
-type GetterList struct {
+// GetterConfigurationList contains a list of GetterConfiguration
+type GetterConfigurationList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Getter `json:"items"`
+	Items           []GetterConfiguration `json:"items"`
 }
 
 // Status helpers
-func (g *GetterStatus) ClearCondition(condition ConditionType) {
+func (g *GetterConfigurationStatus) ClearCondition(condition ConditionType) {
 	meta.RemoveStatusCondition(&g.Conditions, string(condition))
 }
 
 // Validation
-func (g *Getter) Validate() bool {
+func (g *GetterConfiguration) Validate() bool {
 	// Several of these validations should br CEL rules on the composition CRD
 	// However for now they help me shape the controller.
 	g.Status.ClearCondition(ValidationFailed)
@@ -102,7 +102,7 @@ func (g *Getter) Validate() bool {
 		g.Status.Conditions = append(g.Status.Conditions, metav1.Condition{
 			LastTransitionTime: metav1.Now(),
 			Message:            message,
-			Reason:             "GetterValidationFailed",
+			Reason:             "GetterConfigurationValidationFailed",
 			Type:               string(ValidationFailed),
 			Status:             metav1.ConditionTrue,
 		})
@@ -112,5 +112,5 @@ func (g *Getter) Validate() bool {
 }
 
 func init() {
-	SchemeBuilder.Register(&Getter{}, &GetterList{})
+	SchemeBuilder.Register(&GetterConfiguration{}, &GetterConfigurationList{})
 }

experiments/compositions/composition/cmd/main.go

@@ -131,11 +131,11 @@ func main() {
 		setupLog.Error(err, "unable to create controller", "controller", "ExpanderVersion")
 		os.Exit(1)
 	}
-	if err = (&controller.GetterReconciler{
+	if err = (&controller.GetterConfigurationReconciler{
 		Client: mgr.GetClient(),
 		Scheme: mgr.GetScheme(),
 	}).SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "Getter")
+		setupLog.Error(err, "unable to create controller", "controller", "GetterConfiguration")
 		os.Exit(1)
 	}
 	//+kubebuilder:scaffold:builder

experiments/compositions/composition/config/crd/bases/composition.google.com_getters.yaml → experiments/compositions/composition/config/crd/bases/composition.google.com_getterconfigurations.yaml

@@ -18,20 +18,20 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
-  name: getters.composition.google.com
+  name: getterconfigurations.composition.google.com
 spec:
   group: composition.google.com
   names:
-    kind: Getter
-    listKind: GetterList
-    plural: getters
-    singular: getter
+    kind: GetterConfiguration
+    listKind: GetterConfigurationList
+    plural: getterconfigurations
+    singular: getterconfiguration
   scope: Namespaced
   versions:
   - name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: Getter is the Schema for the getters API
+        description: GetterConfiguration is the Schema for the getters API
         properties:
           apiVersion:
             description: |-
@@ -51,7 +51,7 @@ spec:
           metadata:
             type: object
           spec:
-            description: GetterSpec defines the desired state of Getter
+            description: GetterConfigurationSpec defines the desired state of GetterConfiguration
             properties:
               valuesFrom:
                 items:
@@ -78,6 +78,8 @@ spec:
                         kind:
                           type: string
                         name:
+                          description: OneOf validation needed for Name and NameSuffix
+                            in CRD Definition
                           type: string
                         nameSuffix:
                           type: string
@@ -97,7 +99,7 @@ spec:
                 type: array
             type: object
           status:
-            description: GetterStatus defines the observed state of Getter
+            description: GetterConfigurationStatus defines the observed state of GetterConfiguration
             properties:
               conditions:
                 items:

experiments/compositions/composition/config/crd/kustomization.yaml

@@ -21,7 +21,7 @@ resources:
 - bases/composition.google.com_plans.yaml
 - bases/composition.google.com_facades.yaml
 - bases/composition.google.com_expanderversions.yaml
-- bases/composition.google.com_getters.yaml
+- bases/composition.google.com_getterconfigurations.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 patches:
@@ -31,7 +31,7 @@ patches:
 #- path: patches/webhook_in_contexts.yaml
 #- path: patches/webhook_in_plans.yaml
 #- path: patches/webhook_in_facades.yaml
-#- path: patches/webhook_in_getters.yaml
+#- path: patches/webhook_in_getterconfigurations.yaml
 #+kubebuilder:scaffold:crdkustomizewebhookpatch
 
 # [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix.
@@ -41,7 +41,7 @@ patches:
 #- path: patches/cainjection_in_plans.yaml
 #- path: patches/cainjection_in_facades.yaml
 #- path: patches/cainjection_in_expanderversions.yaml
-#- path: patches/cainjection_in_getters.yaml
+#- path: patches/cainjection_in_getterconfigurations.yaml
 #+kubebuilder:scaffold:crdkustomizecainjectionpatch
 
 # [WEBHOOK] To enable webhook, uncomment the following section

experiments/compositions/composition/config/expanders/expander_versions.yaml

@@ -51,4 +51,4 @@ spec:
   config:
     group: composition.google.com
     version: v1alpha1
-    kind: Getter
+    kind: GetterConfiguration

experiments/compositions/composition/config/rbac/getter_editor_role.yaml → experiments/compositions/composition/config/rbac/getterconfiguration_editor_role.yaml

@@ -12,23 +12,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# permissions for end users to edit getters.
+# permissions for end users to edit getterconfigurations.
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/name: clusterrole
-    app.kubernetes.io/instance: getter-editor-role
+    app.kubernetes.io/instance: getterconfiguration-editor-role
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: composition
     app.kubernetes.io/part-of: composition
     app.kubernetes.io/managed-by: kustomize
-  name: getter-editor-role
+  name: getterconfiguration-editor-role
 rules:
 - apiGroups:
   - composition.google.com
   resources:
-  - getters
+  - getterconfigurations
   verbs:
   - create
   - delete
@@ -40,6 +40,6 @@ rules:
 - apiGroups:
   - composition.google.com
   resources:
-  - getters/status
+  - getterconfigurations/status
   verbs:
   - get

experiments/compositions/composition/config/rbac/getter_viewer_role.yaml → experiments/compositions/composition/config/rbac/getterconfiguration_viewer_role.yaml

@@ -12,30 +12,30 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# permissions for end users to view getters.
+# permissions for end users to view getterconfigurations.
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
     app.kubernetes.io/name: clusterrole
-    app.kubernetes.io/instance: getter-viewer-role
+    app.kubernetes.io/instance: getterconfiguration-viewer-role
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: composition
     app.kubernetes.io/part-of: composition
     app.kubernetes.io/managed-by: kustomize
-  name: getter-viewer-role
+  name: getterconfiguration-viewer-role
 rules:
 - apiGroups:
   - composition.google.com
   resources:
-  - getters
+  - getterconfigurations
   verbs:
   - get
   - list
   - watch
 - apiGroups:
   - composition.google.com
   resources:
-  - getters/status
+  - getterconfigurations/status
   verbs:
   - get