- simplify create/update object

- improve log - fix bug with object copy - add more tests - rename folders - remove multigroup
ericogr · Mar 20, 2021 · 77c0579 · 77c0579
1 parent 3b1cc20
commit 77c0579
Show file tree

Hide file tree

Showing 33 changed files with 253 additions and 115 deletions.
diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@ all: manager
 
 # Run tests
 test: generate fmt vet manifests
-	go test ./... -coverprofile cover.out
+	go test -v ./... -coverprofile cover.out
 
 # Build manager binary
 manager: generate fmt vet
@@ -68,7 +68,7 @@ docker-push:
 	docker push ${IMG}
 
 security: gosec
-	gosec . controllers/template.ericogr.github.com apis/template.ericogr.github.com/v1/
+	gosec . controllers/template.k8s.ericogr.com.br apis/template.k8s.ericogr.com.br/v1/
 
 # find or download controller-gen
 # download controller-gen if necessary

diff --git a/PROJECT b/PROJECT
@@ -1,11 +1,10 @@
-domain: github.com
-multigroup: true
+domain: k8s.ericogr.com.br
 repo: github.com/ericogr/k8s-object-template
 resources:
-- group: template.ericogr.github.com
+- group: template
   kind: ObjectTemplate
   version: v1
-- group: template.ericogr.github.com
+- group: template
   kind: ObjectTemplateParams
   version: v1
 version: "2"
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ rules:
   - update
 # <<
 - apiGroups:
-  - template.ericogr.github.com
+  - template.k8s.ericogr.com.br
   resources:
   - objecttemplateparams
   verbs:
@@ -51,15 +51,15 @@ rules:
   - update
   - watch
 - apiGroups:
-  - template.ericogr.github.com
+  - template.k8s.ericogr.com.br
   resources:
   - objecttemplateparams/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
-  - template.ericogr.github.com
+  - template.k8s.ericogr.com.br
   resources:
   - objecttemplates
   verbs:
@@ -71,7 +71,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - template.ericogr.github.com
+  - template.k8s.ericogr.com.br
   resources:
   - objecttemplates/status
   verbs:
@@ -80,7 +80,7 @@ rules:
   - update
 ```
 # New Custom Resource Definitions (CRD's)
-You have two new CRD's: [ObjectTemplate](config/crd/bases/template.ericogr.github.com_objecttemplates.yaml) and [ObjectTemplateParameters](config/crd/bases/template.ericogr.github.com_objecttemplateparams.yaml).
+You have two new CRD's: [ObjectTemplate](config/crd/bases/template.k8s.ericogr.com.br_objecttemplates.yaml) and [ObjectTemplateParameters](config/crd/bases/template.k8s.ericogr.com.br_objecttemplateparams.yaml).
 
 **ObjectTemplate (cluster scope):** template used to create kubernetes objects at users namespaces (can be used by k8s admins)
 
@@ -93,7 +93,7 @@ Use templates as a base to create kubernetes objects. Users can define your own
 
 ```yaml
 ---
-apiVersion: template.ericogr.github.com/v1
+apiVersion: template.k8s.ericogr.com.br/v1
 kind: ObjectTemplate
 metadata:
   name: objecttemplate-configmap-test
