🐐 Fix Backstage (#948)

* 🐐 Fix Backstage * 🐐 Fix Backstage
devxp-tech · Dec 27, 2023 · c10ea41 · c10ea41
1 parent 6dac3f3
commit c10ea41
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 22 deletions.
diff --git a/app/app-config.production.yaml b/app/app-config.production.yaml
@@ -24,18 +24,6 @@ backend:
     #credentials: true
   # config options: https://node-postgres.com/api/client
 
-  # database:
-  #   client: pg
-  #   connection:
-  #     database: ${POSTGRES_DATABASE}
-  #     host: ${POSTGRES_HOST}
-  #     port: ${POSTGRES_PORT}
-  #     user: ${POSTGRES_USER}
-  #     password: ${POSTGRES_PASSWORD}
-  #   ensureExists: true
-  #   pluginDivisionMode: schema
-
-
   cache:
     store: memory
   # workingDirectory: /tmp # Use this to configure a working directory for the scaffolder, defaults to the OS temp-dir
@@ -54,9 +42,10 @@ kubernetes:
         - url: ${K8S_URL}
           name: lgseksd1
           authProvider: serviceAccount
-          skipTLSVerify: true
-          # skipMetricsLookup: true
-          serviceAccountToken: ${K8S_TOKEN}
+          skipTLSVerify: false
+          skipMetricsLookup: true
+          serviceAccountToken: ${SA_TOKEN}
+          caData: ${CA_DATA}
           customResources:
             - group: "argoproj.io"
               apiVersion: "v1alpha1"
@@ -107,7 +96,7 @@ proxy:
 
   "/prometheus/api":
     # url to the api and path of your hosted prometheus instance
-    target: http://prometheus-prometheus.monitoring.svc/api/v1/
+    target: http://prometheus-prometheus.monitoring.svc:9090/api/v1/
 
 auth:
   environment: production

diff --git a/app/app-config.yaml b/app/app-config.yaml
@@ -114,7 +114,8 @@ proxy:
 
   "/prometheus/api":
     # url to the api and path of your hosted prometheus instance
-    target: https://prometheus.devxp-tech.io//api/v1/
+    target: https://prometheus.devxp-tech.io/api/v1/
+
 
   # '/snyk':
   #   target: https://snyk.io/api/v1

diff --git a/app/packages/app/package.json b/app/packages/app/package.json
@@ -20,6 +20,7 @@
     "@backstage/core-app-api": "^1.11.2",
     "@backstage/core-components": "^0.13.9",
     "@backstage/core-plugin-api": "^1.8.1",
+    "@backstage/integration-aws-node": "^0.1.8",
     "@backstage/integration-react": "^1.1.22",
     "@backstage/plugin-api-docs": "^0.10.2",
     "@backstage/plugin-catalog": "^1.16.0",
@@ -28,6 +29,7 @@
     "@backstage/plugin-catalog-import": "^0.10.4",
     "@backstage/plugin-catalog-react": "^1.9.2",
     "@backstage/plugin-github-actions": "^0.6.9",
+    "@backstage/plugin-home": "^0.6.0",
     "@backstage/plugin-kubernetes": "^0.11.3",
     "@backstage/plugin-org": "^0.6.18",
     "@backstage/plugin-permission-react": "^0.4.18",

diff --git a/app/yarn.lock b/app/yarn.lock
@@ -3134,7 +3134,7 @@
     luxon "^3.0.0"
     react-use "^17.2.4"
 
-"@backstage/plugin-home-react@^0.1.5":
+"@backstage/plugin-home-react@^0.1.5", "@backstage/plugin-home-react@^0.1.6":
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/@backstage/plugin-home-react/-/plugin-home-react-0.1.6.tgz#a74a93e2a12bccefa86dd452ad9547681db8f8e6"
   integrity sha512-hZEb7ScLYaeonprtHkN6afz3AszdDcXvIohM3nH/jy+T8ZMdv6gaJ13SGEV5Rim4GikcVrM1IOCz6tuAvBP3fg==
@@ -3146,6 +3146,38 @@
     "@rjsf/utils" "5.15.0"
     "@types/react" "^16.13.1 || ^17.0.0"
 
+"@backstage/plugin-home@^0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@backstage/plugin-home/-/plugin-home-0.6.0.tgz#bdb9240c1dc65fd34b307c51d78cd0ad23d7a055"
+  integrity sha512-nggd+PQx1eVaEcx896jkJLTO/jA8niM8vOb/PBeWtVc+kBEZFjilyqpILH5Sx3rZUtiLf+siwz6JtSVFNzAKEQ==
+  dependencies:
+    "@backstage/catalog-client" "^1.5.0"
+    "@backstage/catalog-model" "^1.4.3"
+    "@backstage/config" "^1.1.1"
+    "@backstage/core-app-api" "^1.11.2"
+    "@backstage/core-compat-api" "^0.1.0"
+    "@backstage/core-components" "^0.13.9"
+    "@backstage/core-plugin-api" "^1.8.1"
+    "@backstage/frontend-plugin-api" "^0.4.0"
+    "@backstage/plugin-catalog-react" "^1.9.2"
+    "@backstage/plugin-home-react" "^0.1.6"
+    "@backstage/theme" "^0.5.0"
+    "@backstage/types" "^1.1.1"
+    "@material-ui/core" "^4.12.2"
+    "@material-ui/icons" "^4.9.1"
+    "@material-ui/lab" "4.0.0-alpha.61"
+    "@rjsf/core" "5.15.0"
+    "@rjsf/material-ui" "5.15.0"
+    "@rjsf/utils" "5.15.0"
+    "@rjsf/validator-ajv8" "5.15.0"
+    "@types/react" "^16.13.1 || ^17.0.0"
+    lodash "^4.17.21"
+    luxon "^3.4.3"
+    react-grid-layout "1.3.4"
+    react-resizable "^3.0.4"
+    react-use "^17.2.4"
+    zod "^3.22.4"
+
 "@backstage/plugin-kubernetes-backend@^0.14.0":
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/@backstage/plugin-kubernetes-backend/-/plugin-kubernetes-backend-0.14.0.tgz#8508085859ca2248578f4e03d9031a22de50c845"
@@ -8984,7 +9016,7 @@
   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@<18.0.0", "@types/react-dom@^17":
+"@types/react-dom@*", "@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==
@@ -9846,6 +9878,7 @@ anymatch@^3.0.3, anymatch@~3.1.2:
     "@backstage/core-app-api" "^1.11.2"
     "@backstage/core-components" "^0.13.9"
     "@backstage/core-plugin-api" "^1.8.1"
+    "@backstage/integration-aws-node" "^0.1.8"
     "@backstage/integration-react" "^1.1.22"
     "@backstage/plugin-api-docs" "^0.10.2"
     "@backstage/plugin-catalog" "^1.16.0"
@@ -11155,7 +11188,7 @@ clone@^1.0.2:
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
 
-clsx@^1.0.2, clsx@^1.0.4, clsx@^1.2.1:
+clsx@^1.0.2, clsx@^1.0.4, clsx@^1.1.1, clsx@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.2.1.tgz#0ddc4a20a549b59c93a4116bb26f5294ca17dc12"
   integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==
@@ -17216,6 +17249,11 @@ lodash.isboolean@^3.0.3:
   resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
   integrity sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==
 
+lodash.isequal@^4.0.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
+
 lodash.isinteger@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
@@ -17382,7 +17420,7 @@ lunr@^2.3.9:
   resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.9.tgz#18b123142832337dd6e964df1a5a7707b25d35e1"
   integrity sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==
 
-luxon@^3.0.0, luxon@^3.0.1, luxon@^3.3.0:
+luxon@^3.0.0, luxon@^3.0.1, luxon@^3.3.0, luxon@^3.4.3:
   version "3.4.4"
   resolved "https://registry.yarnpkg.com/luxon/-/luxon-3.4.4.tgz#cf20dc27dc532ba41a169c43fdcc0063601577af"
   integrity sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==
@@ -20320,7 +20358,7 @@ promzard@^1.0.0:
   dependencies:
     read "^2.0.0"
 
-prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.5.7, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
+prop-types@15.x, prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.5.7, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1:
   version "15.8.1"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
   integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
@@ -20695,6 +20733,14 @@ react-double-scrollbar@0.0.15:
   resolved "https://registry.yarnpkg.com/react-double-scrollbar/-/react-double-scrollbar-0.0.15.tgz#e915ab8cb3b959877075f49436debfdb04288fe4"
   integrity sha512-dLz3/WBIpgFnzFY0Kb4aIYBMT2BWomHuW2DH6/9jXfS6/zxRRBUFQ04My4HIB7Ma7QoRBpcy8NtkPeFgcGBpgg==
 
+react-draggable@^4.0.0, react-draggable@^4.0.3:
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.6.tgz#63343ee945770881ca1256a5b6fa5c9f5983fe1e"
+  integrity sha512-LtY5Xw1zTPqHkVmtM3X8MUOxNDOUhv/khTgBgrUvwaS064bwVvxT+q5El0uUFNx5IEPKXuRejr7UqLwBIg5pdw==
+  dependencies:
+    clsx "^1.1.1"
+    prop-types "^15.8.1"
+
 react-error-overlay@^6.0.11:
   version "6.0.11"
   resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz#92835de5841c5cf08ba00ddd2d677b6d17ff9adb"
@@ -20705,6 +20751,17 @@ react-fast-compare@^3.1.1:
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.2.tgz#929a97a532304ce9fee4bcae44234f1ce2c21d49"
   integrity sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==
 
+react-grid-layout@1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/react-grid-layout/-/react-grid-layout-1.3.4.tgz#4fa819be24a1ba9268aa11b82d63afc4762a32ff"
+  integrity sha512-sB3rNhorW77HUdOjB4JkelZTdJGQKuXLl3gNg+BI8gJkTScspL1myfZzW/EM0dLEn+1eH+xW+wNqk0oIM9o7cw==
+  dependencies:
+    clsx "^1.1.1"
+    lodash.isequal "^4.0.0"
+    prop-types "^15.8.1"
+    react-draggable "^4.0.0"
+    react-resizable "^3.0.4"
+
 react-helmet@6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/react-helmet/-/react-helmet-6.1.0.tgz#a750d5165cb13cf213e44747502652e794468726"
@@ -20838,6 +20895,14 @@ react-remove-scroll@2.5.5:
     use-callback-ref "^1.3.0"
     use-sidecar "^1.1.2"
 
+react-resizable@^3.0.4:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/react-resizable/-/react-resizable-3.0.5.tgz#362721f2efbd094976f1780ae13f1ad7739786c1"
+  integrity sha512-vKpeHhI5OZvYn82kXOs1bC8aOXktGU5AmKAgaZS4F5JPburCtbmDPqE7Pzp+1kN4+Wb81LlF33VpGwWwtXem+w==
+  dependencies:
+    prop-types "15.x"
+    react-draggable "^4.0.3"
+
 react-resize-detector@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-2.3.0.tgz#57bad1ae26a28a62a2ddb678ba6ffdf8fa2b599c"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -16,6 +16,7 @@ services:
       - 3000:3000
       - 7007:7007
     environment:
+      - ARGOCD_AUTH_TOKEN=$ARGOCD_AUTH_TOKEN
       - AUTH_GITHUB_CLIENT_ID=$AUTH_GITHUB_CLIENT_ID
       - AUTH_GITHUB_CLIENT_SECRET=$AUTH_GITHUB_CLIENT_SECRET
       - ARGOCD_AUTH_TOKEN=$ARGOCD_AUTH_TOKEN