openelb · ks-ci-bot · Apr 24, 2024 · Apr 24, 2024 · chaunceyjiang · Apr 23, 2024
diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +13,7 @@ RUN GO111MODULE=on CGO_ENABLED=0 go install -ldflags '-w -s' github.com/osrg/gob
 FROM alpine
 RUN apk add --update ca-certificates iptables && update-ca-certificates
 COPY --from=openelb-builder /go/bin/controller /usr/local/bin/openelb-controller
-# COPY --from=openelb-builder /go/bin/speaker /usr/local/bin/openelb-speaker
+COPY --from=openelb-builder /go/bin/speaker /usr/local/bin/openelb-speaker
 # COPY --from=openelb-builder /go/bin/apiserver /usr/local/bin/openelb-apiserver
 COPY --from=openelb-builder /go/bin/gobgp /usr/local/bin/gobgp
 

diff --git a/api/v1alpha2/eip_types.go b/api/v1alpha2/eip_types.go
@@ -191,8 +191,8 @@ func (e Eip) ValidateCreate() (admission.Warnings, error) {
 		return nil, err
 	}
 
-	if e.Spec.Protocol == constant.OpenELBProtocolLayer2 && e.Spec.Interface == "" {
-		return nil, fmt.Errorf("if protocol is layer2, interface should not be empty")
+	if (e.Spec.Protocol == constant.OpenELBProtocolLayer2 || e.Spec.Protocol == constant.OpenELBProtocolVip) && e.Spec.Interface == "" {
+		return nil, fmt.Errorf("if protocol is layer2 or vip, interface should not be empty")
 	}
 	return nil, e.validate(true)
 }
@@ -267,8 +267,8 @@ func (e Eip) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
 		}
 	}
 
