From 592677f029d82f9cefb18dfd04410a354ad9e1ec Mon Sep 17 00:00:00 2001 From: Matthew Clarke Date: Tue, 13 Feb 2024 15:16:03 -0500 Subject: [PATCH 1/2] feat: add k8s heroku config Signed-off-by: Matthew Clarke --- app-config.heroku.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app-config.heroku.yaml b/app-config.heroku.yaml index afa92faab..17958e00f 100644 --- a/app-config.heroku.yaml +++ b/app-config.heroku.yaml @@ -31,3 +31,15 @@ techdocs: credentials: ${TECHDOCS_GCS_CREDENTIALS} projectId: ${TECHDOCS_GCS_PROJECT_ID} bucketName: ${TECHDOCS_GCS_BUCKET} + +kubernetes: + serviceLocatorMethod: + type: 'multiTenant' + clusterLocatorMethods: + - type: 'config' + clusters: + - name: demo-cluster + url: https://demo.backstage.io + authProvider: 'serviceAccount' + serviceAccountToken: ${KUBERNETES_SERVICE_ACCOUNT_TOKEN} + From e1fd5f46fcae638ece9e8af00d4d60d034bd43c0 Mon Sep 17 00:00:00 2001 From: Matthew Clarke Date: Tue, 13 Feb 2024 15:18:26 -0500 Subject: [PATCH 2/2] feat: add missed changes Signed-off-by: Matthew Clarke --- app-config.heroku.yaml | 4 +++- app-config.yaml | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app-config.heroku.yaml b/app-config.heroku.yaml index 17958e00f..119e751db 100644 --- a/app-config.heroku.yaml +++ b/app-config.heroku.yaml @@ -39,7 +39,9 @@ kubernetes: - type: 'config' clusters: - name: demo-cluster - url: https://demo.backstage.io + url: ${K8S_URL} authProvider: 'serviceAccount' + caData: ${K8S_CA_DATA} serviceAccountToken: ${KUBERNETES_SERVICE_ACCOUNT_TOKEN} + diff --git a/app-config.yaml b/app-config.yaml index 00f1a5211..4e8eeb61e 100644 --- a/app-config.yaml +++ b/app-config.yaml @@ -99,6 +99,10 @@ catalog: - type: url target: https://github.com/backstage/backstage/blob/master/catalog-info.yaml + # Kubernetes demo component + - type: url + target: https://github.com/mclarke47/dice-roller/blob/master/catalog-info.yaml + costInsights: engineerCost: 200000 products: