From c97cf8b569217c9a53e93176c179e7abc0572d61 Mon Sep 17 00:00:00 2001 From: Ian McGinnis <67600557+ian-noaa@users.noreply.github.com> Date: Mon, 4 Mar 2024 14:39:52 -0700 Subject: [PATCH 1/2] Update naming to match the new app name --- kubernetes/base/{cb-ceiling => cb-metar}/deployment.yaml | 0 kubernetes/base/{cb-ceiling => cb-metar}/kustomization.yaml | 0 kubernetes/base/{cb-ceiling => cb-metar}/service.yaml | 0 .../overlays/gsl-dev/{cb-ceiling => cb-metar}/deployment.yaml | 0 .../overlays/gsl-dev/{cb-ceiling => cb-metar}/kustomization.yaml | 0 .../overlays/gsl-prod/{cb-ceiling => cb-metar}/deployment.yaml | 0 .../overlays/gsl-prod/{cb-ceiling => cb-metar}/kustomization.yaml | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename kubernetes/base/{cb-ceiling => cb-metar}/deployment.yaml (100%) rename kubernetes/base/{cb-ceiling => cb-metar}/kustomization.yaml (100%) rename kubernetes/base/{cb-ceiling => cb-metar}/service.yaml (100%) rename kubernetes/overlays/gsl-dev/{cb-ceiling => cb-metar}/deployment.yaml (100%) rename kubernetes/overlays/gsl-dev/{cb-ceiling => cb-metar}/kustomization.yaml (100%) rename kubernetes/overlays/gsl-prod/{cb-ceiling => cb-metar}/deployment.yaml (100%) rename kubernetes/overlays/gsl-prod/{cb-ceiling => cb-metar}/kustomization.yaml (100%) diff --git a/kubernetes/base/cb-ceiling/deployment.yaml b/kubernetes/base/cb-metar/deployment.yaml similarity index 100% rename from kubernetes/base/cb-ceiling/deployment.yaml rename to kubernetes/base/cb-metar/deployment.yaml diff --git a/kubernetes/base/cb-ceiling/kustomization.yaml b/kubernetes/base/cb-metar/kustomization.yaml similarity index 100% rename from kubernetes/base/cb-ceiling/kustomization.yaml rename to kubernetes/base/cb-metar/kustomization.yaml diff --git a/kubernetes/base/cb-ceiling/service.yaml b/kubernetes/base/cb-metar/service.yaml similarity index 100% rename from kubernetes/base/cb-ceiling/service.yaml rename to kubernetes/base/cb-metar/service.yaml diff --git a/kubernetes/overlays/gsl-dev/cb-ceiling/deployment.yaml b/kubernetes/overlays/gsl-dev/cb-metar/deployment.yaml similarity index 100% rename from kubernetes/overlays/gsl-dev/cb-ceiling/deployment.yaml rename to kubernetes/overlays/gsl-dev/cb-metar/deployment.yaml diff --git a/kubernetes/overlays/gsl-dev/cb-ceiling/kustomization.yaml b/kubernetes/overlays/gsl-dev/cb-metar/kustomization.yaml similarity index 100% rename from kubernetes/overlays/gsl-dev/cb-ceiling/kustomization.yaml rename to kubernetes/overlays/gsl-dev/cb-metar/kustomization.yaml diff --git a/kubernetes/overlays/gsl-prod/cb-ceiling/deployment.yaml b/kubernetes/overlays/gsl-prod/cb-metar/deployment.yaml similarity index 100% rename from kubernetes/overlays/gsl-prod/cb-ceiling/deployment.yaml rename to kubernetes/overlays/gsl-prod/cb-metar/deployment.yaml diff --git a/kubernetes/overlays/gsl-prod/cb-ceiling/kustomization.yaml b/kubernetes/overlays/gsl-prod/cb-metar/kustomization.yaml similarity index 100% rename from kubernetes/overlays/gsl-prod/cb-ceiling/kustomization.yaml rename to kubernetes/overlays/gsl-prod/cb-metar/kustomization.yaml From 2cf61706aa2e5a1c5f72742846c6f044d631ff37 Mon Sep 17 00:00:00 2001 From: Ian McGinnis <67600557+ian-noaa@users.noreply.github.com> Date: Mon, 4 Mar 2024 14:40:51 -0700 Subject: [PATCH 2/2] Deploy a second cb-metar instance --- .../base/cb-metar-capella/deployment.yaml | 27 ++++++++++++++++ .../base/cb-metar-capella/kustomization.yaml | 3 ++ kubernetes/base/cb-metar-capella/service.yaml | 15 +++++++++ .../gsl-dev/cb-metar-capella/deployment.yaml | 31 +++++++++++++++++++ .../cb-metar-capella/kustomization.yaml | 19 ++++++++++++ kubernetes/overlays/gsl-dev/ingress-apps.yaml | 7 +++++ .../overlays/gsl-dev/kustomization.yaml | 1 + 7 files changed, 103 insertions(+) create mode 100644 kubernetes/base/cb-metar-capella/deployment.yaml create mode 100644 kubernetes/base/cb-metar-capella/kustomization.yaml create mode 100644 kubernetes/base/cb-metar-capella/service.yaml create mode 100644 kubernetes/overlays/gsl-dev/cb-metar-capella/deployment.yaml create mode 100644 kubernetes/overlays/gsl-dev/cb-metar-capella/kustomization.yaml diff --git a/kubernetes/base/cb-metar-capella/deployment.yaml b/kubernetes/base/cb-metar-capella/deployment.yaml new file mode 100644 index 0000000000..12015215aa --- /dev/null +++ b/kubernetes/base/cb-metar-capella/deployment.yaml @@ -0,0 +1,27 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cb-metar-capella + labels: + app.kubernetes.io/name: cb-metar-capella + app.kubernetes.io/part-of: mats + app.kubernetes.io/component: frontend + app: cb-metar-capella +spec: + replicas: 1 + selector: + matchLabels: + app: cb-metar-capella + template: + metadata: + labels: + app: cb-metar-capella + spec: + containers: + - name: cb-metar-capella + image: ghcr.io/noaa-gsl/mats/development/cb-metar:development + ports: + - containerPort: 9000 + securityContext: + allowPrivilegeEscalation: false + diff --git a/kubernetes/base/cb-metar-capella/kustomization.yaml b/kubernetes/base/cb-metar-capella/kustomization.yaml new file mode 100644 index 0000000000..6d1374a18e --- /dev/null +++ b/kubernetes/base/cb-metar-capella/kustomization.yaml @@ -0,0 +1,3 @@ +resources: + - deployment.yaml + - service.yaml diff --git a/kubernetes/base/cb-metar-capella/service.yaml b/kubernetes/base/cb-metar-capella/service.yaml new file mode 100644 index 0000000000..2d1230b29f --- /dev/null +++ b/kubernetes/base/cb-metar-capella/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: cb-metar-capella + labels: + app: cb-metar-capella +spec: + selector: + app: cb-metar-capella + ports: + - port: 80 + targetPort: 9000 + protocol: TCP + name: http + type: ClusterIP diff --git a/kubernetes/overlays/gsl-dev/cb-metar-capella/deployment.yaml b/kubernetes/overlays/gsl-dev/cb-metar-capella/deployment.yaml new file mode 100644 index 0000000000..786fefad3e --- /dev/null +++ b/kubernetes/overlays/gsl-dev/cb-metar-capella/deployment.yaml @@ -0,0 +1,31 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cb-metar-capella +spec: + template: + spec: + containers: + - name: cb-metar-capella + resources: + requests: + memory: "1Gi" + cpu: "0.25" + limits: + memory: "8Gi" + cpu: "4" + envFrom: + - secretRef: + name: cb-metar-capella-secret + volumeMounts: + - name: cb-metar-capella-settings-file + mountPath: /usr/app/settings/cb-metar/settings.json + subPath: settings.json + readOnly: true + imagePullPolicy: Always # Since we track a long-lived tag + imagePullSecrets: + - name: mats-ghcr + volumes: + - name: cb-metar-capella-settings-file + configMap: + name: cb-metar-capella-config diff --git a/kubernetes/overlays/gsl-dev/cb-metar-capella/kustomization.yaml b/kubernetes/overlays/gsl-dev/cb-metar-capella/kustomization.yaml new file mode 100644 index 0000000000..971c7dec03 --- /dev/null +++ b/kubernetes/overlays/gsl-dev/cb-metar-capella/kustomization.yaml @@ -0,0 +1,19 @@ +resources: + - ../../../base/cb-metar-capella + +patchesStrategicMerge: + - deployment.yaml + +images: + - name: ghcr.io/noaa-gsl/mats/development/cb-metar + newTag: development + +configMapGenerator: + - name: cb-metar-capella-config + files: + - settings.json # Should mirror the appropriate settings.json file in mats-settings + +secretGenerator: + - name: cb-metar-capella-secret + envs: + - .env # Should contain mongo_url, root_url, and delay diff --git a/kubernetes/overlays/gsl-dev/ingress-apps.yaml b/kubernetes/overlays/gsl-dev/ingress-apps.yaml index e1209c1589..0e57479411 100644 --- a/kubernetes/overlays/gsl-dev/ingress-apps.yaml +++ b/kubernetes/overlays/gsl-dev/ingress-apps.yaml @@ -25,6 +25,13 @@ spec: name: cb-metar port: number: 80 + - path: /mats-dev/cb-metar-capella + pathType: Prefix + backend: + service: + name: cb-metar-capella + port: + number: 80 - path: /mats-dev/ceil-vis pathType: Prefix backend: diff --git a/kubernetes/overlays/gsl-dev/kustomization.yaml b/kubernetes/overlays/gsl-dev/kustomization.yaml index 4c99c2a6c0..f7edb1950f 100644 --- a/kubernetes/overlays/gsl-dev/kustomization.yaml +++ b/kubernetes/overlays/gsl-dev/kustomization.yaml @@ -1,5 +1,6 @@ resources: - cb-metar + - cb-metar-capella - ceil-vis - ceil-vis15 - ensemble