Merge pull request #1 from andrewsykim/clusterset-ip-from-service-import

Assign predefined clustersetIP to service status

Author: k8s-ci-robot

config/rbac/role.yaml

@@ -17,6 +17,17 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - ""
+  resources:
+  - services/status
+  verbs:
+  - create
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - discovery.k8s.io
   resources:

demo/demo.sh

@@ -55,6 +55,8 @@ run "${k1} get endpointslice -n demo ${ep_1} -o yaml | ./edit-meta --metadata '{
 run "${k2} get endpointslice -n demo ${ep_2} -o yaml | ./edit-meta --metadata '{name: imported-${ep_2}, namespace: demo, labels: {multicluster.kubernetes.io/service-name: serve}}' > yaml/slice-2.tmp"
 run "${k1} apply -f yaml/serviceimport.yaml -f yaml/slice-1.tmp -f yaml/slice-2.tmp"
 run "${k2} apply -f yaml/serviceimport.yaml -f yaml/slice-1.tmp -f yaml/slice-2.tmp"
+run "${k1} apply -f yaml/serviceimport-with-vip.yaml -f yaml/slice-1.tmp -f yaml/slice-2.tmp"
+run "${k2} apply -f yaml/serviceimport-with-vip.yaml -f yaml/slice-1.tmp -f yaml/slice-2.tmp"
 
 desc "See what we've created..."
 run "${k1} get -n demo serviceimports"
@@ -77,4 +79,4 @@ desc "See for yourself"
 desc "Cluster 1: kubectl --kubeconfig ${kubeconfig1} -n demo"
 desc "Cluster 2: kubectl --kubeconfig ${kubeconfig2} -n demo"
 desc "(Enter to exit)"
-read -s
+read -s

demo/yaml/serviceimport-with-vip.yaml

@@ -0,0 +1,12 @@
+apiVersion: multicluster.x-k8s.io/v1alpha1
+kind: ServiceImport
+metadata:
+  name: serve-with-vip
+  namespace: demo
+spec:
+  type: ClusterSetIP
+  ips:
+  - 1.2.3.4
+  ports:
+  - port: 80
+    protocol: TCP

demo/yaml/serviceimport.yaml

@@ -7,4 +7,4 @@ spec:
   type: ClusterSetIP
   ports:
   - port: 80
-    protocol: TCP
+    protocol: TCP

pkg/controllers/service.go

@@ -65,9 +65,11 @@ func (r *ServiceReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
 	if err := r.Client.Get(ctx, types.NamespacedName{Namespace: req.Namespace, Name: importName}, &svcImport); err != nil {
 		return ctrl.Result{}, err
 	}
-	if len(svcImport.Spec.IPs) == 1 && svcImport.Spec.IPs[0] == service.Spec.ClusterIP {
+
+	if len(svcImport.Spec.IPs) > 0 {
 		return ctrl.Result{}, nil
 	}
+
 	svcImport.Spec.IPs = []string{service.Spec.ClusterIP}
 	if err := r.Client.Update(ctx, &svcImport); err != nil {
 		return ctrl.Result{}, err

pkg/controllers/serviceimport.go

@@ -60,6 +60,9 @@ func shouldIgnoreImport(svcImport *v1alpha1.ServiceImport) bool {
 	return false
 }
 
+// +kubebuilder:rbac:groups=core,resources=services,verbs=get;list;watch;create;update;patch
+// +kubebuilder:rbac:groups=core,resources=services/status,verbs=get;list;watch;create;update;patch
+
 // Reconcile the changes.
 func (r *ServiceImportReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
 	ctx, cancel := context.WithCancel(context.Background())
@@ -92,6 +95,7 @@ func (r *ServiceImportReconciler) Reconcile(req ctrl.Request) (ctrl.Result, erro
 	} else if !apierrors.IsNotFound(err) {
 		return ctrl.Result{}, err
 	}
+
 	svc = v1.Service{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: req.Namespace,
@@ -114,6 +118,29 @@ func (r *ServiceImportReconciler) Reconcile(req ctrl.Request) (ctrl.Result, erro
 		return ctrl.Result{}, err
 	}
 	log.Info("created service")
+
+	if len(svcImport.Spec.IPs) == 0 {
+		return ctrl.Result{}, nil
+	}
+
+	// update loadbalanacer status with provided clustersetIPs
+	ingress := []v1.LoadBalancerIngress{}
+	for _, ip := range svcImport.Spec.IPs {
+		ingress = append(ingress, v1.LoadBalancerIngress{
+			IP: ip,
+		})
+	}
+
+	svc.Status = v1.ServiceStatus{
+		LoadBalancer: v1.LoadBalancerStatus{
+			Ingress: ingress,
+		},
+	}
+
+	if err := r.Client.Status().Update(ctx, &svc); err != nil {
+		return ctrl.Result{}, err
+	}
+
 	return ctrl.Result{}, nil
 }
 

pkg/controllers/serviceimport_test.go

@@ -138,7 +138,6 @@ var _ = Describe("ServiceImport", func() {
 					Ports: []v1alpha1.ServicePort{
 						{Port: 80},
 					},
-					IPs: []string{"10.42.42.42"},
 				},
 			}
 			Expect(k8s.Create(ctx, &serviceImport)).To(Succeed())
@@ -158,4 +157,38 @@ var _ = Describe("ServiceImport", func() {
 			}, 10).Should(Equal(s.Spec.ClusterIP))
 		}, 15)
 	})
+	Context("created with existing clustersetIP", func() {
+		BeforeEach(func() {
+			serviceName = types.NamespacedName{Namespace: testNS, Name: fmt.Sprintf("svc-%v", rand.Uint64())}
+			derivedServiceName = types.NamespacedName{Namespace: testNS, Name: derivedName(serviceName)}
+			serviceImport = v1alpha1.ServiceImport{
+				ObjectMeta: metav1.ObjectMeta{
+					Namespace: testNS,
+					Name:      serviceName.Name,
+				},
+				Spec: v1alpha1.ServiceImportSpec{
+					Type: v1alpha1.ClusterSetIP,
+					Ports: []v1alpha1.ServicePort{
+						{Port: 80},
+					},
+					IPs: []string{"10.42.42.42"},
+				},
+			}
+			Expect(k8s.Create(ctx, &serviceImport)).To(Succeed())
+		})
+		It("updates service loadbalancer status with service import IPs", func() {
+			var svcImport v1alpha1.ServiceImport
+			var s v1.Service
+			Eventually(func() error {
+				return k8s.Get(ctx, derivedServiceName, &s)
+			}, 10).Should(Succeed())
+			Eventually(func() string {
+				Expect(k8s.Get(ctx, serviceName, &svcImport)).To(Succeed())
+				if len(svcImport.Spec.IPs) > 0 {
+					return svcImport.Spec.IPs[0]
+				}
+				return ""
+			}, 10).Should(Equal(s.Status.LoadBalancer.Ingress[0].IP))
+		}, 15)
+	})
 })