@@ -157,7 +157,7 @@ Users can define your own parameters to create new objects based on templates in
 
 ```yaml
 ---
-apiVersion: template.ericogr.github.com/v1
+apiVersion: template.k8s.ericogr.com.br/v1
 kind: ObjectTemplateParams
 metadata:
   name: objecttemplateparams-sample

diff --git a/...ricogr.github.com/v1/groupversion_info.go → apis/v1/groupversion_info.go b/...ricogr.github.com/v1/groupversion_info.go → apis/v1/groupversion_info.go
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package v1 contains API Schema definitions for the template.ericogr.github.com v1 API group
+// Package v1 contains API Schema definitions for the template.k8s.ericogr.com.br v1 API group
 // +kubebuilder:object:generate=true
-// +groupName=template.ericogr.github.com
+// +groupName=template.k8s.ericogr.com.br
 package v1
 
 import (
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "template.ericogr.github.com", Version: "v1"}
+	GroupVersion = schema.GroupVersion{Group: "template.k8s.ericogr.com.br", Version: "v1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/...ogr.github.com/v1/objecttemplate_types.go → apis/v1/objecttemplate_types.go b/...ogr.github.com/v1/objecttemplate_types.go → apis/v1/objecttemplate_types.go
diff --git a/...thub.com/v1/objecttemplateparams_types.go → apis/v1/objecttemplateparams_types.go b/...thub.com/v1/objecttemplateparams_types.go → apis/v1/objecttemplateparams_types.go
diff --git a/...com/v1/objecttemplateparams_types_util.go → apis/v1/objecttemplateparams_types_util.go b/...com/v1/objecttemplateparams_types_util.go → apis/v1/objecttemplateparams_types_util.go
diff --git a/...gr.github.com/v1/zz_generated.deepcopy.go → apis/v1/zz_generated.deepcopy.go b/...gr.github.com/v1/zz_generated.deepcopy.go → apis/v1/zz_generated.deepcopy.go
diff --git a/...cogr.github.com_objecttemplateparams.yaml → ....ericogr.com.br_objecttemplateparams.yaml b/...cogr.github.com_objecttemplateparams.yaml → ....ericogr.com.br_objecttemplateparams.yaml
@@ -6,7 +6,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.2.5
   creationTimestamp: null
-  name: objecttemplateparams.template.ericogr.github.com
+  name: objecttemplateparams.template.k8s.ericogr.com.br
 spec:
   additionalPrinterColumns:
   - JSONPath: .status.status
@@ -15,7 +15,7 @@ spec:
   - JSONPath: .metadata.creationTimestamp
     name: age
     type: date
-  group: template.ericogr.github.com
+  group: template.k8s.ericogr.com.br
   names:
     kind: ObjectTemplateParams
     listKind: ObjectTemplateParamsList

diff --git a/...e.ericogr.github.com_objecttemplates.yaml → ...e.k8s.ericogr.com.br_objecttemplates.yaml b/...e.ericogr.github.com_objecttemplates.yaml → ...e.k8s.ericogr.com.br_objecttemplates.yaml
@@ -6,7 +6,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.2.5
   creationTimestamp: null
-  name: objecttemplates.template.ericogr.github.com
+  name: objecttemplates.template.k8s.ericogr.com.br
 spec:
   additionalPrinterColumns:
   - JSONPath: .status.status
@@ -15,7 +15,7 @@ spec:
   - JSONPath: .metadata.creationTimestamp
     name: age
     type: date
-  group: template.ericogr.github.com
+  group: template.k8s.ericogr.com.br
   names:
     kind: ObjectTemplate
     listKind: ObjectTemplateList

diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -2,8 +2,8 @@
 # since it depends on service name and namespace that are out of this kustomize package.
 # It should be run by config/default
 resources:
-- bases/template.ericogr.github.com_objecttemplates.yaml
-- bases/template.ericogr.github.com_objecttemplateparams.yaml
+- bases/template.k8s.ericogr.com.br_objecttemplates.yaml
+- bases/template.k8s.ericogr.com.br_objecttemplateparams.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
 
 patchesStrategicMerge:

diff --git a/config/crd/patches/cainjection_in_objecttemplateparams.yaml b/config/crd/patches/cainjection_in_objecttemplateparams.yaml
@@ -5,4 +5,4 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
-  name: objecttemplateparams.template.ericogr.github.com
+  name: objecttemplateparams.template.k8s.ericogr.com.br
diff --git a/config/crd/patches/cainjection_in_objecttemplates.yaml b/config/crd/patches/cainjection_in_objecttemplates.yaml
@@ -5,4 +5,4 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
-  name: objecttemplates.template.ericogr.github.com
+  name: objecttemplates.template.k8s.ericogr.com.br
diff --git a/config/crd/patches/webhook_in_objecttemplateparams.yaml b/config/crd/patches/webhook_in_objecttemplateparams.yaml
@@ -3,7 +3,7 @@
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  name: objecttemplateparams.template.ericogr.github.com
+  name: objecttemplateparams.template.k8s.ericogr.com.br
 spec:
   conversion:
     strategy: Webhook

diff --git a/config/crd/patches/webhook_in_objecttemplates.yaml b/config/crd/patches/webhook_in_objecttemplates.yaml
@@ -3,7 +3,7 @@
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  name: objecttemplates.template.ericogr.github.com
+  name: objecttemplates.template.k8s.ericogr.com.br
 spec:
   conversion:
     strategy: Webhook

diff --git a/config/rbac/objecttemplate_editor_role.yaml b/config/rbac/objecttemplate_editor_role.yaml
@@ -5,7 +5,7 @@ metadata:
   name: objecttemplate-editor-role
 rules:
 - apiGroups:
-  - template.ericogr.github.com
+  - template.k8s.ericogr.com.br
   resources:
   - objecttemplates
   verbs:
@@ -17,7 +17,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - template.ericogr.github.com
+  - template.k8s.ericogr.com.br
   resources:
   - objecttemplates/status
   verbs:

diff --git a/config/rbac/objecttemplate_viewer_role.yaml b/config/rbac/objecttemplate_viewer_role.yaml
@@ -5,15 +5,15 @@ metadata:
   name: objecttemplate-viewer-role
 rules:
 - apiGroups:
-  - template.ericogr.github.com
+  - template.k8s.ericogr.com.br
   resources:
   - objecttemplates
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - template.ericogr.github.com
+  - template.k8s.ericogr.com.br
   resources:
   - objecttemplates/status
   verbs:

diff --git a/config/rbac/objecttemplateparams_editor_role.yaml b/config/rbac/objecttemplateparams_editor_role.yaml
@@ -5,7 +5,7 @@ metadata:
   name: objecttemplateparams-editor-role
 rules:
 - apiGroups:
-  - template.ericogr.github.com
+  - template.k8s.ericogr.com.br
   resources:
   - objecttemplateparams
   verbs:
@@ -17,7 +17,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - template.ericogr.github.com
+  - template.k8s.ericogr.com.br
   resources:
   - objecttemplateparams/status
   verbs:

diff --git a/config/rbac/objecttemplateparams_viewer_role.yaml b/config/rbac/objecttemplateparams_viewer_role.yaml
@@ -5,15 +5,15 @@ metadata:
   name: objecttemplateparams-viewer-role
 rules:
 - apiGroups:
-  - template.ericogr.github.com
+  - template.k8s.ericogr.com.br
   resources:
   - objecttemplateparams
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - template.ericogr.github.com
+  - template.k8s.ericogr.com.br
   resources:
   - objecttemplateparams/status
   verbs:

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -18,7 +18,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - template.ericogr.github.com
+  - template.k8s.ericogr.com.br
   resources:
   - objecttemplateparams
   verbs:
@@ -30,15 +30,15 @@ rules:
   - update
   - watch
 - apiGroups:
-  - template.ericogr.github.com
+  - template.k8s.ericogr.com.br
   resources:
   - objecttemplateparams/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
-  - template.ericogr.github.com
+  - template.k8s.ericogr.com.br
   resources:
   - objecttemplates
   verbs:
@@ -50,7 +50,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - template.ericogr.github.com
+  - template.k8s.ericogr.com.br
   resources:
   - objecttemplates/status
   verbs:

diff --git a/...ericogr.github.com_v1_objecttemplate.yaml → ...k8s.ericogr.com.br_v1_objecttemplate.yaml b/...ericogr.github.com_v1_objecttemplate.yaml → ...k8s.ericogr.com.br_v1_objecttemplate.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: template.ericogr.github.com/v1
+apiVersion: template.k8s.ericogr.com.br/v1
 kind: ObjectTemplate
 metadata:
   name: objecttemplate-configmap-test

diff --git a/...r.github.com_v1_objecttemplateparams.yaml → ...icogr.com.br_v1_objecttemplateparams.yaml b/...r.github.com_v1_objecttemplateparams.yaml → ...icogr.com.br_v1_objecttemplateparams.yaml
@@ -1,9 +1,8 @@
 ---
-apiVersion: template.ericogr.github.com/v1
+apiVersion: template.k8s.ericogr.com.br/v1
 kind: ObjectTemplateParams
 metadata:
   name: objecttemplateparams-sample
-  namespace: default
 spec:
   templates:
   - name: objecttemplate-configmap-test