From bb8d558c7d4bb94dde7a001e93f39985538904da Mon Sep 17 00:00:00 2001
From: Joachim Hill-Grannec <joachim.hill@gmail.com>
Date: Fri, 19 Jan 2024 09:19:42 -0600
Subject: [PATCH] fix: update build and intial deploy for everything updated

---
 .github/workflows/publish.yaml       |  8 ++++----
 catalog-info.yaml                    |  2 +-
 gitops/overlays/dev/config-map.yaml  |  2 --
 gitops/overlays/prod/config-map.yaml |  2 --
 yarn.lock                            | 20 ++------------------
 5 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index cb43070..8793e14 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -2,7 +2,7 @@ name: Publish Docker image
 
 on:
   push:
-    branches: [ main, master ]
+    branches: [ main ]
     tags: [ 'v*' ]
     paths-ignore:
       - 'README.md'
@@ -25,9 +25,9 @@ jobs:
       - name: Set Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
       - name: yarn
-        run: yarn install --frozen-lockfile && yarn tsc && yarn build
+        run: yarn install --frozen-lockfile && yarn tsc && yarn build:all
         shell: bash
       - name: Log in to the Container registry
         uses: docker/login-action@v2
@@ -70,4 +70,4 @@ jobs:
           build-args: |
             BUILD_VERSION=${{ github.ref_name }}
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/catalog-info.yaml b/catalog-info.yaml
index 1799dd7..9493e46 100644
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -10,5 +10,5 @@ metadata:
     'backstage.io/kubernetes-id': pelostage
 spec:
   type: website
-  owner: leads
+  owner: goup:pelotech/leads
   lifecycle: production
diff --git a/gitops/overlays/dev/config-map.yaml b/gitops/overlays/dev/config-map.yaml
index d67792c..82c70ca 100644
--- a/gitops/overlays/dev/config-map.yaml
+++ b/gitops/overlays/dev/config-map.yaml
@@ -3,8 +3,6 @@ kind: ConfigMap
 metadata:
   name: backstage
 data:
-  NODE_ENV: "production"
-  CLUSTER_URL: "http://kubernetes.default.svc"
   ORG_NAME: "Pelotech-Dev"
   BASE_URL: "https://pelostage.non-prod.pelo.tech"
   GITHUB_ORG: "pelotech"
diff --git a/gitops/overlays/prod/config-map.yaml b/gitops/overlays/prod/config-map.yaml
index c6a1945..c7508dc 100644
--- a/gitops/overlays/prod/config-map.yaml
+++ b/gitops/overlays/prod/config-map.yaml
@@ -3,8 +3,6 @@ kind: ConfigMap
 metadata:
   name: backstage
 data:
-  NODE_ENV: "production"
-  CLUSTER_URL: "http://kubernetes.default.svc"
   ORG_NAME: "Pelotech"
   BASE_URL: "https://pelostage.pelo.tech"
   GITHUB_ORG: "pelotech"
diff --git a/yarn.lock b/yarn.lock
index 8c2c465..80fc996 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8728,20 +8728,13 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb"
   integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==
 
-"@types/react-dom@*":
+"@types/react-dom@*", "@types/react-dom@<18.0.0", "@types/react-dom@^18":
   version "18.2.18"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.18.tgz#16946e6cd43971256d874bc3d0a72074bb8571dd"
   integrity sha512-TJxDm6OfAX2KJWJdMEVTwWke5Sc/E/RlnPGvGfS0W7+6ocy2xhDVQVh/KvC2Uf7kACs+gDytdusDSdWfWkaNzw==
   dependencies:
     "@types/react" "*"
 
-"@types/react-dom@<18.0.0":
-  version "17.0.25"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.25.tgz#e0e5b3571e1069625b3a3da2b279379aa33a0cb5"
-  integrity sha512-urx7A7UxkZQmThYA4So0NelOVjx3V4rNFVJwp0WZlbIK5eM4rNJDiN3R/E9ix0MBh6kAEojk/9YL+Te6D9zHNA==
-  dependencies:
-    "@types/react" "^17"
-
 "@types/react-redux@^7.1.20":
   version "7.1.33"
   resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.33.tgz#53c5564f03f1ded90904e3c90f77e4bd4dc20b15"
@@ -8773,7 +8766,7 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*":
+"@types/react@*", "@types/react@^16.13.1 || ^17.0.0", "@types/react@^18":
   version "18.2.48"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.48.tgz#11df5664642d0bd879c1f58bc1d37205b064e8f1"
   integrity sha512-qboRCl6Ie70DQQG9hhNREz81jqC1cs9EVNcjQ1AU+jH6NFfSAhVVbrrY/+nSF+Bsk4AOwm9Qa61InvMCyV+H3w==
@@ -8782,15 +8775,6 @@
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
-"@types/react@^16.13.1 || ^17.0.0", "@types/react@^17":
-  version "17.0.75"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.75.tgz#cffbc76840a12fcadaf5a3cf14878bb06efcf73d"
-  integrity sha512-MSA+NzEzXnQKrqpO63CYqNstFjsESgvJAdAyyJ1n6ZQq/GLgf6nOfIKwk+Twuz0L1N6xPe+qz5xRCJrbhMaLsw==
-  dependencies:
-    "@types/prop-types" "*"
-    "@types/scheduler" "*"
-    csstype "^3.0.2"
-
 "@types/request@^2.47.1", "@types/request@^2.48.8":
   version "2.48.12"
   resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.12.tgz#0f590f615a10f87da18e9790ac94c29ec4c5ef30"