Merge pull request #475 from tmshort/helm-config

OPRUN-4076, OPRUN-4078: Replace kustomize config with helm config

Author: openshift-merge-bot[bot]

openshift/.bingo/Variables.mk

@@ -29,6 +29,12 @@ $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
 	@echo "(re)installing $(GOBIN)/golangci-lint-v2.1.6"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v2.1.6 "github.com/golangci/golangci-lint/v2/cmd/golangci-lint"
 
+HELM := $(GOBIN)/helm-v3.18.4
+$(HELM): $(BINGO_DIR)/helm.mod
+	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
+	@echo "(re)installing $(GOBIN)/helm-v3.18.4"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=helm.mod -o=$(GOBIN)/helm-v3.18.4 "helm.sh/helm/v3/cmd/helm"
+
 KUSTOMIZE := $(GOBIN)/kustomize-v5.0.1
 $(KUSTOMIZE): $(BINGO_DIR)/kustomize.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.

openshift/.bingo/helm.mod

@@ -0,0 +1,5 @@
+module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
+
+go 1.24.3
+
+require helm.sh/helm/v3 v3.18.4 // cmd/helm

openshift/.bingo/helm.sum

@@ -12,6 +12,8 @@ GO_BINDATA="${GOBIN}/go-bindata-v3.1.2+incompatible"
 
 GOLANGCI_LINT="${GOBIN}/golangci-lint-v2.1.6"
 
+HELM="${GOBIN}/helm-v3.18.4"
+
 KUSTOMIZE="${GOBIN}/kustomize-v5.0.1"
 
 YQ="${GOBIN}/yq-v4.34.2"

openshift/.bingo/variables.env

@@ -24,9 +24,13 @@ verify: ## Run downstream-specific verify
 	git diff --exit-code
 
 .PHONY: manifests
-manifests: $(KUSTOMIZE) $(YQ)
-	$(DIR)/operator-controller/generate-manifests.sh
-	$(DIR)/catalogd/generate-manifests.sh
+manifests: $(YQ) $(HELM)
+	$(DIR)/helm/generate-manifests.sh
+	# Make a single file of each manifest for comparison purposes
+	cat $(DIR)/operator-controller/manifests/*.yml > $(DIR)/operator-controller/manifests.yaml
+	cat $(DIR)/operator-controller/manifests-experimental/*.yml > $(DIR)/operator-controller/manifests-experimental.yaml
+	cat $(DIR)/catalogd/manifests/*.yml > $(DIR)/catalogd/manifests.yaml
+	cat $(DIR)/catalogd/manifests-experimental/*.yml > $(DIR)/catalogd/manifests-experimental.yaml
 
 .PHONY: verify-manifests
 verify-manifests: manifests

openshift/Makefile

@@ -12,6 +12,9 @@ COPY --from=builder /build/bin/catalogd /catalogd
 COPY openshift/catalogd/cp-manifests /cp-manifests
 COPY openshift/catalogd/manifests /openshift/manifests
 COPY openshift/catalogd/manifests-experimental /openshift/manifests-experimental
+COPY helm/olmv1 /openshift/helm/olmv1
+COPY openshift/helm/experimental.yaml /openshift/helm
+COPY openshift/helm/catalogd.yaml /openshift/helm/openshift.yaml
 
 LABEL io.k8s.display-name="OpenShift Operator Lifecycle Manager Catalog Controller" \
       io.k8s.description="This is a component of OpenShift Container Platform that provides operator catalog support."

openshift/catalogd.Dockerfile

@@ -17,3 +17,8 @@ if [ -d /openshift/manifests-experimental ]; then
     cp -a /openshift/manifests-experimental "${DEST}/experimental/catalogd"
 fi
 
+if [ -d /openshift/helm ]; then
+    mkdir -p "${DEST}/helm/catalogd"
+    cp -a /openshift/helm "${DEST}/helm/catalogd"
+fi
+

openshift/catalogd/cp-manifests

@@ -1,16 +1,20 @@
+---
+# Source: olmv1/templates/namespace.yml
 apiVersion: v1
 kind: Namespace
 metadata:
   annotations:
+    olm.operatorframework.io/feature-set: experimental
     openshift.io/node-selector: ""
     workload.openshift.io/allowed: management
   labels:
-    app.kubernetes.io/part-of: olm
-    openshift.io/cluster-monitoring: "true"
+    app.kubernetes.io/name: catalogd
     pod-security.kubernetes.io/audit: privileged
     pod-security.kubernetes.io/audit-version: latest
     pod-security.kubernetes.io/enforce: privileged
     pod-security.kubernetes.io/enforce-version: latest
     pod-security.kubernetes.io/warn: privileged
     pod-security.kubernetes.io/warn-version: latest
+    app.kubernetes.io/part-of: olm
+    openshift.io/cluster-monitoring: "true"
   name: openshift-catalogd

openshift/catalogd/manifests-experimental.yaml

@@ -1,7 +1,13 @@
 ---
+# Source: olmv1/templates/networkpolicy/networkpolicy-olmv1-system-catalogd-controller-manager.yml
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
+  annotations:
+    olm.operatorframework.io/feature-set: experimental
+  labels:
+    app.kubernetes.io/name: catalogd
+    app.kubernetes.io/part-of: olm
   name: catalogd-controller-manager
   namespace: openshift-catalogd
 spec: