#118 move crds, cleanup (#121)

* #118 move crds, cleanup
* #118 helm v3 update

Makefile

@@ -82,7 +82,7 @@ k3d_image: build
 ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
 manifests: controller-gen ## generate custom resource definitions
 	$(CONTROLLER_GEN) crd rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
-	$(CONTROLLER_GEN) crd webhook paths="./..." output:crd:artifacts:config=charts/db-operator/files/gen/crd
+	$(CONTROLLER_GEN) crd webhook paths="./..." output:crd:artifacts:config=charts/db-operator/crds
 
 ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 generate: controller-gen ## generate supporting code for custom resource types

charts/db-operator/Chart.yaml

@@ -1,5 +1,7 @@
-apiVersion: v1
+apiVersion: v2
+type: application
+kubeVersion: ">= 1.19 <= 1.22"
 appVersion: "1.2.0"
 description: A Database Operator
 name: db-operator
-version: 0.8.2
+version: 1.0.0

charts/db-operator/files/gen/readme.md → charts/db-operator/crds/readme.md

@@ -1,5 +1,3 @@
 # Files in this folder should get generated and not manual edited.
 
-## crd
-
-Apply changes to files under `api` and run `make manifests`
+Apply changes to files under `./api` and run `make manifests`

charts/db-operator/templates/_helpers.tpl

@@ -75,18 +75,3 @@ Selector labels
 app.kubernetes.io/name: {{ include "db-operator.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
-
-{{/*
-Merge of generated db crd resource with helm related labels
-*/}}
-{{- define "db-operator.crd_db" -}}
-{{ toYaml (merge (.Files.Get "files/gen/crd/kci.rocks_databases.yaml" | fromYaml) (dict "metadata" (dict "labels" (include "db-operator.labels" . | fromYaml  ) ) ) ) }}
-{{- end -}}
-
-
-{{/*
-Merge of generated dbin crd resource with helm related labels
-*/}}
-{{- define "db-operator.crd_dbin" -}}
-{{ toYaml (merge (.Files.Get "files/gen/crd/kci.rocks_dbinstances.yaml" | fromYaml) (dict "metadata" (dict "labels" (include "db-operator.labels" . | fromYaml  ) ) ) ) }}
-{{- end -}}