Merge pull request #79 from hyperspike/helm-name

Helm chart should use same package repo as image, but use different tag

.github/workflows/publish.yaml

@@ -34,7 +34,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.22
+        go-version: 1.23
         check-latest: true
     - name: Build Installer
       run: make build-installer IMG=ghcr.io/hyperspike/valkey-operator:${{ github.ref_name }}
@@ -60,7 +60,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.22
+        go-version: 1.23
         check-latest: true
     - name: Log in to the Container registry
       uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567

.gitignore

@@ -33,5 +33,5 @@ go.work
 blank.yaml
 cilium/
 manager
-valkey-operator-chart/
-valkey-operator-chart-*.tgz
+valkey-operator/
+valkey-operator-*-chart.tgz

Makefile

@@ -200,15 +200,15 @@ HELM_VERSION ?= v3.15.4
 GOSEC_VERSION ?= v2.20.0
 
 helm-gen: manifests kustomize helmify ## Generate Helm chart from Kustomize manifests
-	$Q$(KUSTOMIZE) build config/default | $(HELMIFY) -crd-dir valkey-operator-chart
-	$Qsed s@\\\(app.kubernetes.io/name\\\)@\'\\\1\'@ -i valkey-operator-chart/templates/deployment.yaml
-	$Qsed s@\\\(app.kubernetes.io/instance\\\)@\'\\\1\'@ -i valkey-operator-chart/templates/deployment.yaml
+	$Q$(KUSTOMIZE) build config/default | $(HELMIFY) -crd-dir valkey-operator
+	$Qsed s@\\\(app.kubernetes.io/name\\\)@\'\\\1\'@ -i valkey-operator/templates/deployment.yaml
+	$Qsed s@\\\(app.kubernetes.io/instance\\\)@\'\\\1\'@ -i valkey-operator/templates/deployment.yaml
 
 helm-package: helm-gen helm ## Package Helm chart
-	$Q$(HELM) package valkey-operator-chart --app-version $(VERSION) --version $(VERSION)
+	$Q$(HELM) package valkey-operator --app-version $(VERSION) --version $(VERSION)-chart
 
 helm-publish: helm-package ## Publish Helm chart
-	$Q$(HELM) push valkey-operator-chart-$(VERSION).tgz oci://ghcr.io/hyperspike
+	$Q$(HELM) push valkey-operator-$(VERSION)-chart.tgz oci://ghcr.io/hyperspike
 
 .PHONY: minikube tunnel registry-proxy prometheus-proxy
 minikube: ## Spool up a local minikube cluster for development

README.md

@@ -51,7 +51,7 @@ curl -sL https://github.com/hyperspike/valkey-operator/releases/download/$LATEST
 
 ```sh
 LATEST=$(curl -s https://api.github.com/repos/hyperspike/valkey-operator/releases/latest | jq -cr .tag_name)
-helm install valkey-operator-chart --namespace valkey-operator-system --create-namespace oci://ghcr.io/hyperspike/valkey-operator-chart --version $LATEST
+helm install valkey-operator --namespace valkey-operator-system --create-namespace oci://ghcr.io/hyperspike/valkey-operator --version ${LATEST}-chart
 ```
 
 ### Verifying the container image

valkey.yaml

@@ -8,8 +8,8 @@ metadata:
 spec:
   nodes: 1
   volumePermissions: true
-  prometheus: false
+  prometheus: true
   tls: true
   certIssuer: selfsigned
   prometheusLabels:
-    prometheus: "1"
+    prometheus: prometheus