Skip to content

Commit 78c6701

Browse files
authored
chore: update helm chart
1 parent 00d6c20 commit 78c6701

File tree

7 files changed

+51
-45
lines changed

7 files changed

+51
-45
lines changed

api/gen.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//go:build generate
22
// +build generate
33

4-
package accounts
4+
package api
55

66
//go:generate go run -modfile ../tools/go.mod github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config config.client.yml api.yml
77
//go:generate go run -modfile ../tools/go.mod github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config config.server.yml api.yml

gen.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
//go:build generate
22
// +build generate
33

4-
package main
4+
package main

helm/charts/knox/templates/deployment.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,23 +62,23 @@ spec:
6262

6363
env:
6464
{{- if .Values.database.uri }}
65-
- name: knox_ACCOUNTS_DATABASE_URI
65+
- name: KNOX_DATABASE_URI
6666
value: "{{ .Values.database.uri }}"
6767
{{- else if .Values.database.uriSecret }}
68-
- name: knox_ACCOUNTS_DATABASE_URI
68+
- name: KNOX_DATABASE_URI
6969
valueFrom:
7070
secretKeyRef:
7171
name: "{{ .Values.database.uriSecret }}"
7272
key: "uri"
7373
{{- end }}
7474

7575
{{- if .Values.database.prefix }}
76-
- name: knox_ACCOUNTS_DATABASE_PREFIX
76+
- name: KNOX_DATABASE_TABLE_PREFIX
7777
value: "{{ .Values.database.prefix }}"
7878
{{- end }}
7979

8080
{{- if .Values.http.addr }}
81-
- name: knox_ACCOUNTS_ADDR
81+
- name: KNOX_ADDR
8282
value: "{{ .Values.http.addr }}"
8383
{{- end }}
8484

helm/charts/knox/templates/job.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,23 @@ spec:
3636
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
3737
args: ["migrate"]
3838
env:
39+
{{- if .Values.database.prefix }}
40+
- name: KNOX_DATABASE_TABLE_PREFIX
41+
value: "{{ .Values.database.prefix }}"
42+
{{- end }}
3943
{{- if .Values.database.uri }}
40-
- name: knox_ACCOUNTS_DATABASE_URI
44+
- name: KNOX_DATABASE_URI
4145
value: "{{ .Values.database.uri }}"
4246
{{- else if .Values.database.uriSecret }}
43-
- name: knox_ACCOUNTS_DATABASE_URI
47+
- name: KNOX_DATABASE_URI
4448
valueFrom:
4549
secretKeyRef:
4650
name: "{{ .Values.database.uriSecret }}"
4751
key: "uri"
4852
{{- end }}
4953

5054
{{- if .Values.migrate.timeout }}
51-
- name: knox_TIMEOUT
55+
- name: KNOX_TIMEOUT
5256
value: "{{ .Values.migrate.timeout }}"
5357
{{- end }}
5458

helm/charts/knox/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
replicaCount: 3
1+
replicaCount: 1
22

33
image:
44
repository: ghcr.io/zeiss/knox/knox

pkg/apis/models.gen.go

Lines changed: 36 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tools/tools.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
package tools
55

66
import (
7-
_ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen"
87
_ "github.com/golang/mock/mockgen/model"
98
_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
109
_ "github.com/goreleaser/goreleaser"
10+
_ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen"
1111
_ "gotest.tools/gotestsum"
1212
_ "k8s.io/code-generator"
1313
_ "knative.dev/pkg/codegen/cmd/injection-gen"

0 commit comments

Comments
 (0)