Put helm chart under lws/charts/ (#482)

* Update the helm chart location

Signed-off-by: kerthcet <[email protected]>

* Fix update helm chart error

Signed-off-by: kerthcet <[email protected]>

* add yq command to artifacts

Signed-off-by: kerthcet <[email protected]>

---------

Signed-off-by: kerthcet <[email protected]>

Author: kerthcet

Makefile

@@ -35,7 +35,7 @@ IMAGE_REGISTRY ?= ${STAGING_IMAGE_REGISTRY}/lws
 IMAGE_NAME := lws
 IMAGE_REPO := $(IMAGE_REGISTRY)/$(IMAGE_NAME)
 IMG ?= $(IMAGE_REPO):$(GIT_TAG)
-HELM_CHART_REPO := ${STAGING_IMAGE_REGISTRY}/charts
+HELM_CHART_REPO := ${STAGING_IMAGE_REGISTRY}/lws/charts
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
 BASE_IMAGE ?= gcr.io/distroless/static:nonroot
@@ -270,7 +270,7 @@ code-generator:
 
 ##@ Release
 .PHONY: artifacts
-artifacts: kustomize helm
+artifacts: kustomize helm yq
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 	if [ -d artifacts ]; then rm -rf artifacts; fi
 	mkdir -p artifacts
@@ -282,7 +282,7 @@ artifacts: kustomize helm
 	$(HELM) package --version $(GIT_TAG) --app-version $(GIT_TAG) charts/lws -d artifacts/
 	mv artifacts/lws-$(GIT_TAG).tgz artifacts/lws-chart-$(GIT_TAG).tgz
 	# Revert the image changes
-	$(YQ)  e  '.image.manager.repository = "$(IMAGE_REGISTRY)/$(IMAGE_NAME)" | del(.image.manager.tag) | .image.manager.pullPolicy = "Always"' -i charts/lws/values.yaml
+	$(YQ)  e  '.image.manager.repository = "$(IMAGE_REGISTRY)/$(IMAGE_NAME)" | .image.manager.tag = "main" | .image.manager.pullPolicy = "Always"' -i charts/lws/values.yaml
 
 
 .PHONY: prometheus

charts/lws/values.yaml

@@ -14,7 +14,8 @@ image:
     repository: us-central1-docker.pkg.dev/k8s-staging-images/lws/lws
     # tag, if defined will use the given image tag, else Chart.AppVersion will be used
     tag: main
-    pullPolicy: IfNotPresent
+    pullPolicy: Always
+    tag: main
 podAnnotations: {}
 podSecurityContext:
   runAsNonRoot: true

config/manager/kustomization.yaml

@@ -5,9 +5,9 @@ generatorOptions:
   disableNameSuffixHash: true
 
 configMapGenerator:
-  - files:
-      - controller_manager_config.yaml
-    name: manager-config
+- files:
+  - controller_manager_config.yaml
+  name: manager-config
 
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

hack/push-chart.sh

@@ -25,7 +25,7 @@ GIT_TAG=${GIT_TAG:-$(git describe --tags --dirty --always)}
 
 STAGING_IMAGE_REGISTRY=${STAGING_IMAGE_REGISTRY:-us-central1-docker.pkg.dev/k8s-staging-images}
 IMAGE_REGISTRY=${IMAGE_REGISTRY:-${STAGING_IMAGE_REGISTRY}/lws}
-HELM_CHART_REPO=${HELM_CHART_REPO:-${STAGING_IMAGE_REGISTRY}/charts}
+HELM_CHART_REPO=${HELM_CHART_REPO:-${STAGING_IMAGE_REGISTRY}/lws/charts}
 IMAGE_REPO=${IMAGE_REPO:-${IMAGE_REGISTRY}/lws}
 
 HELM=${HELM:-./bin/helm}
@@ -42,7 +42,7 @@ then
 	chart_version=${EXTRA_TAG}
 fi
 
-default_image_repo=$(${YQ} ".image.repository" charts/lws/values.yaml)
+default_image_repo=$(${YQ} ".image.manager.repository" charts/lws/values.yaml)
 readonly default_image_repo
 
 # Update the image repo, tag and policy