paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 40 Packages Projects Releases Wiki Activity

Fix parsing of GKE endpoint (#19907)

Browse Source 
Signed-off-by: Tomasz Szuba <tszuba@box.com>
This commit is contained in:
Tomasz Szuba
2023-09-18 14:49:58 +02:00
committed by GitHub
parent f963cec9a0
commit 201f07c27f
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/catalog-backend-module-gcp/src/providers/GkeEntityProvider.test.ts
+9 -9
View File
@@ -83,9 +83,9 @@ describe('GkeEntityProvider', () => {
clusters: [
{
name: 'some-cluster',
endpoint: 'http://127.0.0.1:1234',
endpoint: '127.0.0.1',
location: 'some-location',
selfLink: 'http://127.0.0.1/some-link',
selfLink: 'https://127.0.0.1/some-link',
masterAuth: {
clusterCaCertificate: 'abcdefg',
},
@@ -99,9 +99,9 @@ describe('GkeEntityProvider', () => {
clusters: [
{
name: 'some-other-cluster',
endpoint: 'http://127.0.0.1:5678',
endpoint: '127.0.0.1',
location: 'some-other-location',
selfLink: 'http://127.0.0.1/some-other-link',
selfLink: 'https://127.0.0.1/some-other-link',
masterAuth: {
// no CA cert is ok
},
@@ -124,7 +124,7 @@ describe('GkeEntityProvider', () => {
kind: 'Resource',
metadata: {
annotations: {
[ANNOTATION_KUBERNETES_API_SERVER]: 'http://127.0.0.1:1234',
[ANNOTATION_KUBERNETES_API_SERVER]: 'https://127.0.0.1',
[ANNOTATION_KUBERNETES_API_SERVER_CA]: 'abcdefg',
[ANNOTATION_KUBERNETES_AUTH_PROVIDER]: 'google',
'backstage.io/managed-by-location': 'gcp-gke:some-location',
@@ -147,7 +147,7 @@ describe('GkeEntityProvider', () => {
kind: 'Resource',
metadata: {
annotations: {
[ANNOTATION_KUBERNETES_API_SERVER]: 'http://127.0.0.1:5678',
[ANNOTATION_KUBERNETES_API_SERVER]: 'https://127.0.0.1',
[ANNOTATION_KUBERNETES_API_SERVER_CA]: '',
[ANNOTATION_KUBERNETES_AUTH_PROVIDER]: 'google',
'backstage.io/managed-by-location':
@@ -175,7 +175,7 @@ describe('GkeEntityProvider', () => {
[
'no-cluster-name',
{
endpoint: 'http://127.0.0.1:1234',
endpoint: '127.0.0.1',
location: 'some-location',
selfLink: 'http://127.0.0.1/some-link',
masterAuth: {
@@ -188,7 +188,7 @@ describe('GkeEntityProvider', () => {
{
// no selfLink
name: 'some-name',
endpoint: 'http://127.0.0.1:1234',
endpoint: '127.0.0.1',
location: 'some-location',
masterAuth: {
clusterCaCertificate: 'abcdefg',
@@ -210,7 +210,7 @@ describe('GkeEntityProvider', () => {
'no-location',
{
name: 'some-name',
endpoint: 'http://127.0.0.1:1234',
endpoint: '127.0.0.1',
selfLink: 'http://127.0.0.1/some-link',
masterAuth: {
clusterCaCertificate: 'abcdefg',
plugins/catalog-backend-module-gcp/src/providers/GkeEntityProvider.ts
+1 -1
View File
@@ -138,7 +138,7 @@ export class GkeEntityProvider implements EntityProvider {
kind: 'Resource',
metadata: {
annotations: {
[ANNOTATION_KUBERNETES_API_SERVER]: cluster.endpoint,
[ANNOTATION_KUBERNETES_API_SERVER]: `https://${cluster.endpoint}`,
[ANNOTATION_KUBERNETES_API_SERVER_CA]:
cluster.masterAuth?.clusterCaCertificate || '',
[ANNOTATION_KUBERNETES_AUTH_PROVIDER]: 'google',