From e35bc9cef6b00095276b2c08a9b09d1bbcde0178 Mon Sep 17 00:00:00 2001 From: yatharthranjan Date: Mon, 30 Sep 2024 09:53:53 +0100 Subject: [PATCH 01/10] fix radar SEP ui chart --- external/radar-self-enrolment-ui/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/radar-self-enrolment-ui/values.yaml b/external/radar-self-enrolment-ui/values.yaml index 3b9f0e2e..0a4423fb 100644 --- a/external/radar-self-enrolment-ui/values.yaml +++ b/external/radar-self-enrolment-ui/values.yaml @@ -44,7 +44,7 @@ secret: secretAnnotations: # Create the secret before installation, and only then. This saves the secret from regenerating during an upgrade # pre-upgrade is needed to upgrade from 0.7.0 to newer. Can be deleted afterwards. - helm.sh/hook-weight: 0 + helm.sh/hook-weight: "0" helm.sh/hook: pre-install, pre-upgrade helm.sh/hook-delete-policy: before-hook-creation helm.sh/resource-policy: keep From 0a431b92f1afc60c0d9a5cf5194e2cdc909e4da3 Mon Sep 17 00:00:00 2001 From: yatharthranjan Date: Mon, 30 Sep 2024 09:59:54 +0100 Subject: [PATCH 02/10] bump chart version --- external/radar-self-enrolment-ui/Chart.yaml | 2 +- external/radar-self-enrolment-ui/README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/external/radar-self-enrolment-ui/Chart.yaml b/external/radar-self-enrolment-ui/Chart.yaml index 01c13ce0..f51b3d9d 100644 --- a/external/radar-self-enrolment-ui/Chart.yaml +++ b/external/radar-self-enrolment-ui/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 appVersion: "0.0.1" description: A Helm chart for ORY Kratos's example ui for Kubernetes name: radar-self-enrolment-ui -version: 0.0.1 +version: 0.0.2 type: application diff --git a/external/radar-self-enrolment-ui/README.md b/external/radar-self-enrolment-ui/README.md index 33b9dcfb..4ba1d703 100644 --- a/external/radar-self-enrolment-ui/README.md +++ b/external/radar-self-enrolment-ui/README.md @@ -2,7 +2,7 @@ # radar-self-enrolment-ui -![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square) +![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square) A Helm chart for ORY Kratos's example ui for Kubernetes @@ -27,7 +27,7 @@ A Helm chart for ORY Kratos's example ui for Kubernetes | service.name | string | `"http"` | The service port name. Useful to set a custom service port name if it must follow a scheme (e.g. Istio) | | secret.enabled | bool | `true` | switch to false to prevent creating the secret | | secret.nameOverride | string | `""` | Provide custom name of existing secret, or custom name of secret to be created | -| secret.secretAnnotations | object | `{"helm.sh/hook":"pre-install, pre-upgrade","helm.sh/hook-delete-policy":"before-hook-creation","helm.sh/hook-weight":0,"helm.sh/resource-policy":"keep"}` | Annotations to be added to secret. Annotations are added only when secret is being created. Existing secret will not be modified. | +| secret.secretAnnotations | object | `{"helm.sh/hook":"pre-install, pre-upgrade","helm.sh/hook-delete-policy":"before-hook-creation","helm.sh/hook-weight":"0","helm.sh/resource-policy":"keep"}` | Annotations to be added to secret. Annotations are added only when secret is being created. Existing secret will not be modified. | | secret.hashSumEnabled | bool | `true` | switch to false to prevent checksum annotations being maintained and propogated to the pods | | ingress.enabled | bool | `false` | | | ingress.className | string | `""` | | @@ -73,4 +73,4 @@ A Helm chart for ORY Kratos's example ui for Kubernetes | test.busybox | object | `{"repository":"busybox","tag":1}` | use a busybox image from another repository | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.3](https://github.com/norwoodj/helm-docs/releases/v1.11.3) +Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) From f925affec80a8b338f759b17295a6819e14d5e2f Mon Sep 17 00:00:00 2001 From: Pauline Date: Fri, 4 Oct 2024 16:11:54 +0100 Subject: [PATCH 03/10] Move chart to charts dir instead of external --- {external => charts}/radar-self-enrolment-ui/.helmignore | 0 {external => charts}/radar-self-enrolment-ui/Chart.yaml | 0 {external => charts}/radar-self-enrolment-ui/README.md | 0 {external => charts}/radar-self-enrolment-ui/templates/NOTES.txt | 0 .../radar-self-enrolment-ui/templates/_helpers.tpl | 0 .../radar-self-enrolment-ui/templates/deployment.yaml | 0 .../radar-self-enrolment-ui/templates/ingress.yaml | 0 .../radar-self-enrolment-ui/templates/secret.yaml | 0 .../radar-self-enrolment-ui/templates/service.yaml | 0 .../radar-self-enrolment-ui/templates/tests/test-connection.yaml | 0 {external => charts}/radar-self-enrolment-ui/values.yaml | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename {external => charts}/radar-self-enrolment-ui/.helmignore (100%) rename {external => charts}/radar-self-enrolment-ui/Chart.yaml (100%) rename {external => charts}/radar-self-enrolment-ui/README.md (100%) rename {external => charts}/radar-self-enrolment-ui/templates/NOTES.txt (100%) rename {external => charts}/radar-self-enrolment-ui/templates/_helpers.tpl (100%) rename {external => charts}/radar-self-enrolment-ui/templates/deployment.yaml (100%) rename {external => charts}/radar-self-enrolment-ui/templates/ingress.yaml (100%) rename {external => charts}/radar-self-enrolment-ui/templates/secret.yaml (100%) rename {external => charts}/radar-self-enrolment-ui/templates/service.yaml (100%) rename {external => charts}/radar-self-enrolment-ui/templates/tests/test-connection.yaml (100%) rename {external => charts}/radar-self-enrolment-ui/values.yaml (100%) diff --git a/external/radar-self-enrolment-ui/.helmignore b/charts/radar-self-enrolment-ui/.helmignore similarity index 100% rename from external/radar-self-enrolment-ui/.helmignore rename to charts/radar-self-enrolment-ui/.helmignore diff --git a/external/radar-self-enrolment-ui/Chart.yaml b/charts/radar-self-enrolment-ui/Chart.yaml similarity index 100% rename from external/radar-self-enrolment-ui/Chart.yaml rename to charts/radar-self-enrolment-ui/Chart.yaml diff --git a/external/radar-self-enrolment-ui/README.md b/charts/radar-self-enrolment-ui/README.md similarity index 100% rename from external/radar-self-enrolment-ui/README.md rename to charts/radar-self-enrolment-ui/README.md diff --git a/external/radar-self-enrolment-ui/templates/NOTES.txt b/charts/radar-self-enrolment-ui/templates/NOTES.txt similarity index 100% rename from external/radar-self-enrolment-ui/templates/NOTES.txt rename to charts/radar-self-enrolment-ui/templates/NOTES.txt diff --git a/external/radar-self-enrolment-ui/templates/_helpers.tpl b/charts/radar-self-enrolment-ui/templates/_helpers.tpl similarity index 100% rename from external/radar-self-enrolment-ui/templates/_helpers.tpl rename to charts/radar-self-enrolment-ui/templates/_helpers.tpl diff --git a/external/radar-self-enrolment-ui/templates/deployment.yaml b/charts/radar-self-enrolment-ui/templates/deployment.yaml similarity index 100% rename from external/radar-self-enrolment-ui/templates/deployment.yaml rename to charts/radar-self-enrolment-ui/templates/deployment.yaml diff --git a/external/radar-self-enrolment-ui/templates/ingress.yaml b/charts/radar-self-enrolment-ui/templates/ingress.yaml similarity index 100% rename from external/radar-self-enrolment-ui/templates/ingress.yaml rename to charts/radar-self-enrolment-ui/templates/ingress.yaml diff --git a/external/radar-self-enrolment-ui/templates/secret.yaml b/charts/radar-self-enrolment-ui/templates/secret.yaml similarity index 100% rename from external/radar-self-enrolment-ui/templates/secret.yaml rename to charts/radar-self-enrolment-ui/templates/secret.yaml diff --git a/external/radar-self-enrolment-ui/templates/service.yaml b/charts/radar-self-enrolment-ui/templates/service.yaml similarity index 100% rename from external/radar-self-enrolment-ui/templates/service.yaml rename to charts/radar-self-enrolment-ui/templates/service.yaml diff --git a/external/radar-self-enrolment-ui/templates/tests/test-connection.yaml b/charts/radar-self-enrolment-ui/templates/tests/test-connection.yaml similarity index 100% rename from external/radar-self-enrolment-ui/templates/tests/test-connection.yaml rename to charts/radar-self-enrolment-ui/templates/tests/test-connection.yaml diff --git a/external/radar-self-enrolment-ui/values.yaml b/charts/radar-self-enrolment-ui/values.yaml similarity index 100% rename from external/radar-self-enrolment-ui/values.yaml rename to charts/radar-self-enrolment-ui/values.yaml From 2645800ec257de7fc6ae81fa321edfeb8580fb45 Mon Sep 17 00:00:00 2001 From: Pauline Date: Fri, 4 Oct 2024 16:17:47 +0100 Subject: [PATCH 04/10] Allow custom liveness and readiness probes and update readme --- charts/radar-self-enrolment-ui/README.md | 16 ++++++++- .../templates/deployment.yaml | 18 ++++++++++ charts/radar-self-enrolment-ui/values.yaml | 34 +++++++++++++++++++ 3 files changed, 67 insertions(+), 1 deletion(-) diff --git a/charts/radar-self-enrolment-ui/README.md b/charts/radar-self-enrolment-ui/README.md index 4ba1d703..3f40e7ae 100644 --- a/charts/radar-self-enrolment-ui/README.md +++ b/charts/radar-self-enrolment-ui/README.md @@ -71,6 +71,20 @@ A Helm chart for ORY Kratos's example ui for Kubernetes | jwksUrl | string | `"http://hydra:4445/admin/keys/hydra.jwt.access-token"` | The jwksUrl | | projectName | string | `"SecureApp"` | | | test.busybox | object | `{"repository":"busybox","tag":1}` | use a busybox image from another repository | +| customLivenessProbe | object | `{}` | Custom livenessProbe that overrides the default one | +| livenessProbe.enabled | bool | `true` | Enable livenessProbe | +| livenessProbe.initialDelaySeconds | int | `3` | Initial delay seconds for livenessProbe | +| livenessProbe.periodSeconds | int | `300` | Period seconds for livenessProbe | +| livenessProbe.timeoutSeconds | int | `10` | Timeout seconds for livenessProbe | +| livenessProbe.successThreshold | int | `1` | Success threshold for livenessProbe | +| livenessProbe.failureThreshold | int | `3` | Failure threshold for livenessProbe | +| customReadinessProbe | object | `{}` | Custom readinessProbe that overrides the default one | +| readinessProbe.enabled | bool | `true` | Enable readinessProbe | +| readinessProbe.initialDelaySeconds | int | `5` | Initial delay seconds for readinessProbe | +| readinessProbe.periodSeconds | int | `10` | Period seconds for readinessProbe | +| readinessProbe.timeoutSeconds | int | `10` | Timeout seconds for readinessProbe | +| readinessProbe.successThreshold | int | `1` | Success threshold for readinessProbe | +| readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.11.3](https://github.com/norwoodj/helm-docs/releases/v1.11.3) diff --git a/charts/radar-self-enrolment-ui/templates/deployment.yaml b/charts/radar-self-enrolment-ui/templates/deployment.yaml index dfd9dd10..d8aee44f 100644 --- a/charts/radar-self-enrolment-ui/templates/deployment.yaml +++ b/charts/radar-self-enrolment-ui/templates/deployment.yaml @@ -85,14 +85,32 @@ spec: - name: http containerPort: 3000 protocol: TCP + {{- if .Values.customLivenessProbe }} + livenessProbe: {{- .Values.customLivenessProbe | toYaml | nindent 12 }} + {{- else if .Values.livenessProbe.enabled }} livenessProbe: httpGet: path: {{ .Values.basePath }}/health/alive port: http + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.livenessProbe.failureThreshold }} + {{- end }} + {{- if .Values.customReadinessProbe }} + readinessProbe: {{- .Values.customReadinessProbe | toYaml | nindent 12 }} + {{- else if .Values.readinessProbe.enabled }} readinessProbe: httpGet: path: {{ .Values.basePath }}/health/ready port: http + initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} + successThreshold: {{ .Values.readinessProbe.successThreshold }} + failureThreshold: {{ .Values.readinessProbe.failureThreshold }} + {{- end }} resources: {{- toYaml .Values.deployment.resources | nindent 12 }} {{- if .Values.securityContext }} diff --git a/charts/radar-self-enrolment-ui/values.yaml b/charts/radar-self-enrolment-ui/values.yaml index 0a4423fb..b8fd56c9 100644 --- a/charts/radar-self-enrolment-ui/values.yaml +++ b/charts/radar-self-enrolment-ui/values.yaml @@ -188,3 +188,37 @@ test: busybox: repository: busybox tag: 1 + +# -- Custom livenessProbe that overrides the default one +customLivenessProbe: {} + +livenessProbe: + # -- Enable livenessProbe + enabled: true + # -- Initial delay seconds for livenessProbe + initialDelaySeconds: 3 + # -- Period seconds for livenessProbe + periodSeconds: 300 + # -- Timeout seconds for livenessProbe + timeoutSeconds: 10 + # -- Success threshold for livenessProbe + successThreshold: 1 + # -- Failure threshold for livenessProbe + failureThreshold: 3 + +# -- Custom readinessProbe that overrides the default one +customReadinessProbe: {} + +readinessProbe: + # -- Enable readinessProbe + enabled: true + # -- Initial delay seconds for readinessProbe + initialDelaySeconds: 5 + # -- Period seconds for readinessProbe + periodSeconds: 10 + # -- Timeout seconds for readinessProbe + timeoutSeconds: 10 + # -- Success threshold for readinessProbe + successThreshold: 1 + # -- Failure threshold for readinessProbe + failureThreshold: 3 \ No newline at end of file From 38d5539aaa6e54cd2551a6c83078a1e32a1738e6 Mon Sep 17 00:00:00 2001 From: Pauline Date: Fri, 4 Oct 2024 16:21:12 +0100 Subject: [PATCH 05/10] Remove chart from makefile and fix lint errors --- Makefile | 7 ------- charts/radar-self-enrolment-ui/Chart.yaml | 1 + charts/radar-self-enrolment-ui/values.yaml | 3 ++- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index d9deb7a0..1930618f 100644 --- a/Makefile +++ b/Makefile @@ -68,13 +68,6 @@ update-kratos: @helm pull -d external --untar $(patsubst update-%,%,$@)/$(patsubst update-%,%,$@) @echo "" -update-radar-self-enrolment-ui: - @echo "Updating radar-self-enrolment-ui" - @rm -rf external/$(patsubst update-%,%,$@) - @helm repo add $(patsubst update-%,%,$@) https://k8s.ory.sh/helm/charts - @helm pull -d external --untar $(patsubst update-%,%,$@)/$(patsubst update-%,%,$@) - @echo "" - update-hydra: @echo "Updating Hydra" @rm -rf external/$(patsubst update-%,%,$@) diff --git a/charts/radar-self-enrolment-ui/Chart.yaml b/charts/radar-self-enrolment-ui/Chart.yaml index f51b3d9d..722143f4 100644 --- a/charts/radar-self-enrolment-ui/Chart.yaml +++ b/charts/radar-self-enrolment-ui/Chart.yaml @@ -4,3 +4,4 @@ description: A Helm chart for ORY Kratos's example ui for Kubernetes name: radar-self-enrolment-ui version: 0.0.2 type: application + diff --git a/charts/radar-self-enrolment-ui/values.yaml b/charts/radar-self-enrolment-ui/values.yaml index b8fd56c9..e9ff5142 100644 --- a/charts/radar-self-enrolment-ui/values.yaml +++ b/charts/radar-self-enrolment-ui/values.yaml @@ -221,4 +221,5 @@ readinessProbe: # -- Success threshold for readinessProbe successThreshold: 1 # -- Failure threshold for readinessProbe - failureThreshold: 3 \ No newline at end of file + failureThreshold: 3 + \ No newline at end of file From 9ca8620b227383f29f0a967c79f047dead83d622 Mon Sep 17 00:00:00 2001 From: Pauline Date: Fri, 4 Oct 2024 16:28:19 +0100 Subject: [PATCH 06/10] Fix lint errors --- charts/radar-self-enrolment-ui/values.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/radar-self-enrolment-ui/values.yaml b/charts/radar-self-enrolment-ui/values.yaml index e9ff5142..d60dc483 100644 --- a/charts/radar-self-enrolment-ui/values.yaml +++ b/charts/radar-self-enrolment-ui/values.yaml @@ -222,4 +222,3 @@ readinessProbe: successThreshold: 1 # -- Failure threshold for readinessProbe failureThreshold: 3 - \ No newline at end of file From 01c64cad1f0d07d95aa881f4a7413ea22a0d9044 Mon Sep 17 00:00:00 2001 From: Pauline Date: Fri, 4 Oct 2024 16:30:20 +0100 Subject: [PATCH 07/10] Fix lint errors --- charts/radar-self-enrolment-ui/Chart.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/radar-self-enrolment-ui/Chart.yaml b/charts/radar-self-enrolment-ui/Chart.yaml index 722143f4..f51b3d9d 100644 --- a/charts/radar-self-enrolment-ui/Chart.yaml +++ b/charts/radar-self-enrolment-ui/Chart.yaml @@ -4,4 +4,3 @@ description: A Helm chart for ORY Kratos's example ui for Kubernetes name: radar-self-enrolment-ui version: 0.0.2 type: application - From cd94b342f5fefbc685df6d1443d64c48f57564c6 Mon Sep 17 00:00:00 2001 From: Pauline Date: Sun, 6 Oct 2024 03:47:04 +0300 Subject: [PATCH 08/10] Print difference --- .github/workflows/lint-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 190ace85..657a7046 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -29,7 +29,7 @@ jobs: - name: Check helm docs did not change anything run: | - CHANGES=$(git diff --stat charts :^charts/kafka-manager) + CHANGES=$(git diff charts :^charts/kafka-manager) if [ -n "${CHANGES}" ]; then printf "README is not up to date with helm-docs. Following mismatches are detected:\n$CHANGES\n" exit 1 From ff4ebf9ebbe08ca50b0eacedfa8efe398d596fb1 Mon Sep 17 00:00:00 2001 From: Pauline Date: Sun, 6 Oct 2024 03:52:17 +0300 Subject: [PATCH 09/10] Update readme helm-docs version --- charts/radar-self-enrolment-ui/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/radar-self-enrolment-ui/README.md b/charts/radar-self-enrolment-ui/README.md index 3f40e7ae..3b4be316 100644 --- a/charts/radar-self-enrolment-ui/README.md +++ b/charts/radar-self-enrolment-ui/README.md @@ -87,4 +87,4 @@ A Helm chart for ORY Kratos's example ui for Kubernetes | readinessProbe.failureThreshold | int | `3` | Failure threshold for readinessProbe | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.3](https://github.com/norwoodj/helm-docs/releases/v1.11.3) +Autogenerated from chart metadata using [helm-docs v1.8.1](https://github.com/norwoodj/helm-docs/releases/v1.8.1) From c0f1c4e266d76ecde00545bf5ec617d824d01f10 Mon Sep 17 00:00:00 2001 From: Pauline Date: Sun, 6 Oct 2024 03:53:27 +0300 Subject: [PATCH 10/10] Undo GA lint check --- .github/workflows/lint-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 657a7046..190ace85 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -29,7 +29,7 @@ jobs: - name: Check helm docs did not change anything run: | - CHANGES=$(git diff charts :^charts/kafka-manager) + CHANGES=$(git diff --stat charts :^charts/kafka-manager) if [ -n "${CHANGES}" ]; then printf "README is not up to date with helm-docs. Following mismatches are detected:\n$CHANGES\n" exit 1