From 1ae8748b34f25620a3292736c2ab005cc249de0f Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Mon, 19 Apr 2021 11:46:27 +0200
Subject: [PATCH] test local-path-provisioner in CI and use re-uploaded version
of custom image
---
.gitlab-ci.yml | 21 ++++++++++++++++++-
.../settings/local-path-provisioner.yaml | 2 +-
.../local-path-provisioner_hr.yaml | 2 +-
test/pytest/test_app_deployments.py | 3 +++
4 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c0e6f7c24..908b88006 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,7 +77,6 @@ include:
extends:
- .general_rules
-
.loki_stack_rules:
extends:
- .general_rules
@@ -101,6 +100,10 @@ include:
rules:
- when: always
+.local_path_provisioner_rules:
+ extends:
+ - .general_rules
+
.rocketchat_rules:
rules:
- changes:
@@ -417,6 +420,12 @@ eventrouter-helm-release:
- .helm-release
- .eventrouter_rules
+local-path-provisioner-helm-release:
+ variables:
+ APP: "local-path-provisioner"
+ extends:
+ - .helm-release
+ - .local_path_provisioner_rules
loki-stack-helm-release:
variables:
@@ -497,6 +506,16 @@ eventrouter-ready:
- .apps-ready
- .eventrouter_rules
+local-path-provisioner-ready:
+ variables:
+ APP: "local-path-provisioner"
+ needs:
+ - job: local-path-provisioner-helm-release
+ - job: setup-openappstack
+ extends:
+ - .apps-ready
+ - .local_path_provisioner_rules
+
loki-stack-ready:
variables:
APP: "loki-stack"
diff --git a/ansible/roles/apps/templates/settings/local-path-provisioner.yaml b/ansible/roles/apps/templates/settings/local-path-provisioner.yaml
index ca9f390ea..2eaa55ca1 100644
--- a/ansible/roles/apps/templates/settings/local-path-provisioner.yaml
+++ b/ansible/roles/apps/templates/settings/local-path-provisioner.yaml
@@ -8,4 +8,4 @@ storageClass:
# hostPath.
image:
repository: "open.greenhost.net:4567/openappstack/openappstack/local-path-provisioner"
- tag: "02b021c-amd64"
+ tag: "52f994f-amd64"
diff --git a/flux/kube-system/local-path-provisioner_hr.yaml b/flux/kube-system/local-path-provisioner_hr.yaml
index b36561ba0..7d83e861e 100644
--- a/flux/kube-system/local-path-provisioner_hr.yaml
+++ b/flux/kube-system/local-path-provisioner_hr.yaml
@@ -10,7 +10,7 @@ spec:
releaseName: local-path-provisioner
chart:
git: https://github.com/rancher/local-path-provisioner
- ref: v0.0.13
+ ref: v0.0.14
path: deploy/chart
valuesFrom:
- secretKeyRef:
diff --git a/test/pytest/test_app_deployments.py b/test/pytest/test_app_deployments.py
index b127a1146..362eb221c 100644
--- a/test/pytest/test_app_deployments.py
+++ b/test/pytest/test_app_deployments.py
@@ -32,6 +32,9 @@ EXPECTED_APP_LABELS = {
'eventrouter': {
'namespace': 'oas',
'label_selector': 'app=eventrouter'},
+ 'local-path-provisioner': {
+ 'namespace': 'kube-system',
+ 'label_selector': 'app.kubernetes.io/instance=local-path-provisioner'},
'loki-stack': {
'namespace': 'oas',
'label_selector': 'app=loki'},
--
GitLab