From adca3d7c4a3ddb0ece3d218cc8cee2305555b2ea Mon Sep 17 00:00:00 2001 From: Taekyu Date: Fri, 18 Nov 2022 13:29:30 +0900 Subject: [PATCH 1/2] trivial. add params to tks-admin-console --- tks-apis/templates/tks-admin-console/deployment.yaml | 3 +++ tks-apis/templates/tks-contract/pre-install-job.yaml | 5 ++--- tks-apis/templates/tks-info/pre-install-job.yaml | 2 ++ tks-apis/values.yaml | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tks-apis/templates/tks-admin-console/deployment.yaml b/tks-apis/templates/tks-admin-console/deployment.yaml index d1c8aa62..960a167b 100644 --- a/tks-apis/templates/tks-admin-console/deployment.yaml +++ b/tks-apis/templates/tks-admin-console/deployment.yaml @@ -46,10 +46,13 @@ 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 }}", diff --git a/tks-apis/templates/tks-contract/pre-install-job.yaml b/tks-apis/templates/tks-contract/pre-install-job.yaml index 19d24223..7cf753fa 100644 --- a/tks-apis/templates/tks-contract/pre-install-job.yaml +++ b/tks-apis/templates/tks-contract/pre-install-job.yaml @@ -13,6 +13,8 @@ spec: template: metadata: name: {{ include "tks-contract.fullname" . }} + labels: + sidecar.istio.io/inject: "false" spec: restartPolicy: Never containers: @@ -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 ( diff --git a/tks-apis/templates/tks-info/pre-install-job.yaml b/tks-apis/templates/tks-info/pre-install-job.yaml index 0798fff0..221676b6 100644 --- a/tks-apis/templates/tks-info/pre-install-job.yaml +++ b/tks-apis/templates/tks-info/pre-install-job.yaml @@ -13,6 +13,8 @@ spec: template: metadata: name: {{ include "tks-info.fullname" . }} + labels: + sidecar.istio.io/inject: "false" spec: restartPolicy: Never containers: diff --git a/tks-apis/values.yaml b/tks-apis/values.yaml index e95e7d1f..b1283aa0 100644 --- a/tks-apis/values.yaml +++ b/tks-apis/values.yaml @@ -209,6 +209,7 @@ tksadminconsole: argoPort: 2746 webRoot: ../../web jwtSecret: tks-admin-console-secret + kubeconfigPath: "" ingress: enabled: false From 906c5997cca98127ea7a2fad2e04e458c6daaf87 Mon Sep 17 00:00:00 2001 From: Taekyu Date: Fri, 25 Nov 2022 11:46:05 +0900 Subject: [PATCH 2/2] trivial. add git account to server param --- tks-apis/templates/tks-admin-console/deployment.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tks-apis/templates/tks-admin-console/deployment.yaml b/tks-apis/templates/tks-admin-console/deployment.yaml index 960a167b..83e915cb 100644 --- a/tks-apis/templates/tks-admin-console/deployment.yaml +++ b/tks-apis/templates/tks-admin-console/deployment.yaml @@ -56,7 +56,8 @@ spec: "-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 }}