From d32dfb76673e7d6a6830db9483de5d6fab827ba5 Mon Sep 17 00:00:00 2001 From: Andrei Alexandru Date: Fri, 16 Aug 2024 16:10:48 +0300 Subject: [PATCH] deps: bump controller-gen version to 0.16.1 (#224) Co-authored-by: aalexand --- Makefile | 2 +- .../registry.ethos.adobe.com_clusters.yaml | 2 +- ...hos.adobe.com_servicemetadatawatchers.yaml | 2 +- ...registry.ethos.adobe.com_clustersyncs.yaml | 2 +- .../registry.ethos.adobe.com_clusters.yaml | 2 +- ...registry.ethos.adobe.com_clustersyncs.yaml | 2 +- ...hos.adobe.com_servicemetadatawatchers.yaml | 2 +- config/rbac/role.yaml | 27 ++----------------- pkg/api/registry/v1/cluster_types.go | 3 --- 9 files changed, 9 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index 1827d96d..3267919a 100644 --- a/Makefile +++ b/Makefile @@ -226,7 +226,7 @@ MANAGER_ROLE ?= "cluster-registry" CONTROLLER_GEN = $(shell pwd)/bin/controller-gen controller-gen: ## Download controller-gen locally if necessary. - @[ -f $(CONTROLLER_GEN) ] || GOBIN=$(shell pwd)/bin go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.15.0 + @[ -f $(CONTROLLER_GEN) ] || GOBIN=$(shell pwd)/bin go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.1 KUSTOMIZE = $(shell pwd)/bin/kustomize kustomize: ## Download kustomize locally if necessary. diff --git a/charts/cluster-registry-client/crds/registry.ethos.adobe.com_clusters.yaml b/charts/cluster-registry-client/crds/registry.ethos.adobe.com_clusters.yaml index 59b70966..aee61b22 100644 --- a/charts/cluster-registry-client/crds/registry.ethos.adobe.com_clusters.yaml +++ b/charts/cluster-registry-client/crds/registry.ethos.adobe.com_clusters.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: clusters.registry.ethos.adobe.com spec: group: registry.ethos.adobe.com diff --git a/charts/cluster-registry-client/crds/registry.ethos.adobe.com_servicemetadatawatchers.yaml b/charts/cluster-registry-client/crds/registry.ethos.adobe.com_servicemetadatawatchers.yaml index 7f6bc1eb..37982d95 100644 --- a/charts/cluster-registry-client/crds/registry.ethos.adobe.com_servicemetadatawatchers.yaml +++ b/charts/cluster-registry-client/crds/registry.ethos.adobe.com_servicemetadatawatchers.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: servicemetadatawatchers.registry.ethos.adobe.com spec: group: registry.ethos.adobe.com diff --git a/charts/cluster-registry-sync-manager/crds/registry.ethos.adobe.com_clustersyncs.yaml b/charts/cluster-registry-sync-manager/crds/registry.ethos.adobe.com_clustersyncs.yaml index 4b035535..afe6d8b1 100644 --- a/charts/cluster-registry-sync-manager/crds/registry.ethos.adobe.com_clustersyncs.yaml +++ b/charts/cluster-registry-sync-manager/crds/registry.ethos.adobe.com_clustersyncs.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: clustersyncs.registry.ethos.adobe.com spec: group: registry.ethos.adobe.com diff --git a/config/crd/bases/registry.ethos.adobe.com_clusters.yaml b/config/crd/bases/registry.ethos.adobe.com_clusters.yaml index 59b70966..aee61b22 100644 --- a/config/crd/bases/registry.ethos.adobe.com_clusters.yaml +++ b/config/crd/bases/registry.ethos.adobe.com_clusters.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: clusters.registry.ethos.adobe.com spec: group: registry.ethos.adobe.com diff --git a/config/crd/bases/registry.ethos.adobe.com_clustersyncs.yaml b/config/crd/bases/registry.ethos.adobe.com_clustersyncs.yaml index 4b035535..afe6d8b1 100644 --- a/config/crd/bases/registry.ethos.adobe.com_clustersyncs.yaml +++ b/config/crd/bases/registry.ethos.adobe.com_clustersyncs.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: clustersyncs.registry.ethos.adobe.com spec: group: registry.ethos.adobe.com diff --git a/config/crd/bases/registry.ethos.adobe.com_servicemetadatawatchers.yaml b/config/crd/bases/registry.ethos.adobe.com_servicemetadatawatchers.yaml index 7f6bc1eb..37982d95 100644 --- a/config/crd/bases/registry.ethos.adobe.com_servicemetadatawatchers.yaml +++ b/config/crd/bases/registry.ethos.adobe.com_servicemetadatawatchers.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: servicemetadatawatchers.registry.ethos.adobe.com spec: group: registry.ethos.adobe.com diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 66736c3d..3f6dc292 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -8,31 +8,6 @@ rules: - registry.ethos.adobe.com resources: - clusters - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - registry.ethos.adobe.com - resources: - - clusters/finalizers - verbs: - - update -- apiGroups: - - registry.ethos.adobe.com - resources: - - clusters/status - verbs: - - get - - patch - - update -- apiGroups: - - registry.ethos.adobe.com - resources: - servicemetadatawatchers verbs: - create @@ -45,12 +20,14 @@ rules: - apiGroups: - registry.ethos.adobe.com resources: + - clusters/finalizers - servicemetadatawatchers/finalizers verbs: - update - apiGroups: - registry.ethos.adobe.com resources: + - clusters/status - servicemetadatawatchers/status verbs: - get diff --git a/pkg/api/registry/v1/cluster_types.go b/pkg/api/registry/v1/cluster_types.go index 8b416cc1..650e3c09 100644 --- a/pkg/api/registry/v1/cluster_types.go +++ b/pkg/api/registry/v1/cluster_types.go @@ -166,15 +166,12 @@ type AllowedOnboardingTeam struct { // Extra information type Extra struct { // Name of the domain - // +kubebuilder:validation:Required DomainName string `json:"domainName"` // Load balancer endpoints - // +kubebuilder:validation:Required LbEndpoints map[string]string `json:"lbEndpoints"` // Logging endpoints - // +kubebuilder:validation:Required LoggingEndpoints []map[string]string `json:"loggingEndpoints,omitempty"` // List of IAM Arns