From 7f2889f43dbecfaad0c8520c7334eab929d57f9a Mon Sep 17 00:00:00 2001 From: Dean Roehrich Date: Thu, 6 Jul 2023 10:12:25 -0500 Subject: [PATCH 1/2] Handle stale kustomize in bin dir. (#52) Signed-off-by: Dean Roehrich --- Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0d482ff..b1dbcfa 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyright 2021, 2022 Hewlett Packard Enterprise Development LP +# Copyright 2021-2023 Hewlett Packard Enterprise Development LP # Other additional copyright holders may be indicated within. # # The entirety of this work is licensed under the Apache License, @@ -90,6 +90,9 @@ helm-version: .version ## Updates the Helm values.yaml with new version clean: rm -f .version +.PHONY: clean-bin +clean-bin: + rm -rf $(LOCALBIN) ## Location to install dependencies to LOCALBIN ?= $(shell pwd)/bin @@ -104,6 +107,8 @@ KUSTOMIZE_VERSION ?= v4.5.7 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" .PHONY: kustomize -kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. -$(KUSTOMIZE): $(LOCALBIN) - test -s $(LOCALBIN)/kustomize || { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); } +kustomize: $(LOCALBIN) ## Download kustomize locally if necessary. + if [[ ! -s $(LOCALBIN)/kustomize || $$($(LOCALBIN)/kustomize version | awk '{print $$1}' | awk -F/ '{print $$2}') != $(KUSTOMIZE_VERSION) ]]; then \ + rm -f $(LOCALBIN)/kustomize && \ + { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }; \ + fi From 800eef66edf5e07486e0c53680232747564d4cd1 Mon Sep 17 00:00:00 2001 From: Matt Richerson Date: Thu, 7 Sep 2023 15:01:46 -0500 Subject: [PATCH 2/2] update version for kustomize and helm Signed-off-by: Matt Richerson --- charts/lustre-csi-driver/values.yaml | 2 +- deploy/kubernetes/base/kustomization.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/lustre-csi-driver/values.yaml b/charts/lustre-csi-driver/values.yaml index dc0ad94..a9c923a 100644 --- a/charts/lustre-csi-driver/values.yaml +++ b/charts/lustre-csi-driver/values.yaml @@ -4,4 +4,4 @@ deployment: image: "ghcr.io/hewlettpackard/lustre-csi-driver" - tag: "0.0.5" + tag: "0.0.6" diff --git a/deploy/kubernetes/base/kustomization.yaml b/deploy/kubernetes/base/kustomization.yaml index c8e631e..8dc5502 100644 --- a/deploy/kubernetes/base/kustomization.yaml +++ b/deploy/kubernetes/base/kustomization.yaml @@ -13,4 +13,4 @@ resources: images: - name: controller newName: ghcr.io/hewlettpackard/lustre-csi-driver - newTag: 0.0.5 + newTag: 0.0.6