Skip to content

Commit f32aa38

Browse files
colliviermartin-mat
authored andcommitted
Upgrade Helm and migrate from bitnami to bitnamilegacy
It also removes a few debugs in the spec tests. Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
1 parent 907d9a7 commit f32aa38

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

sample-cnfs/sample_oci_repo/cnf-testsuite.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ deployments:
1111
namespace: cnf-default
1212
registry_url: "oci://localhost:53123/helm/nginx"
1313
chart_version: "15.10.0"
14-
plain_http: true
14+
plain_http: true
15+
helm_values: --set global.security.allowInsecureImages=true --set image.repository=bitnamilegacy/nginx

sample-cnfs/sample_private_repo/cnf-testsuite.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ deployments:
1414
helm_chart_name: "nginx"
1515
chart_version: "15.10.0"
1616
skip_tls_verify: true
17-
pass_credentials: true
17+
pass_credentials: true
18+
helm_values: --set global.security.allowInsecureImages=true --set image.repository=bitnamilegacy/nginx

sample-cnfs/sample_tls_repo/cnf-testsuite.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ deployments:
1818
registry_url: "oci://127.0.0.1.nip.io:54125/helm/nginx"
1919
chart_version: "15.10.0"
2020
tls_profile: "mtls"
21-
plain_http: false
21+
plain_http: false
22+
helm_values: --set global.security.allowInsecureImages=true --set image.repository=bitnamilegacy/nginx

spec/setup_spec.cr

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,8 +458,6 @@ describe "Installation" do
458458
false
459459
end
460460
end
461-
puts DockerClient.run("logs --tail=200 oci-reg-mtls")[:output].to_s unless ok
462-
ok.should be_true
463461

464462
# Negative login (no client certs) must fail
465463
Helm.registry_login(reg_host_port, username: "dummy", password: "secret", insecure: false).should be_false

src/tasks/setup/constants.cr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module Setup
77
KIND_VERSION = "0.27.0"
88
KUBESCAPE_VERSION = "3.0.30"
99
KUBESCAPE_FRAMEWORK_VERSION = "1.0.316"
10-
HELM_VERSION = "3.17.3"
10+
HELM_VERSION = "3.19.0"
1111
# (rafal-lal) TODO: configure version of the gatekeeper
1212
GATEKEEPER_VERSION = "TODO: USE THIS"
1313

0 commit comments

Comments
 (0)