Skip to content

Commit 4b93dcd

Browse files
MargoTuleninovaMargoTuleninova
authored
Merge pull request #9 from containerum/develop
Develop
2 parents fea5f2c + ec565a3 commit 4b93dcd

File tree

105 files changed

+15828
-424
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+15828
-424
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@
1717
.idea
1818

1919
build
20+
21+
*.DS_Store

‎Dockerfile

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,28 @@ COPY --from=alpine /zoneinfo.zip /
2323
COPY --from=alpine /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
2424

2525
ENV GIN_MODE=debug \
26-
CH_USER_DB="postgres" \
27-
CH_USER_PG_LOGIN="usermanager" \
28-
CH_USER_PG_PASSWORD="ae9Oodai3aid" \
29-
CH_USER_PG_ADDR="postgres:5432" \
30-
CH_USER_PG_DBNAME="usermanager" \
31-
CH_USER_PG_NOSSL=true \
32-
CH_USER_MIGRATIONS_PATH="migrations" \
33-
CH_USER_MAIL="http" \
34-
CH_USER_MAIL_URL="http://ch-mail-templater:7070/" \
35-
CH_USER_RECAPTCHA="dummy" \
36-
CH_USER_RECAPTCHA_KEY="recaptcha_key" \
37-
CH_USER_OAUTH_CLIENTS="http" \
38-
CH_USER_AUTH_HTTP_ADDR="http://ch-auth:1111/" \
39-
CH_USER_PERMISSIONS="http" \
40-
CH_USER_PERMISSIONS_URL="http://permissions:4242" \
41-
CH_USER_TELEGRAM=false \
42-
CH_USER_TELEGRAM_BOT_ID="" \
43-
CH_USER_TELEGRAM_BOT_TOKEN="" \
44-
CH_USER_TELEGRAM_BOT_CHAT_ID="" \
45-
CH_USER_LISTEN_ADDR=":8111" \
46-
CH_USER_USER_MANAGER="impl"
26+
DB="postgres" \
27+
PG_LOGIN="usermanager" \
28+
PG_PASSWORD="ae9Oodai3aid" \
29+
PG_ADDR="postgres:5432" \
30+
PG_DBNAME="usermanager" \
31+
PG_NOSSL=true \
32+
MIGRATIONS_PATH="migrations" \
33+
MAIL="http" \
34+
MAIL_URL="http://ch-mail-templater:7070/" \
35+
RECAPTCHA="dummy" \
36+
RECAPTCHA_KEY="recaptcha_key" \
37+
OAUTH_CLIENTS="http" \
38+
AUTH_URL="http://ch-auth:1111/" \
39+
PERMISSIONS="http" \
40+
PERMISSIONS_URL="http://permissions:4242" \
41+
TELEGRAM=false \
42+
TELEGRAM_BOT_ID="" \
43+
TELEGRAM_BOT_TOKEN="" \
44+
TELEGRAM_BOT_CHAT_ID="" \
45+
PORT=":8111" \
46+
USER_MANAGER="impl" \
47+
EVENTS="http" \
48+
EVENTS_URL="http://events-api:1667"
4749

4850
ENTRYPOINT ["/user-manager"]

‎Gopkg.lock

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

‎Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,4 @@ required = ["git.containerum.net/ch/auth"]
7171

7272
[[constraint]]
7373
name = "github.com/containerum/kube-client"
74-
version = "^0.23.18"
74+
version = "^0.23.32"

‎charts/user-manager/templates/deployment.yaml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,49 +32,49 @@ spec:
3232
- name: {{ $key }}
3333
value: {{ $val | quote }}
3434
{{- end }}
35-
{{- if .Values.env.local.CH_USER_PG_ADDR }}
36-
- name: CH_USER_PG_ADDR
37-
value: "{{ .Values.env.local.CH_USER_PG_ADDR }}"
35+
{{- if .Values.env.local.PG_ADDR }}
36+
- name: PG_ADDR
37+
value: "{{ .Values.env.local.PG_ADDR }}"
3838
{{- else }}
39-
- name: CH_USER_PG_ADDR
39+
- name: PG_ADDR
4040
value: "{{ .Release.Name }}-postgresql:5432"
4141
{{- end }}
42-
{{- if .Values.env.local.CH_USER_PERMISSIONS_URL }}
43-
- name: CH_USER_PERMISSIONS_URL
44-
value: "{{ .Values.env.local.CH_USER_PERMISSIONS_URL }}"
42+
{{- if .Values.env.local.PERMISSIONS_URL }}
43+
- name: PERMISSIONS_URL
44+
value: "{{ .Values.env.local.PERMISSIONS_URL }}"
4545
{{- else }}
46-
- name: CH_USER_PERMISSIONS_URL
46+
- name: PERMISSIONS_URL
4747
value: "http://{{ .Release.Name }}-permissions:4242"
4848
{{- end }}
49-
{{- if .Values.env.local.CH_USER_AUTH_HTTP_ADDR }}
50-
- name: CH_USER_AUTH_HTTP_ADDR
51-
value: "{{ .Values.env.local.CH_USER_AUTH_HTTP_ADDR }}"
49+
{{- if .Values.env.local.AUTH_URL }}
50+
- name: AUTH_URL
51+
value: "{{ .Values.env.local.AUTH_URL }}"
5252
{{- else }}
53-
- name: CH_USER_AUTH_HTTP_ADDR
53+
- name: AUTH_URL
5454
value: "http://{{ .Release.Name }}-auth:1111"
5555
{{- end }}
56-
{{- if .Values.env.local.CH_USER_MAIL_URL }}
57-
- name: CH_USER_MAIL_URL
58-
value: "{{ .Values.env.local.CH_USER_MAIL_URL }}"
56+
{{- if .Values.env.local.MAIL_URL }}
57+
- name: MAIL_URL
58+
value: "{{ .Values.env.local.MAIL_URL }}"
5959
{{- else }}
60-
- name: CH_USER_MAIL_URL
60+
- name: MAIL_URL
6161
value: "http://{{ .Release.Name }}-mail:7070"
6262
{{- end }}
63-
{{- if .Values.env.local.CH_USER_PG_PASSWORD }}
64-
- name: CH_USER_PG_PASSWORD
63+
{{- if .Values.env.local.PG_PASSWORD }}
64+
- name: PG_PASSWORD
6565
valueFrom:
6666
secretKeyRef:
6767
name: {{ template "fullname" . }}
6868
key: pg-password
6969
{{- else if .Values.tags.platformdb }}
70-
- name: CH_USER_PG_PASSWORD
70+
- name: PG_PASSWORD
7171
valueFrom:
7272
secretKeyRef:
7373
name: {{ .Release.Name }}-postgresql
7474
key: postgres-password
7575
{{- end }}
76-
{{- if .Values.env.local.CH_USER_ADMIN_PASSWORD }}
77-
- name: CH_USER_ADMIN_PASSWORD
76+
{{- if .Values.env.local.ADMIN_PASSWORD }}
77+
- name: ADMIN_PASSWORD
7878
valueFrom:
7979
secretKeyRef:
8080
name: {{ template "fullname" . }}