-	if e.Spec.Protocol == constant.OpenELBProtocolLayer2 && e.Spec.Interface == "" {
-		return nil, fmt.Errorf("if protocol is layer2, interface should not be empty")
+	if (e.Spec.Protocol == constant.OpenELBProtocolLayer2 || e.Spec.Protocol == constant.OpenELBProtocolVip) && e.Spec.Interface == "" {
+		return nil, fmt.Errorf("if protocol is layer2 or vip, interface should not be empty")
 	}
 
 	return nil, nil

diff --git a/build/forward/Dockerfile b/build/forward/Dockerfile
@@ -4,7 +4,7 @@
 
 FROM alpine
 WORKDIR /
-COPY images/forward/entry-point.sh /entry-point.sh
+COPY build/forward/entry-point.sh /entry-point.sh
 RUN apk update && apk add iptables && \
     chmod +x /entry-point.sh
 CMD [ "/entry-point.sh" ]
diff --git a/build/proxy/Dockerfile b/build/proxy/Dockerfile
@@ -4,7 +4,7 @@
 
 FROM alpine
 WORKDIR /
-COPY images/proxy/entry-point.sh /entry-point.sh
+COPY build/proxy/entry-point.sh /entry-point.sh
 RUN apk update && apk add iptables && \
     chmod +x /entry-point.sh
 CMD [ "/entry-point.sh" ]
diff --git a/build/speaker/Dockerfile b/build/speaker/Dockerfile
@@ -8,7 +8,6 @@ ADD . /workspace/
 
 RUN make speaker
 RUN mv /workspace/bin/cmd/speaker ${OUTDIR}/usr/local/bin/openelb-speaker
-
 RUN GO111MODULE=on CGO_ENABLED=0 go install -ldflags '-w -s' github.com/osrg/gobgp/cmd/gobgp
 RUN mv /go/bin/gobgp ${OUTDIR}/usr/local/bin/gobgp
 
@@ -19,7 +18,10 @@ RUN mv /go/bin/gobgp ${OUTDIR}/usr/local/bin/gobgp
 #############
 FROM alpine
 
+RUN apk add --update --no-cache keepalived
 COPY --from=build_context /out/ /
+ADD build/speaker/keepalived.tmpl /
+ADD build/speaker/keepalived-check.sh /
 WORKDIR /
 
 ENTRYPOINT ["openelb-speaker"]

diff --git a/build/speaker/keepalived-check.sh b/build/speaker/keepalived-check.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+TYPE="$1"
+NAME="$2"
+STATE="$3"
+
+dir_path="/var/run/keepalived/state"
+mkdir -p "$dir_path" 2>/dev/null
+
+echo -n "${STATE}" > $dir_path/${NAME}
+exit 0
diff --git a/build/speaker/keepalived.tmpl b/build/speaker/keepalived.tmpl
@@ -0,0 +1,33 @@
+global_defs {
+  vrrp_version 3
+  script_user root
+  enable_script_security
+  router_id {{ .name }}
+}
+
+
+#Check if the VIP list is empty
+
+{{ range $name, $instance := .instances }}
+{{ if $instance.Enabled }}
+vrrp_instance {{ $name }} {
+  state BACKUP
+  interface {{ $instance.Iface }}
+  virtual_router_id {{ $instance.RouteID }}
+  priority {{ $instance.Priority }}
+  nopreempt
+  advert_int 1
+
+  track_interface {
+    {{ $instance.Iface }}
+  }
+
+  virtual_ipaddress { {{ range $instance.Svcips }}
+    {{ . }}{{ end }}
+  }
+
+  notify /keepalived-check.sh
+}
+
+{{ end }}
+{{ end }}
diff --git a/charts/crds/bgpconfs.yaml → .../crds/network.kubesphere.io_bgpconfs.yaml b/charts/crds/bgpconfs.yaml → .../crds/network.kubesphere.io_bgpconfs.yaml
@@ -1,11 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.1
   name: bgpconfs.network.kubesphere.io
 spec:
   group: network.kubesphere.io
@@ -135,6 +133,8 @@ spec:
               listenPort:
                 format: int32
                 type: integer
+              policy:
+                type: string
               routerId:
                 type: string
               useMultiplePaths:
@@ -159,9 +159,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/charts/crds/bgppeers.yaml → .../crds/network.kubesphere.io_bgppeers.yaml b/charts/crds/bgppeers.yaml → .../crds/network.kubesphere.io_bgppeers.yaml
@@ -1,11 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.1
   name: bgppeers.network.kubesphere.io
 spec:
   group: network.kubesphere.io
@@ -266,6 +264,7 @@ spec:
                       are ANDed.
                     type: object
                 type: object
+                x-kubernetes-map-type: atomic
               timers:
                 properties:
                   config:
@@ -425,9 +424,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/charts/crds/eips.yaml → charts/crds/network.kubesphere.io_eips.yaml b/charts/crds/eips.yaml → charts/crds/network.kubesphere.io_eips.yaml
@@ -1,11 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.1
   name: eips.network.kubesphere.io
 spec:
   group: network.kubesphere.io
@@ -113,6 +111,19 @@ spec:
                 type: boolean
               interface:
                 type: string
+              namespaceSelector:
+                additionalProperties:
+                  type: string
+                description: specify the namespace for allocation by selector
+                type: object
+              namespaces:
+                description: specify the namespace for the allocation by name
+                items:
+                  type: string
+                type: array
+              priority:
+                description: priority for automatically assigning addresses
+                type: integer
               protocol:
                 enum:
                 - bgp
@@ -151,9 +162,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/charts/templates/openelb-speaker-rbac.yaml b/charts/templates/openelb-speaker-rbac.yaml
@@ -115,52 +115,3 @@ kind: ServiceAccount
 metadata:
   name: {{ template "openelb.speaker.serviceAccountName" . }}
   namespace: {{ template "openelb.namespace" . }}
-
-
-
-# kube-keepalived-vip
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    {{- include "openelb.keepalived.labels" . | nindent 4 }}
-  name: {{ template "openelb.keepalived.fullname" . }}
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - pods
-      - nodes
-      - endpoints
-      - services
-      - configmaps
-    verbs:
-      - get
-      - list
-      - watch
-
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  labels:
-    {{- include "openelb.keepalived.labels" . | nindent 4 }}
-  name: {{ template "openelb.keepalived.fullname" . }}
-subjects:
-  - kind: ServiceAccount
-    name: kube-keepalived-vip
-    namespace: {{ template "openelb.namespace" . }}
-roleRef:
-  kind: ClusterRole
-  name: {{ template "openelb.keepalived.fullname" . }}
-  apiGroup: rbac.authorization.k8s.io
-
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: kube-keepalived-vip
-  namespace: {{ template "openelb.namespace" . }}
-  labels:
-    {{- include "openelb.keepalived.labels" . | nindent 4 }}
diff --git a/charts/values.yaml b/charts/values.yaml
@@ -76,6 +76,5 @@ speaker:
 
 customImage:
   enable: true
-  vipImage: ""      # "kubesphere/kube-keepalived-vip:0.35"
   forwardImage: ""  # kubesphere/openelb-forward:master
   proxyImage: ""    # kubesphere/openelb-proxy:master
diff --git a/cmd/speaker/app/speaker.go b/cmd/speaker/app/speaker.go
@@ -13,7 +13,6 @@ import (
 	bgpd "github.com/openelb/openelb/pkg/speaker/bgp/bgp"
 	"github.com/openelb/openelb/pkg/speaker/layer2"
 	"github.com/openelb/openelb/pkg/speaker/vip"
-	"github.com/openelb/openelb/pkg/util"
 	"github.com/openelb/openelb/pkg/version"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -97,7 +96,7 @@ func Run(opt *options.OpenELBSpeakerOptions) error {
 		return err
 	}
 
-	spmanager := speaker.NewSpeakerManager(mgr.GetClient())
+	spmanager := speaker.NewSpeakerManager(mgr.GetClient(), mgr.GetEventRecorderFor("speakerManager"))
 
 	//For gobgp
 	bgpServer := bgpd.NewGoBgpd(opt.Bgp)
@@ -119,26 +118,15 @@ func Run(opt *options.OpenELBSpeakerOptions) error {
 	//For keepalive
 	k8sClient := clientset.NewForConfigOrDie(ctrl.GetConfigOrDie())
 	if opt.Vip.EnableVIP {
-		ns := util.EnvNamespace()
-		config := constant.OpenELBVipConfigMap
-		if opt.Vip.ConfigNamespace != "" {
-			ns = opt.Vip.ConfigNamespace
-		}
-		if opt.Vip.ConfigName != "" {
-			config = opt.Vip.ConfigName
+		keepalive, err := vip.NewKeepAlived(k8sClient, opt.Vip.LogPath, opt.Vip.KeepAlivedArgs)
+		if err != nil {
+			setupLog.Error(err, "unable to new vip speaker")
+			return err
 		}
-		keepalive := vip.NewKeepAlived(k8sClient, &vip.KeepAlivedConfig{
-			Args: []string{
-				fmt.Sprintf("--services-configmap=%s/%s", ns, config),
-				fmt.Sprintf("--http-port=%d", opt.Vip.HealthPort)},
-		})
-
 		if err := spmanager.RegisterSpeaker(constant.OpenELBProtocolVip, keepalive); err != nil {
 			setupLog.Error(err, "unable to register keepalive speaker")
 			return err
 		}
-	} else {
-		vip.Clean(k8sClient)
 	}
 
 	// for layer2 mode

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
diff --git a/config/rbac/role_binding.yaml b/config/rbac/role_binding.yaml