Remove no need octopus and remove global cidr as secondary ip range

Makefile

@@ -29,7 +29,7 @@ ifdef HTTPS_PROXY
 endif
 
 lint: golangci-lint
-	golangci-lint run -c .golangci.yaml --timeout=10m
+	GOARCH=amd64 GOOS=linux golangci-lint run -c .golangci.yaml --timeout=10m
 
 
 # Generate manifests e.g. CRD, RBAC etc.
@@ -57,9 +57,6 @@ endif
 crossdns:
 	CGO_ENABLED=0 GOARCH=amd64 GOOS=linux go build -ldflags="-s -w" -a -installsuffix cgo -o bin/crossdns cmd/crossdns/main.go
 
-octopus:
-	CGO_ENABLED=0 GOARCH=amd64 GOOS=linux go build -ldflags "-w -s" -a -installsuffix cgo -o bin/octopus cmd/octopus/main.go
-
 cnf:
 	CGO_ENABLED=0 GOARCH=amd64 GOOS=linux go build -ldflags "-w -s" -a -installsuffix cgo -o bin/cnf cmd/cnf/main.go
 
@@ -69,18 +66,14 @@ ep-controller:
 
 images:
 	docker build $(DOCKERARGS) -f ./build/crossdns.Dockerfile ./ -t ${REGISTRY}/${REGISTRY_NAMESPACE}/crossdns:${IMAGE_TAG}
-	docker build $(DOCKERARGS) -f ./build/octopus.Dockerfile ./ -t ${REGISTRY}/${REGISTRY_NAMESPACE}/octopus:${IMAGE_TAG}
+	docker build $(DOCKERARGS) -f ./build/cnf.Dockerfile ./ -t ${REGISTRY}/${REGISTRY_NAMESPACE}/cnf:${IMAGE_TAG}
 	docker build $(DOCKERARGS) -f ./build/dedinic.Dockerfile ./ -t ${REGISTRY}/${REGISTRY_NAMESPACE}/dedinic:${IMAGE_TAG}
 	docker build $(DOCKERARGS) -f ./build/ep-controller.Dockerfile ./ -t ${REGISTRY}/${REGISTRY_NAMESPACE}/ep-controller:${IMAGE_TAG}
 
 image-crossdns:
 	docker build $(DOCKERARGS) -f ./build/crossdns.Dockerfile ./ -t ${REGISTRY}/${REGISTRY_NAMESPACE}/crossdns:${IMAGE_TAG}
 	docker push ${REGISTRY}/${REGISTRY_NAMESPACE}/crossdns:${IMAGE_TAG}
 
-image-octopus:
-	docker build $(DOCKERARGS) -f ./build/octopus.Dockerfile ./ -t ${REGISTRY}/${REGISTRY_NAMESPACE}/octopus:${IMAGE_TAG}
-	docker push ${REGISTRY}/${REGISTRY_NAMESPACE}/octopus:${IMAGE_TAG}
-
 image-dedinic:
 	docker build $(DOCKERARGS) -f ./build/dedinic.Dockerfile ./ -t ${REGISTRY}/${REGISTRY_NAMESPACE}/dedinic:${IMAGE_TAG}
 	docker push ${REGISTRY}/${REGISTRY_NAMESPACE}/dedinic:${IMAGE_TAG}
@@ -96,7 +89,7 @@ image-ep-controller:
 
 images-push:
 	docker push ${REGISTRY}/${REGISTRY_NAMESPACE}/crossdns:${IMAGE_TAG}
-	docker push ${REGISTRY}/${REGISTRY_NAMESPACE}/octopus:${IMAGE_TAG}
+	docker push ${REGISTRY}/${REGISTRY_NAMESPACE}/cnf:${IMAGE_TAG}
 	docker push ${REGISTRY}/${REGISTRY_NAMESPACE}/dedinic:${IMAGE_TAG}
 	docker push ${REGISTRY}/${REGISTRY_NAMESPACE}/ep-controller:${IMAGE_TAG}
 

README.md

@@ -7,7 +7,6 @@ provide service discovery ability.
 It consists of several parts for networking between clusters:
 
 - nri-controller add second network interface when pod created.
-- octopus manages secure tunnels between hub and clusters, sync multi cluster services related resource across clusters
 - crossdns provides DNS discovery of Services across clusters.
 
 ## Architecture
@@ -20,13 +19,6 @@ We use hub cluster to exchange MCS related resources for connecting clusters, an
 all other participating clusters. Hub defines a set of ServiceAccount, Secrets and RBAC to enable `Syncer` and
 `octopus`to securely access the Hub cluster's API.
 
-## Octopus
-
-Octopus maintains the tunnels by using of [WireGuard](https://www.wireguard.com/), a performant and secure VPN
-in`CNF pod`. The `CNF pod` can run on any node without specifically designated. `CNF pod` will generate key pairs
-every time it starts, creates and up wiregurad network interface and config the wireguard device with `peer` CRD.
-
-
 For develop guide, workflow show as.
 
 ![](doc/pic/tunnel.png)

deploy/cluster/templates/cnf-cluster.yaml

@@ -1,3 +1,9 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ .Values.cluster.localnamespace }}
+---
 kind: DaemonSet
 apiVersion: apps/v1
 metadata:

deploy/hub/templates/cnf-hub.yaml

@@ -1,3 +1,9 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ .Values.cluster.sharenamespace }}
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:

deploy/hub/templates/service.yaml

@@ -1,4 +1,3 @@
-{{- if .Values.cluster.hub -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -16,5 +15,4 @@ spec:
       nodePort: {{ .Values.service.nodePort }}
   selector:
     app: cnf-nauti
-    cnf-leader: "true"
-{{- end }}
+    router.nauti.io/leader: "true"