Adjustments after review

Ed-Fi-Exchange-OSS · Jan 9, 2024 · fb79877 · fb79877
1 parent 0da597a
commit fb79877
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 14 deletions.
diff --git a/k8s/README.md b/k8s/README.md
@@ -37,7 +37,7 @@ To get the logs from Meadowlark, verify that the flag `LOG_TO_FILE` is set to
 true. If saving to the default location, get the logs by:
 
 1. Get the pod id `kubectl get pods`.
-2. Run kubectl exec -it $POD_ID -- cat /var/log/meadowlark.log
+2. Run `kubectl exec -it $POD_ID -- cat /var/log/meadowlark.log`
 
 ### Useful commands
 

diff --git a/k8s/app-configmap.yaml b/k8s/app-configmap.yaml
@@ -10,3 +10,5 @@ data:
     opensearch-user: admin
     opensearch-password: admin
     opensearch-endpoint: http://opensearch-service:9200
+    oauth-key: meadowlark_verify-only_key_1
+    oauth-secret: meadowlark_verify-only_secret_1
diff --git a/k8s/meadowlark-api-deployment.yaml b/k8s/meadowlark-api-deployment.yaml
@@ -17,21 +17,27 @@ spec:
         serviceName: meadowlark-api
     spec:
       containers:
-        - env:
+        - name: meadowlark-api
+          image: edfialliance/meadowlark-ed-fi-api
+          ports:
+            - containerPort: 3000
+              hostPort: 3000
+              protocol: TCP
+          env:
             - name: ALLOW_OVERPOSTING
               value: "false"
             - name: ALLOW_TYPE_COERCION
               value: "true"
             - name: ALLOW__EXT_PROPERTY
               value: "true"
             - name: AUTHORIZATION_STORE_PLUGIN
-              value: '@edfi/meadowlark-postgresql-backend'
+              value: "@edfi/meadowlark-postgresql-backend"
             - name: DOCUMENT_STORE_PLUGIN
-              value: '@edfi/meadowlark-postgresql-backend'
+              value: "@edfi/meadowlark-postgresql-backend"
             - name: LISTENER1_PLUGIN
-              value: '@edfi/meadowlark-opensearch-backend'
+              value: "@edfi/meadowlark-opensearch-backend"
             - name: QUERY_HANDLER_PLUGIN
-              value: '@edfi/meadowlark-opensearch-backend'
+              value: "@edfi/meadowlark-opensearch-backend"
             - name: BEGIN_ALLOWED_SCHOOL_YEAR
               value: "2022"
             - name: END_ALLOWED_SCHOOL_YEAR
@@ -73,9 +79,15 @@ spec:
                   name: app-configmap
                   key: opensearch-user
             - name: OWN_OAUTH_CLIENT_ID_FOR_CLIENT_AUTH
-              value: meadowlark_verify-only_key_1
+              valueFrom:
+                configMapKeyRef:
+                  name: app-configmap
+                  key: oauth-key
             - name: OWN_OAUTH_CLIENT_SECRET_FOR_CLIENT_AUTH
-              value: meadowlark_verify-only_secret_1
+              valueFrom:
+                configMapKeyRef:
+                  name: app-configmap
+                  key: oauth-secret
             - name: POSTGRES_USER
               valueFrom:
                 configMapKeyRef:
@@ -101,19 +113,13 @@ spec:
                 configMapKeyRef:
                   name: app-configmap
                   key: postgres-port
-          image: edfialliance/meadowlark-ed-fi-api
           livenessProbe:
             exec:
               command:
                 - curl -s http://localhost:3000/local >/dev/null || exit 1
             failureThreshold: 50
             periodSeconds: 30
             timeoutSeconds: 10
-          name: meadowlark-api
-          ports:
-            - containerPort: 3000
-              hostPort: 3000
-              protocol: TCP
           resources: {}
       hostname: meadowlark-api
       restartPolicy: Always