From d4b7d837b6b2fcf8c8fb73acac3c2e9d5f1f8c5b Mon Sep 17 00:00:00 2001 From: "Giau. Tran Minh" Date: Tue, 28 Nov 2023 20:10:45 +0700 Subject: [PATCH] fix: remove tag with yq --- Makefile | 9 +++++++++ charts/atlas-operator/values.yaml | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 69414b17..1294ac3a 100644 --- a/Makefile +++ b/Makefile @@ -182,11 +182,13 @@ KUSTOMIZE ?= $(LOCALBIN)/kustomize CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen ENVTEST ?= $(LOCALBIN)/setup-envtest HELMIFY ?= $(LOCALBIN)/helmify +YQ ?= $(LOCALBIN)/yq ## Tool Versions KUSTOMIZE_VERSION ?= v5.1.1 CONTROLLER_TOOLS_VERSION ?= v0.13.0 HELMIFY_VERSION ?= v0.4.10 +YQ_VERSION ?= v4.40.3 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" .PHONY: kustomize @@ -276,9 +278,16 @@ $(HELMIFY): $(LOCALBIN) test -s $(LOCALBIN)/helmify && $(LOCALBIN)/helmify --version | grep -q $(HELMIFY_VERSION) || \ GOBIN=$(LOCALBIN) go install -ldflags "-X main.version=$(HELMIFY_VERSION)" github.com/arttor/helmify/cmd/helmify@$(HELMIFY_VERSION) +.PHONY: yq +yq: $(YQ) ## Download yq locally if necessary. If wrong version is installed, it will be overwritten. +$(YQ): $(LOCALBIN) + test -s $(LOCALBIN)/yq && $(LOCALBIN)/yq --version | grep -q $(YQ_VERSION) || \ + GOBIN=$(LOCALBIN) go install -ldflags "-X cmd.Version=$(YQ_VERSION)" github.com/mikefarah/yq/v4@$(YQ_VERSION) + .PHONY: helm helm: manifests kustomize license helmify $(KUSTOMIZE) build config/helm | $(HELMIFY) -crd-dir -generate-defaults -image-pull-secrets charts/atlas-operator + $(YQ) -i '.controllerManager.manager.image.tag = ""' charts/atlas-operator/values.yaml .PHONY: cli-gen cli-gen: generate manifests helm license diff --git a/charts/atlas-operator/values.yaml b/charts/atlas-operator/values.yaml index d25a745d..671536e8 100644 --- a/charts/atlas-operator/values.yaml +++ b/charts/atlas-operator/values.yaml @@ -1,18 +1,18 @@ controllerManager: manager: args: - - --leader-elect + - --leader-elect containerSecurityContext: allowPrivilegeEscalation: false capabilities: drop: - - ALL + - ALL runAsUser: 1000 env: prewarmDevdb: "true" image: repository: arigaio/atlas-operator - tag: latest + tag: "" imagePullPolicy: IfNotPresent resources: limits: