From 08eeb5437b960c3279f644aa12e3cd724e90af8d Mon Sep 17 00:00:00 2001 From: Jan-Niklas Weghorn Date: Mon, 29 Apr 2024 18:34:02 +0200 Subject: [PATCH] upgrade mirage to 0.1.1 --- charts/mirage/Chart.lock | 6 --- charts/mirage/Chart.yaml | 9 +--- charts/mirage/README.md | 19 +------- charts/mirage/templates/deployment.yaml | 65 ------------------------- charts/mirage/values.yaml | 18 ------- 5 files changed, 3 insertions(+), 114 deletions(-) delete mode 100644 charts/mirage/Chart.lock diff --git a/charts/mirage/Chart.lock b/charts/mirage/Chart.lock deleted file mode 100644 index 147e433..0000000 --- a/charts/mirage/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: postgresql - repository: https://charts.bitnami.com/bitnami - version: 12.1.15 -digest: sha256:0686bdb95219bbd8806328e63f8547c12c8da36e70776407cde1ac324221d631 -generated: "2023-08-27T13:55:27.416126986+02:00" diff --git a/charts/mirage/Chart.yaml b/charts/mirage/Chart.yaml index c217717..221a30d 100644 --- a/charts/mirage/Chart.yaml +++ b/charts/mirage/Chart.yaml @@ -5,10 +5,5 @@ type: application home: https://gitlab.com/oecis/charts/-/tree/main/charts/mirage sources: - https://gitlab.com/oecis/mirage -version: 0.1.0 -appVersion: "0.1.0" -dependencies: - - condition: global.postgresqlEnabled - name: postgresql - repository: https://charts.bitnami.com/bitnami - version: 12.1.x +version: 0.1.1 +appVersion: "0.1.1" diff --git a/charts/mirage/README.md b/charts/mirage/README.md index b3f7ffd..ed0d829 100644 --- a/charts/mirage/README.md +++ b/charts/mirage/README.md @@ -1,6 +1,6 @@ # mirage -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.0](https://img.shields.io/badge/AppVersion-0.1.0-informational?style=flat-square) +![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.1](https://img.shields.io/badge/AppVersion-0.1.1-informational?style=flat-square) UI for the ory stack (kratos, hydra, etc.) built with phoenix in elixir @@ -10,12 +10,6 @@ UI for the ory stack (kratos, hydra, etc.) built with phoenix in elixir * -## Requirements - -| Repository | Name | Version | -|------------|------|---------| -| https://charts.bitnami.com/bitnami | postgresql | 12.1.x | - ## Values | Key | Type | Default | Description | @@ -26,7 +20,6 @@ UI for the ory stack (kratos, hydra, etc.) built with phoenix in elixir | autoscaling.minReplicas | int | `1` | | | autoscaling.targetCPUUtilizationPercentage | int | `80` | | | fullnameOverride | string | `""` | | -| global.postgresqlEnabled | bool | `true` | | | image.pullPolicy | string | `"IfNotPresent"` | | | image.repository | string | `"registry.oecis.io/oecis/mirage"` | | | image.tag | string | `""` | | @@ -38,17 +31,8 @@ UI for the ory stack (kratos, hydra, etc.) built with phoenix in elixir | ingress.hosts[0].paths[0].path | string | `"/"` | | | ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` | | | ingress.tls | list | `[]` | | -| mirage.autoMigration | bool | `true` | | -| mirage.db.database | string | `""` | | -| mirage.db.existingSecret | string | `""` | | -| mirage.db.host | string | `""` | | -| mirage.db.password | string | `""` | | -| mirage.db.port | int | `5432` | | -| mirage.db.secretKeys.dbPasswordKey | string | `"user-password"` | | -| mirage.db.user | string | `""` | | | mirage.hostBaseUrl | string | `"http://localhost/"` | | | mirage.hydra.internal | string | `"http://hydra"` | | -| mirage.keto.internal | string | `"http://keto"` | | | mirage.kratos.external | string | `"http://kratos"` | | | mirage.kratos.internal | string | `"http://kratos"` | | | mirage.secretName | string | `nil` | | @@ -56,7 +40,6 @@ UI for the ory stack (kratos, hydra, etc.) built with phoenix in elixir | nodeSelector | object | `{}` | | | podAnnotations | object | `{}` | | | podSecurityContext | object | `{}` | | -| postgres | object | `{}` | | | replicaCount | int | `1` | | | resources | object | `{}` | | | securityContext | object | `{}` | | diff --git a/charts/mirage/templates/deployment.yaml b/charts/mirage/templates/deployment.yaml index c95fed4..b026180 100644 --- a/charts/mirage/templates/deployment.yaml +++ b/charts/mirage/templates/deployment.yaml @@ -27,50 +27,6 @@ spec: serviceAccountName: {{ include "mirage.serviceAccountName" . }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} - {{- if .Values.mirage.autoMigration }} - initContainers: - - name: {{ .Chart.Name }}-init - command: ["/app/bin/migrate"] - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - env: - - name: MIRAGE_SECRET_KEY_BASE - valueFrom: - secretKeyRef: - name: {{ .Values.mirage.secretName }} - key: secretKeyBase - - name: MIRAGE_HOST_BASE_URL - value: {{ .Values.mirage.hostBaseUrl }} - - name: MIRAGE_EXTERNAL_KRATOS_BASE_URL - value: {{ .Values.mirage.kratos.external }} - - name: MIRAGE_INTERNAL_KRATOS_BASE_URL - value: {{ .Values.mirage.kratos.internal }} - - name: MIRAGE_INTERNAL_HYDRA_BASE_URL - value: {{ .Values.mirage.hydra.internal }} - - name: MIRAGE_INTERNAL_KETO_BASE_URL - value: {{ .Values.mirage.keto.internal }} - - name: MIRAGE_DB_USER - value: {{ .Values.mirage.db.user }} - - name: MIRAGE_DB_PASSWORD - {{- if .Values.mirage.db.existingSecret }} - valueFrom: - secretKeyRef: - name: {{ .Values.mirage.db.existingSecret }} - key: {{ .Values.mirage.db.secretKeys.dbPasswordKey }} - {{- else }} - value: {{ .Values.config.db.password }} - {{- end }} - - name: MIRAGE_DB_HOST - value: {{ .Values.mirage.db.host }} - - name: MIRAGE_DB_PORT - value: {{ .Values.mirage.db.port | quote }} - - name: MIRAGE_DB_NAME - value: {{ .Values.mirage.db.database | quote }} - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- end }} containers: - name: {{ .Chart.Name }} securityContext: @@ -90,8 +46,6 @@ spec: path: / port: http env: - - name: MIRAGE_CANARY - value: {{ .Values.mirage.canary }} - name: MIRAGE_SECRET_KEY_BASE valueFrom: secretKeyRef: @@ -105,25 +59,6 @@ spec: value: {{ .Values.mirage.kratos.internal }} - name: MIRAGE_INTERNAL_HYDRA_BASE_URL value: {{ .Values.mirage.hydra.internal }} - - name: MIRAGE_INTERNAL_KETO_BASE_URL - value: {{ .Values.mirage.keto.internal }} - - name: MIRAGE_DB_USER - value: {{ .Values.mirage.db.user }} - - name: MIRAGE_DB_PASSWORD - {{- if .Values.mirage.db.existingSecret }} - valueFrom: - secretKeyRef: - name: {{ .Values.mirage.db.existingSecret }} - key: {{ .Values.mirage.db.secretKeys.dbPasswordKey }} - {{- else }} - value: {{ .Values.config.db.password }} - {{- end }} - - name: MIRAGE_DB_HOST - value: {{ .Values.mirage.db.host }} - - name: MIRAGE_DB_PORT - value: {{ .Values.mirage.db.port | quote }} - - name: MIRAGE_DB_NAME - value: {{ .Values.mirage.db.database | quote }} resources: {{- toYaml .Values.resources | nindent 12 }} {{- with .Values.nodeSelector }} diff --git a/charts/mirage/values.yaml b/charts/mirage/values.yaml index 2e675f2..7382bc8 100644 --- a/charts/mirage/values.yaml +++ b/charts/mirage/values.yaml @@ -81,29 +81,11 @@ tolerations: [] affinity: {} - -global: - postgresqlEnabled: true - -postgres: {} - mirage: secretName: null hostBaseUrl: http://localhost/ - autoMigration: true - db: - host: "" - port: 5432 - user: "" - password: "" - database: "" - existingSecret: "" - secretKeys: - dbPasswordKey: user-password kratos: external: http://kratos internal: http://kratos hydra: internal: http://hydra - keto: - internal: http://keto