From 78c6701f65122d173380f8593ec81f096dbe62cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20D=C3=B6ll?= Date: Tue, 16 Jul 2024 13:04:22 +0000 Subject: [PATCH] chore: update helm chart --- api/gen.go | 2 +- gen.go | 2 +- helm/charts/knox/templates/deployment.yaml | 8 +-- helm/charts/knox/templates/job.yaml | 10 +++- helm/charts/knox/values.yaml | 2 +- pkg/apis/models.gen.go | 70 +++++++++++----------- tools/tools.go | 2 +- 7 files changed, 51 insertions(+), 45 deletions(-) diff --git a/api/gen.go b/api/gen.go index 56aa621..1c2a4be 100644 --- a/api/gen.go +++ b/api/gen.go @@ -1,7 +1,7 @@ //go:build generate // +build generate -package accounts +package api //go:generate go run -modfile ../tools/go.mod github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config config.client.yml api.yml //go:generate go run -modfile ../tools/go.mod github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config config.server.yml api.yml diff --git a/gen.go b/gen.go index c64b67f..4e18154 100644 --- a/gen.go +++ b/gen.go @@ -1,4 +1,4 @@ //go:build generate // +build generate -package main \ No newline at end of file +package main diff --git a/helm/charts/knox/templates/deployment.yaml b/helm/charts/knox/templates/deployment.yaml index 83f4179..6e6032c 100644 --- a/helm/charts/knox/templates/deployment.yaml +++ b/helm/charts/knox/templates/deployment.yaml @@ -62,10 +62,10 @@ spec: env: {{- if .Values.database.uri }} - - name: knox_ACCOUNTS_DATABASE_URI + - name: KNOX_DATABASE_URI value: "{{ .Values.database.uri }}" {{- else if .Values.database.uriSecret }} - - name: knox_ACCOUNTS_DATABASE_URI + - name: KNOX_DATABASE_URI valueFrom: secretKeyRef: name: "{{ .Values.database.uriSecret }}" @@ -73,12 +73,12 @@ spec: {{- end }} {{- if .Values.database.prefix }} - - name: knox_ACCOUNTS_DATABASE_PREFIX + - name: KNOX_DATABASE_TABLE_PREFIX value: "{{ .Values.database.prefix }}" {{- end }} {{- if .Values.http.addr }} - - name: knox_ACCOUNTS_ADDR + - name: KNOX_ADDR value: "{{ .Values.http.addr }}" {{- end }} diff --git a/helm/charts/knox/templates/job.yaml b/helm/charts/knox/templates/job.yaml index 56c497d..52d0e78 100644 --- a/helm/charts/knox/templates/job.yaml +++ b/helm/charts/knox/templates/job.yaml @@ -36,11 +36,15 @@ spec: image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" args: ["migrate"] env: + {{- if .Values.database.prefix }} + - name: KNOX_DATABASE_TABLE_PREFIX + value: "{{ .Values.database.prefix }}" + {{- end }} {{- if .Values.database.uri }} - - name: knox_ACCOUNTS_DATABASE_URI + - name: KNOX_DATABASE_URI value: "{{ .Values.database.uri }}" {{- else if .Values.database.uriSecret }} - - name: knox_ACCOUNTS_DATABASE_URI + - name: KNOX_DATABASE_URI valueFrom: secretKeyRef: name: "{{ .Values.database.uriSecret }}" @@ -48,7 +52,7 @@ spec: {{- end }} {{- if .Values.migrate.timeout }} - - name: knox_TIMEOUT + - name: KNOX_TIMEOUT value: "{{ .Values.migrate.timeout }}" {{- end }} diff --git a/helm/charts/knox/values.yaml b/helm/charts/knox/values.yaml index 1a48191..739570c 100644 --- a/helm/charts/knox/values.yaml +++ b/helm/charts/knox/values.yaml @@ -1,4 +1,4 @@ -replicaCount: 3 +replicaCount: 1 image: repository: ghcr.io/zeiss/knox/knox diff --git a/pkg/apis/models.gen.go b/pkg/apis/models.gen.go index 80ac8bf..3b3d999 100644 --- a/pkg/apis/models.gen.go +++ b/pkg/apis/models.gen.go @@ -295,40 +295,42 @@ type UpdateUserJSONRequestBody = UserUpdate // Base64 encoded, gzipped, json marshaled Swagger object var swaggerSpec = []string{ - "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", - "vl+i3dXu3wAAAP//fA7X/r5jAAA=", + "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", } // GetSwagger returns the content of the embedded swagger specification file diff --git a/tools/tools.go b/tools/tools.go index 4b624f0..21a6c05 100644 --- a/tools/tools.go +++ b/tools/tools.go @@ -4,10 +4,10 @@ package tools import ( - _ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen" _ "github.com/golang/mock/mockgen/model" _ "github.com/golangci/golangci-lint/cmd/golangci-lint" _ "github.com/goreleaser/goreleaser" + _ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen" _ "gotest.tools/gotestsum" _ "k8s.io/code-generator" _ "knative.dev/pkg/codegen/cmd/injection-gen"