[119] Add CRD autocopy from kustomize to helm (#126)

.pre-commit-config.yaml

@@ -39,3 +39,8 @@ repos:
       entry: sh -c "make helm-docs-run"
       language: system
       require_serial: true
+    - id: make-helm-crd-copy
+      name: make-helm-crd-copy
+      entry: sh -c "make helm-crd-copy"
+      language: system
+      require_serial: true

Makefile

@@ -89,6 +89,13 @@ helm-schema-run: helm-schema ## Run helm schema over chart
 helm-docs-run: helm-docs ## Run helm schema over chart
 	$(HELM_DOCS)
 
+.PHONY: helm-crd-copy
+helm-crd-copy: yq kustomize ## Copy CRDs from kustomize to helm-chart
+	@$(eval TMP := $(shell mktemp -d))
+	@$(KUSTOMIZE) build config/default > $(TMP)/manifest.yaml && cd $(TMP) && $(YQ) -s '.kind + "-" + .metadata.name' --no-doc manifest.yaml && cd $(OLDPWD)
+	@mv $(TMP)/CustomResourceDefinition-etcdclusters.etcd.aenix.io charts/etcd-operator/crds/etcd-cluster.yaml
+	@rm -rf $(TMP)
+
 ##@ Build
 
 .PHONY: build
@@ -211,6 +218,7 @@ GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
 KIND ?= $(LOCALBIN)/kind
 HELM ?= $(LOCALBIN)/helm
 HELM_DOCS ?= $(LOCALBIN)/helm-docs
+YQ = $(LOCALBIN)/yq
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v5.3.0
@@ -221,6 +229,7 @@ KIND_VERSION ?= v0.22.0
 HELM_VERSION ?= v3.14.3
 HELM_SCHEMA_VERSION ?= v1.2.2
 HELM_DOCS_VERSION ?= v1.13.1
+YQ_VERSION ?= v4.42.1
 
 ## Tool install scripts
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
@@ -271,3 +280,8 @@ helm-schema: helm $(HELM_PLUGINS)
 helm-docs: $(LOCALBIN)
 	@test -x $(HELM_DOCS) && $(HELM_DOCS) version | grep -q $(HELM_DOCS_VERSION) || \
 	GOBIN=$(LOCALBIN) go install github.com/norwoodj/helm-docs/cmd/helm-docs@$(HELM_DOCS_VERSION)
+
+.PHONY: yq
+yq: $(LOCALBIN)
+	@test -x $(YQ) && $(YQ) version | grep -q $(YQ_VERSION) || \
+	GOBIN=$(LOCALBIN) go install github.com/mikefarah/yq/v4@$(YQ_VERSION)

charts/etcd-operator/crds/etcd-cluster.yaml

@@ -2283,9 +2283,6 @@ spec:
                               - name
                             type: object
                           type: array
-                        image:
-                          description: Image is the etcd container image name
-                          type: string
                         imagePullSecrets:
                           description: |-
                             ImagePullSecrets An optional list of references to secrets in the same namespace
@@ -2313,6 +2310,20 @@ spec:
                         priorityClassName:
                           description: PriorityClassName is the name of the PriorityClass for this pod.
                           type: string
+                        readinessGates:
+                          description: |-
+                            ReadinessGates is an optional list of conditions that must be true for the pod to be considered ready for
+                            traffic. A pod is considered ready when all of its containers are ready.
+                          items:
+                            description: PodReadinessGate contains the reference to a pod condition
+                            properties:
+                              conditionType:
+                                description: ConditionType refers to a condition in the pod's condition list with matching type.
+                                type: string
+                            required:
+                              - conditionType
+                            type: object
+                          type: array
                         runtimeClassName:
                           description: RuntimeClassName refers to a RuntimeClass object in the node.k8s.io group, which should be used to run this pod.
                           type: string
@@ -2488,6 +2499,9 @@ spec:
                                   type: string
                               type: object
                           type: object
+                        serviceAccountName:
+                          description: ServiceAccountName is the name of the ServiceAccount to use to run the etcd pods.
+                          type: string
                         terminationGracePeriodSeconds:
                           description: TerminationGracePeriodSeconds is the time to wait before forceful pod shutdown.
                           format: int64