Skip to content

Commit 3db2f77

Browse files
test: Use hermetic helm chart for wordpress in TestHydrateHelmComponents (#1852) (#1853)
* Use hermetic helm chart for wordpress * update test expectation
1 parent 0c5fafa commit 3db2f77

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed

e2e/testcases/hydration_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@ func TestHydrateExternalFiles(t *testing.T) {
221221
}
222222

223223
func TestHydrateHelmComponents(t *testing.T) {
224-
t.Skip("Temporarily skipping failing test")
225224
rootSyncID := nomostest.DefaultRootSyncID
226225
nt := nomostest.New(t,
227226
nomostesting.Hydration,

e2e/testdata/hydration/compiled-json/helm-components/wordpress/deployment_my-wordpress.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
}
167167
],
168168
"envFrom": null,
169-
"image": "docker.io/bitnami/wordpress:6.1.1-debian-11-r34",
169+
"image": "docker.io/bitnamilegacy/wordpress:6.1.1-debian-11-r34",
170170
"imagePullPolicy": "IfNotPresent",
171171
"livenessProbe": {
172172
"failureThreshold": 6,

e2e/testdata/hydration/compiled/helm-components/wordpress/deployment_my-wordpress.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ spec:
115115
- name: APACHE_HTTPS_PORT_NUMBER
116116
value: "8443"
117117
envFrom: null
118-
image: docker.io/bitnami/wordpress:6.1.1-debian-11-r34
118+
image: docker.io/bitnamilegacy/wordpress:6.1.1-debian-11-r34
119119
imagePullPolicy: IfNotPresent
120120
livenessProbe:
121121
failureThreshold: 6

e2e/testdata/hydration/helm-components-remote-values-kustomization.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@ helmCharts:
1818
namespace: coredns
1919
valuesFile: https://raw.githubusercontent.com/config-sync-examples/helm-components/main/coredns-values.yaml
2020
- name: wordpress
21-
repo: https://charts.bitnami.com/bitnami
22-
version: 15.2.35
2321
releaseName: my-wordpress
2422
namespace: wordpress
2523
valuesInline:
24+
image:
25+
registry: docker.io
26+
repository: bitnamilegacy/wordpress
27+
tag: "6.1.1-debian-11-r34"
2628
service:
2729
type: ClusterIP
2830

e2e/testdata/hydration/helm-components/kustomization.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ helmCharts:
1717
releaseName: my-coredns
1818
namespace: coredns
1919
- name: wordpress
20-
repo: https://charts.bitnami.com/bitnami
21-
version: 15.2.35
2220
releaseName: my-wordpress
2321
namespace: wordpress
2422
valuesInline:
@@ -27,6 +25,10 @@ helmCharts:
2725
auth:
2826
rootPassword: abcdefg
2927
password: abcdefg
28+
image:
29+
registry: docker.io
30+
repository: bitnamilegacy/wordpress
31+
tag: "6.1.1-debian-11-r34"
3032
service:
3133
type: ClusterIP
3234

0 commit comments

Comments
 (0)