From 08e3e13b74720ea65c6cf57888efabba620900d6 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Wed, 24 Aug 2022 16:52:48 +0200
Subject: [PATCH] Fix invalid reference format
when image.digest is missing.
see https://open.greenhost.net/stackspin/stackspin/-/merge_requests/1397#note_50785
and https://github.com/bitnami/charts/pull/12029
---
deployment/helmchart/CHANGELOG.md | 7 +++
deployment/helmchart/Chart.lock | 6 +--
deployment/helmchart/Chart.yaml | 2 +-
deployment/helmchart/values-stackspin.yaml | 52 ++++++++++++++++++++++
deployment/helmchart/values.yaml | 2 +
5 files changed, 65 insertions(+), 4 deletions(-)
create mode 100644 deployment/helmchart/values-stackspin.yaml
diff --git a/deployment/helmchart/CHANGELOG.md b/deployment/helmchart/CHANGELOG.md
index 5a24ce3d..e7e26987 100644
--- a/deployment/helmchart/CHANGELOG.md
+++ b/deployment/helmchart/CHANGELOG.md
@@ -1,5 +1,12 @@
# Changelog
+## [1.2.2]
+
+### Bug fixes
+
+* Fix invalid reference format when image.digest is missing
+ see https://open.greenhost.net/stackspin/stackspin/-/merge_requests/1397#note_50785
+
## [1.2.0]
### Features
diff --git a/deployment/helmchart/Chart.lock b/deployment/helmchart/Chart.lock
index 645dd795..ad1c1945 100644
--- a/deployment/helmchart/Chart.lock
+++ b/deployment/helmchart/Chart.lock
@@ -1,6 +1,6 @@
dependencies:
- name: common
repository: https://charts.bitnami.com/bitnami
- version: 2.0.0
-digest: sha256:61f9464511055add462a995587df3510262bde239a8af5bde91c7c93e6dbe1df
-generated: "2022-08-18T22:05:41.072625223Z"
+ version: 2.0.1
+digest: sha256:eac8729956b60d78414de3eea46b919b44afcd7afdcd19dacd640269b3d731f2
+generated: "2022-08-24T15:52:13.18511608+02:00"
diff --git a/deployment/helmchart/Chart.yaml b/deployment/helmchart/Chart.yaml
index 8381f146..f8b33d66 100644
--- a/deployment/helmchart/Chart.yaml
+++ b/deployment/helmchart/Chart.yaml
@@ -23,4 +23,4 @@ name: stackspin-dashboard
sources:
- https://open.greenhost.net/stackspin/dashboard/
- https://open.greenhost.net/stackspin/dashboard-backend/
-version: 1.2.1
+version: 1.2.2
diff --git a/deployment/helmchart/values-stackspin.yaml b/deployment/helmchart/values-stackspin.yaml
new file mode 100644
index 00000000..c2a63197
--- /dev/null
+++ b/deployment/helmchart/values-stackspin.yaml
@@ -0,0 +1,52 @@
+fullnameOverride: dashboard
+dashboard:
+ host: ${dashboard_domain}
+ resources:
+ limits:
+ memory: 24Mi
+ requests:
+ cpu: 10m
+ memory: 12Mi
+backend:
+ secretKey: ${backend_secret_key}
+ password: ${backend_password}
+ smtp:
+ enabled: ${outgoing_mail_enabled}
+ user: "${outgoing_mail_smtp_user}"
+ password: "${outgoing_mail_smtp_password}"
+ host: "${outgoing_mail_smtp_host}"
+ port: "${outgoing_mail_smtp_port}"
+ kratos:
+ publicUrl: https://${dashboard_domain}/kratos
+ adminUrl: http://kratos-admin
+ hydra:
+ adminUrl: http://hydra-admin:4445
+
+ loginPanelUrl: https://${dashboard_domain}/web/
+ databaseUrl: mysql+pymysql://stackspin:${dashboard_database_password}@single-sign-on-database-mariadb/stackspin
+
+ initialUser:
+ email: ${admin_email}
+ password: ${userbackend_admin_password}
+
+ oidc:
+ clientId: dashboard
+ clientSecret: ${client_secret}
+ baseUrl: "https://${hydra_domain}"
+ authorizationBaseUrl: "https://${hydra_domain}/oauth2/auth"
+ tokenUrl: "https://${hydra_domain}/oauth2/token"
+ resources:
+ limits:
+ memory: 360Mi
+ requests:
+ cpu: 24m
+ memory: 180Mi
+ingress:
+ certManager: true
+ enabled: true
+ hostname: ${dashboard_domain}
+ tls:
+ - hosts:
+ - ${dashboard_domain}
+ secretName: stackspin-dashboard
+
diff --git a/deployment/helmchart/values.yaml b/deployment/helmchart/values.yaml
index 35afd3be..b839a08d 100644
--- a/deployment/helmchart/values.yaml
+++ b/deployment/helmchart/values.yaml
@@ -69,6 +69,7 @@ dashboard:
registry: open.greenhost.net:4567
repository: stackspin/dashboard/dashboard
tag: 0-2-8
+ digest: ""
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
@@ -236,6 +237,7 @@ backend:
registry: open.greenhost.net:4567
repository: stackspin/dashboard-backend/dashboard-backend
tag: 0-2-9
+ digest: ""
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
--
GitLab