Merge branch 'master' into release-v0.1.3

Signed-off-by: Anthony Floeder <[email protected]>
HewlettPackard · Aug 22, 2024 · 01972f7 · 01972f7
2 parents b94a464 + 9c25390
commit 01972f7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git 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
 

diff --git 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
@@ -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
@@ -2,5 +2,5 @@
 resources:
   - ../../base
 
-patchesStrategicMerge:
-  - manager_tolerations_patch.yaml
+patches:
+  - path: manager_tolerations_patch.yaml