Update scoretrak server (#19)

* update scoretrak+server helm chart * update scoretrak+server helm chart * upgrade versions * upgrade versions * upgrade versions * upgrade versions * upgrade versions * upgrade versions * upgrade versions * upgrade versions * upgrade versions * upgrade versions * update chart for testing * change bank condition and fqdn * change bank sub charts conditions * provide container version tag value * change payment user cmd * use newer image * update versions * fix kubernetes-sigs/kind#2323 (comment) for wsl2. * update versions Co-authored-by: Ibrahim Diallo <[email protected]>
ScoreTrak · Dec 31, 2021 · 6013ab5 · 6013ab5
1 parent 5ddd3a7
commit 6013ab5
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -1,9 +1,9 @@
 KIND = $(shell pwd)/bin/kind
 kind: 
-	$(call go-get-tool,$(KIND),sigs.k8s.io/[email protected].0)
+	$(call go-get-tool,$(KIND),sigs.k8s.io/[email protected].1)
 
 start-dev: kind
-	kind create cluster --config ./ha-cluster.yaml
+	kind create cluster --config ./ha-cluster.yaml --image kindest/node:v1.23.0
 
 apply-scoretrak:
 	helm dep update ./charts/scoretrak

diff --git a/charts/scoretrak/.helmignore b/charts/scoretrak/.helmignore
@@ -16,6 +16,7 @@
 *.tmp
 *.orig
 *~
+*.txt
 # Various IDEs
 .project
 .idea/

diff --git a/charts/scoretrak/Chart.lock b/charts/scoretrak/Chart.lock
@@ -4,7 +4,7 @@ dependencies:
   version: 0.2.16
 - name: server
   repository: file://../server
-  version: 0.2.24
+  version: 0.3.0
 - name: client
   repository: file://../client
   version: 0.2.10
@@ -23,5 +23,5 @@ dependencies:
 - name: nsq
   repository: https://beeinventor.github.io/charts
   version: 1.2.0
-digest: sha256:d48778ef527479676a99cfedb4748ddbbf1281211476dd8910e3100956043ba4
-generated: "2021-10-16T13:07:44.887777461-04:00"
+digest: sha256:c57df1cb629169024c4bc254b547c37a7068f8f51c6ff9956cd7f4c686985304
+generated: "2021-12-31T11:55:17.215262-05:00"
diff --git a/charts/scoretrak/Chart.yaml b/charts/scoretrak/Chart.yaml
@@ -22,20 +22,23 @@ dependencies:
     version: "0.2.16"
     repository: "file://../envoy"
   - name: server
-    version: "0.2.24"
+    version: "0.3.0"
     repository: "file://../server"
   - name: client
     version: "0.2.10"
     repository: "file://../client"
   - name: payments
     version: "0.1.8"
     repository: "file://../payments"
+    condition: bank.enabled
   - name: commercebackend
     version: "0.1.7"
     repository: "file://../commercebackend"
+    condition: bank.enabled
   - name: commerceui
     version: "0.1.1"
     repository: "file://../commerceui"
+    condition: bank.enabled
   - name: cockroachdb
     version: "6.2.4"
     repository: "https://charts.cockroachdb.com/"

diff --git a/charts/scoretrak/templates/configmap.yaml b/charts/scoretrak/templates/configmap.yaml
@@ -104,8 +104,9 @@ spec:
         - name: create-payments-user
           image: "{{ .Values.server.image.repository }}:{{ .Values.server.image.tag }}" 
           command:
-            - ./cli
-            - create-super-user
+            - ./scoretrak
+          args:
+            - createSuperUser
             - --admin-name
             - {{ .Values.server.config.admin.username }}
             - --admin-password
@@ -140,7 +141,7 @@ data:
   config.yaml: |
     bankusername: {{ .Values.commercebackend.config.admin.username }}
     scoretrakusername: {{ .Values.payments.config.scoretrak.username }}
-    bankbaseurl: http://{{ include "call-nested" ( list . "commercebackend" "commercebackend.fullname" ) }}:{{ .Values.commercebackend.service.port }}
+    bankbaseurl: "http://{{ include "call-nested" ( list . "commercebackend" "commercebackend.fullname" ) }}:{{ .Values.commercebackend.service.port }}"
     scoretrakaddress: {{ include "call-nested" ( list . "server" "server.fullname" ) }}:{{ .Values.server.service.port }}
     {{ if .Release.IsInstall }}
     scoretrakpassword: {{ $paymentAdminPassword }}

diff --git a/charts/scoretrak/templates/envoy-configmap.yaml b/charts/scoretrak/templates/envoy-configmap.yaml
@@ -48,7 +48,7 @@ data:
                   cors:
                     allow_origin_string_match:
                       - prefix: "*"
-                    allow_methods: GET, PUT, DELETE, POST, OPTIONS
+                    allow_methods: GET, HEAD, PUT, DELETE, POST, OPTIONS
                     allow_headers: keep-alive,user-agent,cache-control,content-type,content-transfer-encoding,custom-header-1,x-accept-content-transfer-encoding,x-accept-response-streaming,x-user-agent,x-grpc-web,grpc-timeout,authorization
                     max_age: "1728000"
                     expose_headers: custom-header-1,grpc-status,grpc-message

diff --git a/charts/scoretrak/values.yaml b/charts/scoretrak/values.yaml
@@ -36,7 +36,7 @@ server:
 
 bank:
   enabled: true
-  FQDN: bank.example.com
+  FQDN: "bank.example.com"
 
 # COMMERCE BACKEND SUB SUB HELM CHART VALUES
 commercebackend:

diff --git a/charts/server/Chart.yaml b/charts/server/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: server
 description: A Helm chart for ScoreTrak's server, a competition scoring engine written in go.
 type: application
-version: 0.2.24
-appVersion: "v0.2.13"
+version: 0.3.0
+appVersion: "v0.3.0"
diff --git a/charts/server/templates/deployment.yaml b/charts/server/templates/deployment.yaml
@@ -30,9 +30,11 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command:
-          - ./master
-          - -config
-          - /scoretrak/config.yaml
+            - ./scoretrak
+          args:
+            - master
+            - --config
+            - /scoretrak/config.yaml
           ports:
             - name: grpc
               containerPort: {{ .Values.service.port }}

diff --git a/charts/server/values.yaml b/charts/server/values.yaml
@@ -11,7 +11,7 @@ image:
   # -- Container image name
   pullPolicy: IfNotPresent
   # -- Container image tag
-  tag: "v0.2.13" #DO NOT REMOVE, THIS IS ACCESSED BY PARENT CHART
+  tag: "v0.3.0" #DO NOT REMOVE, THIS IS ACCESSED BY PARENT CHART
 
 # -- Secrets to pull container image
 imagePullSecrets: []

diff --git a/hack/client-secure.yaml b/hack/client-secure.yaml
@@ -1,9 +1,9 @@
-#kubectl exec -it cockroachdb-client-secure -- ./cockroach sql --certs-dir=./test --host=lockdown-cockroachdb-public
+#kubectl exec -it cockroachdb-client-secure -- ./cockroach sql --certs-dir=./test --host=release-cockroachdb-public
 
 apiVersion: v1
 kind: Pod
 metadata:
-  name: cockroachdb-client-secure
+  name: release-cockroachdb-client-secure
   labels:
     app: cockroachdb-client
 spec:
@@ -22,4 +22,4 @@ spec:
   volumes:
   - name: client-certs
     secret:
-      secretName: cockroachdb-client-secret
+      secretName: release-cockroachdb-client-secret
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,7 @@ @@
     *.tmp
     *.orig
     *~
+    *.txt
     # Various IDEs
     .project
     .idea/
@@ Expand Down @@