Remove helmify / kustomize, switch to helm-chart only.

.github/workflows/helm-oci-package-ghcr.yaml

@@ -28,7 +28,7 @@ jobs:
           fetch-depth: 0
           fetch-tags: true
       - name: Install Helm
-        uses: azure/setup-helm@v4.3.1
+        uses: azure/setup-helm@v4
       - name: Lint Helm Chart
         run: helm lint charts/openstack-hypervisor-operator
       - name: Package Helm Chart

.golangci.yaml

@@ -138,9 +138,6 @@ linters:
         - G112
         # if we put a password or token into a serialized payload, guess what, we probably did that on purpose
         - G117
-        # this triggers on net/http.Request.ParseForm() and its callers, e.g. net/http.Request.FormValue(), complaining about potential memory exhaustion from unbounded form parsing;
-        # but that is incorrect, ParseForm() by default never parses more than 10 MiB for this specific reason
-        - G120
         # created file permissions are restricted by umask if necessary
         - G306
         # the following lints cause false-positives in many repositories, should be fixed with the next release. (see https://github.com/securego/gosec/issues/1500)

.pre-commit-config.yaml

@@ -27,13 +27,3 @@ repos:
         entry: sh -c "gmake check || make check"
         language: system
         pass_filenames: false
-      - id: helmify
-        name: helmify
-        entry: sh -c "gmake helmify || make helmify"
-        language: system
-        pass_filenames: false
-      - id: go-build
-        name: go build
-        entry: sh -c "gmake build-all || make build-all"
-        language: system
-        pass_filenames: false

Makefile

@@ -35,11 +35,7 @@ default: build-all
 
 .PHONY: install-crds
 install-crds: generate ## Install CRDs into the K8s cluster specified in ~/.kube/config.
-	kubectl kustomize config/crd | kubectl apply -f -
-
-.PHONY: helmify
-helmify:
-	kubectl kustomize config/default | helmify -crd-dir charts/openstack-hypervisor-operator
+	kubectl apply -f config/crd/*.yaml
 
 install-goimports: FORCE
 	@if ! hash goimports 2>/dev/null; then printf "\e[1;36m>> Installing goimports (this may take a while)...\e[0m\n"; go install golang.org/x/tools/cmd/goimports@latest; fi
@@ -117,7 +113,7 @@ check: FORCE static-check build/cover.html build-all
 
 generate: install-controller-gen
 	@printf "\e[1;36m>> controller-gen\e[0m\n"
-	@controller-gen crd:allowDangerousTypes=true rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	@controller-gen crd:allowDangerousTypes=true rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=charts/openstack-hypervisor-operator/crds
 	@controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./..."
 	@controller-gen applyconfiguration paths="./..."
 

Makefile.maker.yaml

@@ -7,9 +7,10 @@ binaries:
 
 controllerGen:
   enabled: true
-  crdOutputPath: config/crd/bases
+  crdOutputPath: charts/openstack-hypervisor-operator/crds
   objectHeaderFile: hack/boilerplate.go.txt
   rbacRoleName: manager-role
+  allowDangerousTypes: true
 
 coverageTest:
   only: '/internal'
@@ -72,8 +73,4 @@ reuse:
 verbatim: |
   .PHONY: install-crds
   install-crds: generate ## Install CRDs into the K8s cluster specified in ~/.kube/config.
-      kubectl kustomize config/crd | kubectl apply -f -
-
-  .PHONY: helmify
-  helmify:
-      kubectl kustomize config/default | helmify -crd-dir charts/openstack-hypervisor-operator
+      kubectl apply -f config/crd/*.yaml

api/v1/suite_test.go

@@ -48,7 +48,7 @@ var _ = BeforeSuite(func() {
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "config", "crd", "bases")},
+		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "charts", "openstack-hypervisor-operator", "crds")},
 		ErrorIfCRDPathMissing: true,
 		BinaryAssetsDirectory: filepath.Join("..", "..", "bin", "k8s",
 			fmt.Sprintf("1.31.0-%s-%s", runtime.GOOS, runtime.GOARCH)),

charts/openstack-hypervisor-operator/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: openstack-hypervisor-operator
 description: A Helm chart for Kubernetes
-appVersion: 0.1.0
-version: 0.2.9
+appVersion: latest
+version: 1.0.0
 type: application