From d3d339128fc16f23feff31e73a3e5e4c6d53882f Mon Sep 17 00:00:00 2001 From: Dean Roehrich Date: Mon, 5 Aug 2024 14:20:07 -0500 Subject: [PATCH 1/3] Squash the warnings about patchesStrategicMerge (#79) Signed-off-by: Dean Roehrich --- deploy/kubernetes/base/kustomization.yaml | 4 ++-- deploy/kubernetes/overlays/kind/kustomization.yaml | 4 ++-- deploy/kubernetes/overlays/rabbit/kustomization.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deploy/kubernetes/base/kustomization.yaml b/deploy/kubernetes/base/kustomization.yaml index 738ae73..77765b5 100644 --- a/deploy/kubernetes/base/kustomization.yaml +++ b/deploy/kubernetes/base/kustomization.yaml @@ -7,8 +7,8 @@ resources: - driver.yaml - plugin.yaml -#patchesStrategicMerge: -#- plugin_imagepullsecret_patch.yaml +#patches: +#- path: plugin_imagepullsecret_patch.yaml images: - name: controller diff --git a/deploy/kubernetes/overlays/kind/kustomization.yaml b/deploy/kubernetes/overlays/kind/kustomization.yaml index 20734b2..19c988f 100644 --- a/deploy/kubernetes/overlays/kind/kustomization.yaml +++ b/deploy/kubernetes/overlays/kind/kustomization.yaml @@ -15,5 +15,5 @@ patches: kind: DaemonSet name: lustre-csi-node -patchesStrategicMerge: - - manager_tolerations_patch.yaml + - path: manager_tolerations_patch.yaml + diff --git a/deploy/kubernetes/overlays/rabbit/kustomization.yaml b/deploy/kubernetes/overlays/rabbit/kustomization.yaml index 92540a3..e748cae 100644 --- a/deploy/kubernetes/overlays/rabbit/kustomization.yaml +++ b/deploy/kubernetes/overlays/rabbit/kustomization.yaml @@ -2,5 +2,5 @@ resources: - ../../base -patchesStrategicMerge: - - manager_tolerations_patch.yaml \ No newline at end of file +patches: + - path: manager_tolerations_patch.yaml From 9c253908ee3d6508401ab3a7f342d6ad5d1358de Mon Sep 17 00:00:00 2001 From: Dean Roehrich Date: Mon, 12 Aug 2024 12:56:29 -0500 Subject: [PATCH 2/3] Handle case mismatch warning for FROM and AS (#80) Signed-off-by: Dean Roehrich --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c156417..84ce995 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ # limitations under the License. # Builder stage for compiling go source code -FROM golang:1.21 as builder +FROM golang:1.21 AS builder WORKDIR /workspace From 034c003873ac782dea8fc128b2c08778dedc4abb Mon Sep 17 00:00:00 2001 From: Anthony Floeder Date: Thu, 22 Aug 2024 10:45:36 -0500 Subject: [PATCH 3/3] Update own release references Signed-off-by: Anthony Floeder --- 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 6caf456..1b564ff 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.1.2" + tag: "0.1.3" diff --git a/deploy/kubernetes/base/kustomization.yaml b/deploy/kubernetes/base/kustomization.yaml index 9eb1d6e..fa04b74 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.1.2 + newTag: 0.1.3