fixup! Add fine-grain ingress DNS control through CRD

adevinta · Dec 10, 2024 · 242ad16 · 242ad16
1 parent 7e216a5
commit 242ad16
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git a/helm-chart/traffic-controller/crds/ingress.adevinta.com_clusteringressservicednsweights.yaml b/helm-chart/traffic-controller/crds/ingress.adevinta.com_clusteringressservicednsweights.yaml
@@ -0,0 +1 @@
+../../../config/crd/bases/ingress.adevinta.com_clusteringressservicednsweights.yaml
diff --git a/helm-chart/traffic-controller/templates/rbac.yaml b/helm-chart/traffic-controller/templates/rbac.yaml
@@ -5,6 +5,14 @@ metadata:
   namespace: {{ .Release.Namespace }}
   name: "{{ .Release.Name }}-leader-election-role"
 rules:
+- apiGroups:
+  - ingress.adevinta.com
+  resources:
+  - "clusteringressservicednsweights"
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - ""
   resources:

diff --git a/pkg/apis/ingress.adevinta.com/v1beta1/ingress_types.go b/pkg/apis/ingress.adevinta.com/v1beta1/ingress_types.go
@@ -4,25 +4,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// kind: ClusterIngressServiceDNSWeight
-// spec:
-// weight: <int>
-// identifier: <string>
-// serviceSelector:
-//
-//	namespace: <string>
-//	matchLabels:
-//		<string>: <string>
-//
-// ingressSelector:
-//
-//	matchLabels:
-//		<string>: <string>
-//	namespaces:
-//		- <string>
-//	classes:
-//		- <string>
-
 // ClusterIngressServiceDNSWeight is the defines the links between k8s services and ingresses
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:scope=Cluster
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../config/crd/bases/ingress.adevinta.com_clusteringressservicednsweights.yaml