Skip to content

Commit 79d94bc

Browse files
committed
Attempting to fix tests
Signed-off-by: Neo2308 <pradha.krishna.cse17@itbhu.ac.in>
1 parent 08cdb41 commit 79d94bc

File tree

4 files changed

+17
-13
lines changed

4 files changed

+17
-13
lines changed

hack/generate/samples/ansible/advanced_molecule.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ func updateConfig(dir string) {
148148
log.Info("adding task to not pull image to the config/testing")
149149
err = kbutil.ReplaceInFile(
150150
filepath.Join(dir, "config", "testing", "kustomization.yaml"),
151-
"- manager_image.yaml",
152-
"- manager_image.yaml\n- pull_policy/Never.yaml")
151+
"- path: manager_image.yaml",
152+
"- path: manager_image.yaml\n- path: pull_policy/Never.yaml")
153153
pkg.CheckError("adding task to not pull image to the config/testing", err)
154154
}
155155

hack/generate/samples/ansible/memcached_molecule.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ func ImplementMemcachedMolecule(sample sample.Sample, image string) {
120120
pkg.CheckError("adding watch_namespace_patch.yaml", err)
121121

122122
log.Info("adding WATCH_NAMESPACE env patch to patch list to be applied")
123-
err = kbutil.InsertCode(filepath.Join(sample.Dir(), "config", "testing", "kustomization.yaml"), "patchesStrategicMerge:",
124-
fmt.Sprintf("\n- %s", watchNamespacePatchFileName))
123+
err = kbutil.InsertCode(filepath.Join(sample.Dir(), "config", "testing", "kustomization.yaml"), "patches:",
124+
fmt.Sprintf("\n- path: %s", watchNamespacePatchFileName))
125125
pkg.CheckError("inserting in kustomization.yaml", err)
126126

127127
}

pkg/plugins/ansible/v1/scaffolds/internal/templates/config/testing/kustomization.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,12 @@ namePrefix: osdk-
5050
#commonLabels:
5151
# someName: someValue
5252
53-
patchesStrategicMerge:
54-
- manager_image.yaml
55-
- debug_logs_patch.yaml
56-
- ../default/manager_metrics_patch.yaml
53+
patches:
54+
- path: manager_image.yaml
55+
- path: debug_logs_patch.yaml
56+
- path: ../default/manager_metrics_patch.yaml
57+
target:
58+
kind: Deployment
5759
5860
apiVersion: kustomize.config.k8s.io/v1beta1
5961
kind: Kustomization

testdata/memcached-molecule-operator/config/testing/kustomization.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ namePrefix: osdk-
77
#commonLabels:
88
# someName: someValue
99

10-
patchesStrategicMerge:
11-
- watch_namespace_patch.yaml
12-
- manager_image.yaml
13-
- debug_logs_patch.yaml
14-
- ../default/manager_metrics_patch.yaml
10+
patches:
11+
- path: watch_namespace_patch.yaml
12+
- path: manager_image.yaml
13+
- path: debug_logs_patch.yaml
14+
- path: ../default/manager_metrics_patch.yaml
15+
target:
16+
kind: Deployment
1517

1618
apiVersion: kustomize.config.k8s.io/v1beta1
1719
kind: Kustomization

0 commit comments

Comments
 (0)