Skip to content

Commit 2ffc03e

Browse files
authored
Fix Trident kustomization deploy issue
1 parent 3ad7b88 commit 2ffc03e

File tree

6 files changed

+8
-21
lines changed

6 files changed

+8
-21
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ installer: binaries chart
393393
@cp -a deploy /tmp/trident-installer/
394394
-@cp -a $(call binary_path,tridentctl,linux/amd64) /tmp/trident-installer/
395395
@sed -Ei "s|${DEFAULT_OPERATOR_TAG}|${OPERATOR_TAG}|g" /tmp/trident-installer/deploy/operator.yaml
396-
@sed -Ei "s|${DEFAULT_OPERATOR_TAG}|${OPERATOR_TAG}|g" /tmp/trident-installer/deploy/bundle_post_1_25.yaml
396+
@sed -Ei "s|${DEFAULT_OPERATOR_TAG}|${OPERATOR_TAG}|g" /tmp/trident-installer/deploy/bundle.yaml
397397
@mkdir -p /tmp/trident-installer/helm
398398
@cp -a trident-operator-*.tgz /tmp/trident-installer/helm/
399399
@mkdir -p /tmp/trident-installer/extras/bin

deploy/deploy_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ func TestBundleInSyncWithClusterRole(t *testing.T) {
6363
}
6464
inputPaths := []InputFilePaths{
6565
{
66-
ClusterRoleFilePath: "clusterrole_post_1_25.yaml",
67-
BundleFilePath: "bundle_post_1_25.yaml",
66+
ClusterRoleFilePath: "clusterrole.yaml",
67+
BundleFilePath: "bundle.yaml",
6868
},
6969
}
7070

deploy/kustomization.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# To regenerate bundle.yaml, from deploy directory run:
2-
# $ kubectl kustomize . > kustomization.yaml
3-
#
2+
# $ kubectl kustomize . > bundle.yaml
3+
#
44
# Kustomize will merge the specified files also in the correct order.
55
# Namespace needs to be created before this is applied.
66

77
apiVersion: kustomize.config.k8s.io/v1beta1
88
kind: Kustomization
99

1010
resources:
11-
- crds/trident.netapp.io_tridentorchestrators_crd.yaml
1211
- serviceaccount.yaml
13-
- clusterrole_post_1_25.yaml
12+
- clusterrole.yaml
1413
- clusterrolebinding.yaml
15-
- operator.yaml
14+
- operator.yaml
15+

deploy/kustomization_post_1_25.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)