‎charts/user-manager/templates/secret.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if or .Values.env.local.CH_USER_PG_PASSWORD .Values.env.local.CH_USER_ADMIN_PASSWORD }}
1+
{{- if or .Values.env.local.PG_PASSWORD .Values.env.local.ADMIN_PASSWORD }}
22
apiVersion: v1
33
kind: Secret
44
metadata:
@@ -10,10 +10,10 @@ metadata:
1010
heritage: {{ .Release.Service }}
1111
type: Opaque
1212
data:
13-
{{- if .Values.env.local.CH_USER_PG_PASSWORD }}
14-
pg-password: {{ .Values.env.local.CH_USER_PG_PASSWORD | b64enc }}
13+
{{- if .Values.env.local.PG_PASSWORD }}
14+
pg-password: {{ .Values.env.local.PG_PASSWORD | b64enc }}
1515
{{- end }}
16-
{{- if .Values.env.local.CH_USER_ADMIN_PASSWORD }}
17-
admin-password: {{ .Values.env.local.CH_USER_ADMIN_PASSWORD | b64enc }}
16+
{{- if .Values.env.local.ADMIN_PASSWORD }}
17+
admin-password: {{ .Values.env.local.ADMIN_PASSWORD | b64enc }}
1818
{{- end }}
1919
{{- end }}

‎charts/user-manager/values.yaml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,26 @@ service:
1818
env:
1919
global:
2020
GIN_MODE: debug
21-
CH_USER_DEBUG: true
22-
CH_USER_TEXTLOG: true
23-
CH_USER_LISTEN_ADDR: ":8111"
24-
CH_USER_PG_LOGIN: "usermanager"
25-
CH_USER_PG_DBNAME: "usermanager"
26-
CH_USER_PG_NOSSL: true
27-
CH_USER_MIGRATIONS_PATH: "migrations"
28-
CH_USER_MAIL: "http"
29-
CH_USER_RECAPTCHA: "dummy"
30-
CH_USER_RECAPTCHA_KEY: "recaptcha_key"
31-
CH_USER_OAUTH_CLIENTS: "http"
32-
CH_USER_PERMISSIONS: "http"
33-
CH_USER_USER_MANAGER: "impl"
21+
DEBUG: true
22+
TEXTLOG: true
23+
PORT: ":8111"
24+
PG_LOGIN: "usermanager"
25+
PG_DBNAME: "usermanager"
26+
PG_NOSSL: true
27+
MIGRATIONS_PATH: "migrations"
28+
MAIL: "http"
29+
RECAPTCHA: "dummy"
30+
RECAPTCHA_KEY: "recaptcha_key"
31+
OAUTH_CLIENTS: "http"
32+
PERMISSIONS: "http"
33+
USER_MANAGER: "impl"
3434
local:
35-
CH_USER_PG_PASSWORD:
36-
CH_USER_PG_ADDR: "postgres-master.postgres.svc:5432"
37-
CH_USER_PERMISSIONS_URL: "http://permissions:4242"
38-
CH_USER_AUTH_HTTP_ADDR: "http://auth:1111"
39-
CH_USER_MAIL_URL: "mail:7070"
40-
CH_USER_ADMIN_PASSWORD:
35+
PG_PASSWORD:
36+
PG_ADDR: "postgres-master.postgres.svc.cluster.local:5432"
37+
PERMISSIONS_URL: "http://permissions:4242"
38+
AUTH_URL: "http://auth:1111"
39+
MAIL_URL: "mail-templater:7070"
40+
ADMIN_PASSWORD:
4141

4242
postgresql:
4343
persistence:

0 commit comments

Comments
 (0)