diff --git a/Makefile b/Makefile index d9deb7a..1930618 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/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 91% rename from external/radar-self-enrolment-ui/Chart.yaml rename to charts/radar-self-enrolment-ui/Chart.yaml index 01c13ce..f51b3d9 100644 --- a/external/radar-self-enrolment-ui/Chart.yaml +++ b/charts/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/charts/radar-self-enrolment-ui/README.md similarity index 74% rename from external/radar-self-enrolment-ui/README.md rename to charts/radar-self-enrolment-ui/README.md index 33b9dcf..3b4be31 100644 --- a/external/radar-self-enrolment-ui/README.md +++ b/charts/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 | `""` | | @@ -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.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) 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 78% rename from external/radar-self-enrolment-ui/templates/deployment.yaml rename to charts/radar-self-enrolment-ui/templates/deployment.yaml index dfd9dd1..d8aee44 100644 --- a/external/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/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 84% rename from external/radar-self-enrolment-ui/values.yaml rename to charts/radar-self-enrolment-ui/values.yaml index 3b9f0e2..d60dc48 100644 --- a/external/radar-self-enrolment-ui/values.yaml +++ b/charts/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 @@ -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