Skip to content

Commit

Permalink
Squash the warnings about patchesStrategicMerge (#79)
Browse files Browse the repository at this point in the history
Signed-off-by: Dean Roehrich <dean.roehrich@hpe.com>
  • Loading branch information
roehrich-hpe authored Aug 5, 2024
1 parent 977ac7e commit d3d3391
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions deploy/kubernetes/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ resources:
- driver.yaml
- plugin.yaml

#patchesStrategicMerge:
#- plugin_imagepullsecret_patch.yaml
#patches:
#- path: plugin_imagepullsecret_patch.yaml

images:
- name: controller
Expand Down
4 changes: 2 additions & 2 deletions deploy/kubernetes/overlays/kind/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ patches:
kind: DaemonSet
name: lustre-csi-node
patchesStrategicMerge:
- manager_tolerations_patch.yaml
- path: manager_tolerations_patch.yaml

4 changes: 2 additions & 2 deletions deploy/kubernetes/overlays/rabbit/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
resources:
- ../../base

patchesStrategicMerge:
- manager_tolerations_patch.yaml
patches:
- path: manager_tolerations_patch.yaml

0 comments on commit d3d3391

Please sign in to comment.