From 5db3e3c70739bb935963ef059990903185d8a204 Mon Sep 17 00:00:00 2001 From: operations-vossn-new Date: Mon, 15 Jun 2026 06:58:17 +0200 Subject: [PATCH 01/11] ZUPUS-951: add required healthCheckPolicy template --- .../templates/healthcheckpolicy.yaml | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 charts/sophora-ugc/templates/healthcheckpolicy.yaml diff --git a/charts/sophora-ugc/templates/healthcheckpolicy.yaml b/charts/sophora-ugc/templates/healthcheckpolicy.yaml new file mode 100644 index 00000000..e2cb93c6 --- /dev/null +++ b/charts/sophora-ugc/templates/healthcheckpolicy.yaml @@ -0,0 +1,31 @@ +{{- if .Values.healthCheckPolicy.enabled -}} +{{- $fullName := include "sophora-ugc.fullname" . -}} +{{- $healthCheckPolicy := .Values.healthCheckPolicy | default dict -}} +apiVersion: networking.gke.io/v1 +kind: HealthCheckPolicy +metadata: + name: {{ default (printf "%s-healthcheck" $fullName) $healthCheckPolicy.name }} + labels: + {{- include "sophora-ugc.labels" . | nindent 4 }} + {{- with $healthCheckPolicy.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + default: + checkIntervalSec: {{ default 15 $healthCheckPolicy.checkIntervalSec }} + timeoutSec: {{ default 5 $healthCheckPolicy.timeoutSec }} + healthyThreshold: {{ default 1 $healthCheckPolicy.healthyThreshold }} + unhealthyThreshold: {{ default 2 $healthCheckPolicy.unhealthyThreshold }} + logConfig: + enabled: {{ default true $healthCheckPolicy.logging }} + config: + type: {{ default "HTTP" $healthCheckPolicy.type }} + httpHealthCheck: + portSpecification: {{ default "USE_SERVING_PORT" $healthCheckPolicy.portSpecification }} + requestPath: {{ default "/health" $healthCheckPolicy.requestPath }} + targetRef: + group: "" + kind: Service + name: {{ default (printf "%s-webapp" $fullName) $healthCheckPolicy.serviceName }} +{{- end }} From 8cc3a6c165001c6c2ecbd849347d00f076bfc761 Mon Sep 17 00:00:00 2001 From: operations-vossn-new Date: Mon, 15 Jun 2026 07:00:38 +0200 Subject: [PATCH 02/11] ZUPUS-951: add HealthCheckPolicy values into values.yaml file --- charts/sophora-ugc/values.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/sophora-ugc/values.yaml b/charts/sophora-ugc/values.yaml index dc948859..59f1e431 100644 --- a/charts/sophora-ugc/values.yaml +++ b/charts/sophora-ugc/values.yaml @@ -229,3 +229,7 @@ nodeSelector: {} tolerations: [] affinity: {} + +healthCheckPolicy: + enabled: false + From c2d368b185184c89c8446a27027eac7e1837f2ce Mon Sep 17 00:00:00 2001 From: operations-vossn-new Date: Mon, 15 Jun 2026 07:09:55 +0200 Subject: [PATCH 03/11] ZUPUS-951: increment sophora-ugc chart version to 2.3.0 --- charts/sophora-ugc/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/sophora-ugc/Chart.yaml b/charts/sophora-ugc/Chart.yaml index 3aa861bc..8735aca6 100644 --- a/charts/sophora-ugc/Chart.yaml +++ b/charts/sophora-ugc/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.2.1 +version: 2.3.0 annotations: artifacthub.io/changes: | - kind: fixed @@ -37,4 +37,4 @@ sources: # The URL of this projects home page home: https://subshell.com/sophora/modules/sophora-ugc-comments-quizzes-votings-polls-forms100.html # A URL to an SVG or PNG image to be used as an icon -icon: https://subshell.com/logos/ugc104~1x1.1683631915261.png +icon: https://subshell.com/logos/ugc104~1x1.1683631915261.png \ No newline at end of file From cc071a83b4b36c198112af125d5f445e6cfb6037 Mon Sep 17 00:00:00 2001 From: operations-vossn-new Date: Mon, 15 Jun 2026 09:09:45 +0200 Subject: [PATCH 04/11] ZUPUS-951: remove required healthCheckPolicy template --- .../templates/healthcheckpolicy.yaml | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 charts/sophora-ugc/templates/healthcheckpolicy.yaml diff --git a/charts/sophora-ugc/templates/healthcheckpolicy.yaml b/charts/sophora-ugc/templates/healthcheckpolicy.yaml deleted file mode 100644 index e2cb93c6..00000000 --- a/charts/sophora-ugc/templates/healthcheckpolicy.yaml +++ /dev/null @@ -1,31 +0,0 @@ -{{- if .Values.healthCheckPolicy.enabled -}} -{{- $fullName := include "sophora-ugc.fullname" . -}} -{{- $healthCheckPolicy := .Values.healthCheckPolicy | default dict -}} -apiVersion: networking.gke.io/v1 -kind: HealthCheckPolicy -metadata: - name: {{ default (printf "%s-healthcheck" $fullName) $healthCheckPolicy.name }} - labels: - {{- include "sophora-ugc.labels" . | nindent 4 }} - {{- with $healthCheckPolicy.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - default: - checkIntervalSec: {{ default 15 $healthCheckPolicy.checkIntervalSec }} - timeoutSec: {{ default 5 $healthCheckPolicy.timeoutSec }} - healthyThreshold: {{ default 1 $healthCheckPolicy.healthyThreshold }} - unhealthyThreshold: {{ default 2 $healthCheckPolicy.unhealthyThreshold }} - logConfig: - enabled: {{ default true $healthCheckPolicy.logging }} - config: - type: {{ default "HTTP" $healthCheckPolicy.type }} - httpHealthCheck: - portSpecification: {{ default "USE_SERVING_PORT" $healthCheckPolicy.portSpecification }} - requestPath: {{ default "/health" $healthCheckPolicy.requestPath }} - targetRef: - group: "" - kind: Service - name: {{ default (printf "%s-webapp" $fullName) $healthCheckPolicy.serviceName }} -{{- end }} From 7b54964b663f9249cac26614a6a70b3152b74bb4 Mon Sep 17 00:00:00 2001 From: operations-vossn-new Date: Mon, 15 Jun 2026 09:10:53 +0200 Subject: [PATCH 05/11] ZUPUS-951: add extra-list.yaml file --- charts/sophora-ugc/templates/extra-list.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 charts/sophora-ugc/templates/extra-list.yaml diff --git a/charts/sophora-ugc/templates/extra-list.yaml b/charts/sophora-ugc/templates/extra-list.yaml new file mode 100644 index 00000000..9ac65f9e --- /dev/null +++ b/charts/sophora-ugc/templates/extra-list.yaml @@ -0,0 +1,4 @@ +{{- range .Values.extraDeploy }} +--- +{{ include "common.tplvalues.render" (dict "value" . "context" $) }} +{{- end }} From ef3ea7992171fe656ccb193cc878393441c586d9 Mon Sep 17 00:00:00 2001 From: operations-vossn-new Date: Mon, 15 Jun 2026 09:14:29 +0200 Subject: [PATCH 06/11] ZUPUS-951: add key-value extraDeploy into values.yaml file --- charts/sophora-ugc/values.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/sophora-ugc/values.yaml b/charts/sophora-ugc/values.yaml index 59f1e431..3552ad03 100644 --- a/charts/sophora-ugc/values.yaml +++ b/charts/sophora-ugc/values.yaml @@ -57,6 +57,10 @@ httpRoute: # httpRoute.annotations annotations for the HTTPRoute annotations: {} + # extraDeploy Additional Kubernetes resources to deploy with this release +extraDeploy: [] + + authentication: secret: server: @@ -230,6 +234,4 @@ tolerations: [] affinity: {} -healthCheckPolicy: - enabled: false From 4dd911d08066af63761bc76b1d25dd2ad624ca4b Mon Sep 17 00:00:00 2001 From: operations-vossn-new Date: Mon, 15 Jun 2026 09:36:54 +0200 Subject: [PATCH 07/11] ZUPUS-951: applied suggestion Co-authored-by: Sven Schliesing --- charts/sophora-ugc/values.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/sophora-ugc/values.yaml b/charts/sophora-ugc/values.yaml index 3552ad03..deeabe3d 100644 --- a/charts/sophora-ugc/values.yaml +++ b/charts/sophora-ugc/values.yaml @@ -60,7 +60,6 @@ httpRoute: # extraDeploy Additional Kubernetes resources to deploy with this release extraDeploy: [] - authentication: secret: server: From 054170804cae5e400c0992332bc9748686be1231 Mon Sep 17 00:00:00 2001 From: operations-vossn-new Date: Mon, 15 Jun 2026 09:44:14 +0200 Subject: [PATCH 08/11] ZUPUS-951: fix needless whitespaces --- charts/sophora-ugc/values.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/charts/sophora-ugc/values.yaml b/charts/sophora-ugc/values.yaml index deeabe3d..9fe91a79 100644 --- a/charts/sophora-ugc/values.yaml +++ b/charts/sophora-ugc/values.yaml @@ -232,5 +232,3 @@ nodeSelector: {} tolerations: [] affinity: {} - - From abbcfcd8376efd17a279d3f19745842a39dacb7c Mon Sep 17 00:00:00 2001 From: operations-vossn-new Date: Mon, 15 Jun 2026 11:11:05 +0200 Subject: [PATCH 09/11] ZUPUS-951: correct annotations in Chart.yaml file --- charts/sophora-ugc/Chart.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/sophora-ugc/Chart.yaml b/charts/sophora-ugc/Chart.yaml index 8735aca6..a51967f4 100644 --- a/charts/sophora-ugc/Chart.yaml +++ b/charts/sophora-ugc/Chart.yaml @@ -18,8 +18,8 @@ type: application version: 2.3.0 annotations: artifacthub.io/changes: | - - kind: fixed - description: "Fixed backendRef of httpRoute" + - kind: added + description: "Added host aliases support." artifacthub.io/links: | - name: Documentation for Sophora UGC url: https://subshell.com/docs/ugc/ @@ -37,4 +37,4 @@ sources: # The URL of this projects home page home: https://subshell.com/sophora/modules/sophora-ugc-comments-quizzes-votings-polls-forms100.html # A URL to an SVG or PNG image to be used as an icon -icon: https://subshell.com/logos/ugc104~1x1.1683631915261.png \ No newline at end of file +icon: https://subshell.com/logos/ugc104~1x1.1683631915261.png From 5e7422df6cf3bb14711508badf5c51c0e4d52d27 Mon Sep 17 00:00:00 2001 From: operations-vossn-new Date: Mon, 15 Jun 2026 11:20:47 +0200 Subject: [PATCH 10/11] ZUPUS-951: applied suggestion Co-authored-by: Daniel Raap --- charts/sophora-ugc/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/sophora-ugc/Chart.yaml b/charts/sophora-ugc/Chart.yaml index a51967f4..ded737d3 100644 --- a/charts/sophora-ugc/Chart.yaml +++ b/charts/sophora-ugc/Chart.yaml @@ -19,7 +19,7 @@ version: 2.3.0 annotations: artifacthub.io/changes: | - kind: added - description: "Added host aliases support." + description: "Added support to deploy extra resources." artifacthub.io/links: | - name: Documentation for Sophora UGC url: https://subshell.com/docs/ugc/ From ec2276976969ff4bbde05aecca018a788e1be496 Mon Sep 17 00:00:00 2001 From: operations-vossn-new Date: Mon, 15 Jun 2026 11:57:21 +0200 Subject: [PATCH 11/11] ZUPUS-951: Update CHANGELOG.md --- charts/sophora-ugc/CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/sophora-ugc/CHANGELOG.md b/charts/sophora-ugc/CHANGELOG.md index 5c00cce9..97d57398 100644 --- a/charts/sophora-ugc/CHANGELOG.md +++ b/charts/sophora-ugc/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 2.3.0 +- Added support for deploying extra resources + ## 2.0.12 - link to sources at GitHub @@ -33,4 +36,4 @@ ## 2.0.0 -- 2024-02-13 - UGC Multimedia can now be deployed along with UGC -- Configuration options in the values.yaml were restructured. An example configuration with the new structure can be found in the README.md. \ No newline at end of file +- Configuration options in the values.yaml were restructured. An example configuration with the new structure can be found in the README.md.