Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

trivial. add params to tks-admin-console #149

Merged
merged 4 commits into from
Nov 29, 2022
Merged

trivial. add params to tks-admin-console #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
adca3d7
trivial. add params to tks-admin-console
ktkfree Nov 18, 2022
befab48
Merge branch 'main' of https://github.com/openinfradev/helm-charts in…
ktkfree Nov 25, 2022
906c599
trivial. add git account to server param
ktkfree Nov 25, 2022
00572ce
Merge branch 'main' into combine_tks_apis
ktkfree Nov 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion tks-apis/templates/tks-admin-console/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,18 @@ spec:
"-info-port", "{{ .Values.tksadminconsole.args.infoPort }}",
"-contract-address", "{{ .Values.tksadminconsole.args.contractAddress }}",
"-contract-port", "{{ .Values.tksadminconsole.args.contractPort }}",
"-lcm-address", "{{ .Values.tksadminconsole.args.lcmAddress }}",
"-lcm-port", "{{ .Values.tksadminconsole.args.lcmPort }}",
"-argo-address", "{{ .Values.tksadminconsole.args.argoAddress }}",
"-argo-port", "{{ .Values.tksadminconsole.args.argoPort }}",
"-web-root", "{{ .Values.tksadminconsole.args.webRoot }}",
"-jwt-secret", "{{ .Values.tksadminconsole.args.jwtSecret }}",
"-kubeconfig-path", "{{ .Values.tksadminconsole.args.kubeconfigPath }}",
"-dbhost", "{{ .Values.db.dbUrl }}",
"-dbport", "{{ .Values.db.dbPort }}",
"-dbuser", "{{ .Values.db.dbUser }}",
"-dbpassword", "{{ .Values.db.dbPassword }}"
"-dbpassword", "{{ .Values.db.dbPassword }}",
"-git-account", "{{ .Values.gitAccount }}"
]
resources:
{{- toYaml .Values.tksadminconsole.resources | nindent 12 }}
Expand Down
5 changes: 2 additions & 3 deletions tks-apis/templates/tks-contract/pre-install-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ spec:
template:
metadata:
name: {{ include "tks-contract.fullname" . }}
labels:
sidecar.istio.io/inject: "false"
spec:
restartPolicy: Never
containers:
Expand Down Expand Up @@ -67,9 +69,6 @@ spec:
);
CREATE UNIQUE INDEX idx_contractor_name ON contracts(contractor_name);
ALTER TABLE contracts CLUSTER ON idx_contractor_name;
INSERT INTO contracts(
contractor_name, id, available_services, updated_at, created_at)
VALUES ('tester', 'Pedcaa975', ARRAY['lma'], '2021-05-01'::timestamp, '2021-05-01'::timestamp);

CREATE TABLE resource_quota
(
Expand Down
2 changes: 2 additions & 0 deletions tks-apis/templates/tks-info/pre-install-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ spec:
template:
metadata:
name: {{ include "tks-info.fullname" . }}
labels:
sidecar.istio.io/inject: "false"
spec:
restartPolicy: Never
containers:
Expand Down
1 change: 1 addition & 0 deletions tks-apis/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ tksadminconsole:
argoPort: 2746
webRoot: ../../web
jwtSecret: tks-admin-console-secret
kubeconfigPath: ""

ingress:
enabled: false
Expand Down