fix(helm): crds

Signed-off-by: cndoit18 <cndoit18@outlook.com>
goharbor · Jun 30, 2021 · 991031a · 991031a
1 parent 2c80a32
commit 991031a
Show file tree

Hide file tree

Showing 35 changed files with 25,327 additions and 25,429 deletions.
diff --git a/Makefile b/Makefile
@@ -122,7 +122,8 @@ helm-install: helm helm-generate
 	$(HELM) upgrade --namespace "$(NAMESPACE)" --install $(CHART_RELEASE_NAME) $(CHARTS_DIRECTORY)/harbor-operator-$(RELEASE_VERSION).tgz \
 		--set-string image.repository="$$(echo $(IMG) | sed 's/:.*//')" \
 		--set-string image.tag="$$(echo $(IMG) | sed 's/.*://')" \
-		--set-string harborClass='$(CHART_HARBOR_CLASS)'
+		--set-string harborClass='$(CHART_HARBOR_CLASS)' \
+		--set installCRDs=true
 
 #####################
 #     Packaging     #
@@ -241,7 +242,7 @@ CHART_TEMPLATE_PATH := $(CHART_HARBOR_OPERATOR)/templates
 
 CRD_GROUP := goharbor.io
 
-$(CHARTS_DIRECTORY)/harbor-operator-$(RELEASE_VERSION).tgz: $(CHART_HARBOR_OPERATOR)/README.md $(CHART_HARBOR_OPERATOR)/crds \
+$(CHARTS_DIRECTORY)/harbor-operator-$(RELEASE_VERSION).tgz: $(CHART_HARBOR_OPERATOR)/README.md $(CHART_HARBOR_OPERATOR)/templates/crds.yaml \
 	$(CHART_HARBOR_OPERATOR)/assets $(wildcard $(CHART_HARBOR_OPERATOR)/assets/*) \
 	$(CHART_HARBOR_OPERATOR)/charts $(CHART_HARBOR_OPERATOR)/Chart.lock \
 	$(CHART_TEMPLATE_PATH)/role.yaml $(CHART_TEMPLATE_PATH)/clusterrole.yaml \
@@ -254,10 +255,11 @@ $(CHARTS_DIRECTORY)/harbor-operator-$(RELEASE_VERSION).tgz: $(CHART_HARBOR_OPERA
 		--app-version $(RELEASE_VERSION) \
 		--destination $(CHARTS_DIRECTORY)
 
-$(CHART_HARBOR_OPERATOR)/crds: kustomize config/crd/bases
-	rm -rf '$@'
-	mkdir '$@'
-	$(KUSTOMIZE) build config/helm/crds/ -o '$@'
+$(CHART_HARBOR_OPERATOR)/templates/crds.yaml: kustomize config/crd/bases
+	echo '{{- /* $(DO_NOT_EDIT) */ -}}' > '$@'
+	echo '{{- if .Values.installCRDs }}' >> '$@'
+	$(KUSTOMIZE) build config/helm/crds/ >> '$@'
+	echo '{{- end -}}' >> '$@'
 
 $(CHART_HARBOR_OPERATOR)/assets:
 	rm -f '$@'

diff --git a/apis/goharbor.io/v1alpha3/harborcluster_webhook.go b/apis/goharbor.io/v1alpha3/harborcluster_webhook.go
@@ -44,15 +44,7 @@ func (hc *HarborCluster) SetupWebhookWithManager(_ context.Context, mgr ctrl.Man
 		Complete()
 }
 
-// +kubebuilder:webhook:path=/mutate-goharbor-io-v1alpha3-harborcluster,mutating=true,failurePolicy=fail,groups=goharbor.io,resources=harborclusters,verbs=create;update,versions=v1alpha3,name=mharborcluster.kb.io,admissionReviewVersions={"v1beta1"},sideEffects=None
-
-var _ webhook.Defaulter = &HarborCluster{}
-
-// Default implements webhook.Defaulter so a webhook will be registered for the type.
-func (hc *HarborCluster) Default() {
-}
-
-// +kubebuilder:webhook:verbs=create;update,path=/validate-goharbor-io-v1alpha3-harborcluster,mutating=false,failurePolicy=fail,groups=goharbor.io,resources=harborclusters,versions=v1alpha3,name=vharborcluster.kb.io,admissionReviewVersions={"v1beta1"},sideEffects=None
+// TODO: needs to be cleaned up.
 
 var _ webhook.Validator = &HarborCluster{}
 

diff --git a/apis/goharbor.io/v1beta1/harborcluster_webhook.go b/apis/goharbor.io/v1beta1/harborcluster_webhook.go
@@ -31,7 +31,7 @@ const (
 // Log used this webhook.
 var clog = logf.Log.WithName("harborcluster-resource")
 
-// +kubebuilder:webhook:verbs=create;update,path=/mutate-goharbor-io-v1beta1-harborcluster,mutating=true,failurePolicy=fail,groups=goharbor.io,resources=harborclusters,versions=v1beta1,name=mharborcluster.kb.io.v1beta1,admissionReviewVersions={"v1beta1"},sideEffects=None
+// +kubebuilder:webhook:verbs=create;update,path=/mutate-goharbor-io-v1beta1-harborcluster,mutating=true,failurePolicy=fail,groups=goharbor.io,resources=harborclusters,versions=v1beta1,name=mharborcluster.kb.io,admissionReviewVersions={"v1beta1","v1"},sideEffects=None
 
 var _ webhook.Defaulter = &HarborCluster{}
 
@@ -70,7 +70,7 @@ func (harborcluster *HarborCluster) Default() {
 	}
 }
 
-// +kubebuilder:webhook:verbs=create;update,path=/validate-goharbor-io-v1beta1-harborcluster,mutating=false,failurePolicy=fail,groups=goharbor.io,resources=harborclusters,versions=v1beta1,name=vharborcluster.kb.io.v1beta1,admissionReviewVersions={"v1beta1"},sideEffects=None
+// +kubebuilder:webhook:verbs=create;update,path=/validate-goharbor-io-v1beta1-harborcluster,mutating=false,failurePolicy=fail,groups=goharbor.io,resources=harborclusters,versions=v1beta1,name=vharborcluster.kb.io,admissionReviewVersions={"v1beta1","v1"},sideEffects=None
 
 var _ webhook.Validator = &HarborCluster{}
 

diff --git a/charts/harbor-operator/README.md b/charts/harbor-operator/README.md
@@ -39,6 +39,7 @@ Deploy Harbor Operator
 | image.repository | string | `"goharbor/harbor-operator"` | The image repository whose default is the chart appVersion. |
 | image.tag | string | `"dev"` | The image tag whose default is the chart appVersion. |
 | imagePullSecrets | list | `[]` | Reference to one or more secrets to be used when pulling images <https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/> For example: `[   {"name":"image-pull-secret"} ]` |
+| installCRDs | bool | `false` | If true, CRD resources will be installed as part of the Helm chart. If enabled, when uninstalling CRD resources will be deleted causing all installed custom resources to be DELETED |
 | leaderElection.namespace | string | `"kube-system"` | The namespace used to store the ConfigMap for leader election |
 | logLevel | int | `4` | Set the verbosity of controller. Range of 0 - 6 with 6 being the most verbose. Info level is 4. |
 | nameOverride | string | `""` |  |