Skip to content

Commit 3b4c45e

Browse files
authored
Revert "Add service metadata endpoints (#69)" (#72)
This reverts commit 861f831.
1 parent 8a0f501 commit 3b4c45e

File tree

12 files changed

+34
-806
lines changed

12 files changed

+34
-806
lines changed

config/crd/bases/registry.ethos.adobe.com_clusters.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -220,15 +220,6 @@ spec:
220220
registeredAt:
221221
description: Timestamp when cluster was registered in Cluster Registry
222222
type: string
223-
services:
224-
additionalProperties:
225-
additionalProperties:
226-
additionalProperties:
227-
type: string
228-
type: object
229-
type: object
230-
description: ServiceMetadata service specific metadata
231-
type: object
232223
shortName:
233224
description: Cluster name, without dash
234225
maxLength: 64

local/database/dummy-data.yaml

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -96,30 +96,18 @@
9696
tags:
9797
onboarding: "off"
9898
scaling: "off"
99-
services:
100-
12345:
101-
ns-team-abc:
102-
key1: value1
103-
key2: value2
104-
ns-team-xyz:
105-
key3: value3
106-
98765:
107-
ns-team-example:
108-
some.key: some.value
109-
ns-team-example2:
110-
foo: bar
11199
- apiVersion: registry.ethos.adobe.com/v1
112100
kind: Cluster
113101
metadata:
114-
name: cluster02-prod-euwest1
102+
name: cluster02-prod-euwest1
115103
namespace: cluster-registry
116104
spec:
117-
name: cluster02-prod-euwest1
118-
shortName: cluster02prodeuwest1
105+
name: cluster02-prod-euwest1
106+
shortName: cluster02prodeuwest1
119107
apiServer:
120108
endpoint: https://cluster02-prod-euwest1.example.com
121109
certificateAuthorityData: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0==
122-
region: euwest1
110+
region: euwest1
123111
cloudType: azure
124112
cloudProviderRegion: euwest1
125113
environment: Prod
@@ -183,19 +171,6 @@
183171
tags:
184172
onboarding: "off"
185173
scaling: "on"
186-
services:
187-
12345:
188-
ns-team-abc:
189-
keyA: valueA
190-
keyB: valueB
191-
55555:
192-
ns-team-foo:
193-
foo: bar
194-
98765:
195-
ns-team-example:
196-
some.other.key: some.other.value
197-
ns-team-foobar:
198-
foo: bar
199174
- apiVersion: registry.ethos.adobe.com/v1
200175
kind: Cluster
201176
metadata:

local/database/reset.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ set -o pipefail
77
ROOT_DIR="$(cd "$(dirname "$0")/.."; pwd)"
88

99
echo 'Loading local environment variables...'
10-
source ${ROOT_DIR}/.env.local
10+
source ${ROOT_DIR}/local/.env.local
1111

1212
echo 'Create dynamodb schema...'
1313
aws dynamodb delete-table --table-name ${DB_TABLE_NAME} --endpoint-url $DB_ENDPOINT > /dev/null 2>&1 || true
14-
aws dynamodb create-table --cli-input-json file://${ROOT_DIR}/database/schema.json --endpoint-url $DB_ENDPOINT > /dev/null
14+
aws dynamodb create-table --cli-input-json file://${ROOT_DIR}/local/db/schema.json --endpoint-url $DB_ENDPOINT > /dev/null
1515

1616
echo 'Populate database with dummy data..'
17-
go run ${ROOT_DIR}/database/import.go --input-file ${ROOT_DIR}/database/dummy-data.yaml
17+
go run ${ROOT_DIR}/local/db/import.go --input-file ${ROOT_DIR}/local/db/dummy-data.yaml

pkg/api/registry/v1/cluster_types.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,6 @@ type ClusterSpec struct {
116116

117117
// Capacity cluster information
118118
Capacity Capacity `json:"capacity,omitempty"`
119-
120-
// ServiceMetadata service specific metadata
121-
ServiceMetadata ServiceMetadata `json:"services,omitempty"`
122119
}
123120

124121
// Offering the cluster is meant for
@@ -259,12 +256,6 @@ type Capacity struct {
259256
ClusterProvisioning int `json:"clusterProvisioning"`
260257
}
261258

262-
type ServiceMetadata map[string]ServiceMetadataItem
263-
264-
type ServiceMetadataItem map[string]ServiceMetadataMap
265-
266-
type ServiceMetadataMap map[string]string
267-
268259
// ClusterStatus defines the observed state of Cluster
269260
type ClusterStatus struct {
270261
// Send/Receive Errors

pkg/api/registry/v1/zz_generated.deepcopy.go

Lines changed: 5 additions & 140 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)