Merge pull request #144 from 00pf00/k8s-1.24

Adapt to higher version of kubernetes (not less than 1.22)

Author: qyzhaoxun

Makefile

@@ -91,6 +91,10 @@ push.multiarch:
 manifest:
 	@$(MAKE) image.manifest.push
 
+# Generate manifests e.g. CRD, RBAC etc.
+manifests:
+	go run ./vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go object:headerFile=./hack/boilerplate.go.txt paths=./pkg/ipam/apis/... rbac:roleName=controller-perms crd:allowDangerousTypes=true output:crd:artifacts:config=./artifacts/crds
+
 ## manifest.multiarch: Build docker images for multiple platforms and push manifest lists to registry.
 .PHONY: manifest.multiarch
 manifest.multiarch:

artifacts/examples/crd.yaml

@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: floatingips.galaxy.k8s.io
@@ -12,7 +12,7 @@ spec:
     - fip
   scope: Cluster
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: pools.galaxy.k8s.io

build/docker/galaxy-ipam/Dockerfile

@@ -16,7 +16,7 @@
 
 ## global scope TARGETPLATFORM
 ## ref: https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
-FROM --platform=${TARGETPLATFORM} golang:1.14.2 AS builder
+FROM --platform=${TARGETPLATFORM} golang:1.18.2 AS builder
 ARG TARGETPLATFORM
 RUN echo "building for ${TARGETPLATFORM}"
 ARG WORKDIR="/go/src/tkestack.io/galaxy/"

build/docker/galaxy/Dockerfile

@@ -16,7 +16,7 @@
 
 ## global scope TARGETPLATFORM
 ## ref: https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
-FROM --platform=${TARGETPLATFORM} golang:1.14.2 AS builder
+FROM --platform=${TARGETPLATFORM} golang:1.18.2 AS builder
 ARG TARGETPLATFORM
 RUN echo "building for ${TARGETPLATFORM}"
 ARG WORKDIR="/go/src/tkestack.io/galaxy/"

build/lib/build.sh

@@ -30,8 +30,8 @@ OUTPUT_DIR=${OUTPUT_DIR:-"${ROOT_DIR}/_output"}
 BIN_DIR=${OUTPUT_DIR}/bin-${ARCH}
 mkdir -p ${BIN_DIR}
 
-CNI_VERSION="v0.6.0"
-CNI_BIN=https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-${ARCH}-${CNI_VERSION}.tgz
+CNI_VERSION="v0.8.0"
+CNI_BIN=https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-linux-amd64-${CNI_VERSION}.tgz
 
 function build::get_basic_cni() {
   local BIN_PREFIX="galaxy"

build/lib/golang.mk

@@ -18,9 +18,9 @@
 # Makefile helper functions for golang
 #
 
-GO_IMAGE := golang:1.14.2
+GO_IMAGE := golang:1.18.2
 GO := go
-GO_SUPPORTED_VERSIONS ?= 1.11|1.12|1.13|1.14
+GO_SUPPORTED_VERSIONS ?= 1.14|1.18
 GO_LDFLAGS += -X $(VERSION_PACKAGE).GIT_COMMIT=$(GIT_COMMIT) \
 	-X $(VERSION_PACKAGE).GO_VERSION=$(shell go version | awk '{print $$3}') \
 	-X $(VERSION_PACKAGE).BUILD_TIME=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ') 

cmd/galaxy-ipam/galaxy-ipam.go

@@ -25,6 +25,8 @@ import (
 	"github.com/spf13/pflag"
 	"k8s.io/component-base/cli/flag"
 	"k8s.io/component-base/logs"
+	glog "k8s.io/klog"
+
 	"tkestack.io/galaxy/pkg/ipam/server"
 	"tkestack.io/galaxy/pkg/utils/ldflags"
 )
@@ -37,6 +39,7 @@ func main() {
 	// add command line args
 	s.AddFlags(pflag.CommandLine)
 
+	glog.InitFlags(nil)
 	flag.InitFlags()
 	logs.InitLogs()
 	defer logs.FlushLogs()

cmd/galaxy/galaxy.go

@@ -24,6 +24,7 @@ import (
 	"k8s.io/component-base/cli/flag"
 	"k8s.io/component-base/logs"
 	glog "k8s.io/klog"
+
 	"tkestack.io/galaxy/pkg/galaxy"
 	"tkestack.io/galaxy/pkg/signal"
 	"tkestack.io/galaxy/pkg/utils/ldflags"
@@ -35,6 +36,7 @@ func main() {
 	galaxy := galaxy.NewGalaxy()
 	// add command line args
 	galaxy.AddFlags(pflag.CommandLine)
+	glog.InitFlags(nil)
 	flag.InitFlags()
 	logs.InitLogs()
 	defer logs.FlushLogs()

cni/tke-route-eni/driver.go

@@ -1,3 +1,5 @@
+//go:build linux
+
 /*
  * Tencent is pleased to support the open source community by making TKEStack available.
  *
@@ -14,7 +16,6 @@
  * WARRANTIES OF ANY KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations under the License.
  */
-// +build linux
 
 package main
 

cni/underlay/veth/veth.go

@@ -3,6 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/containernetworking/cni/pkg/types/current"
 	"net"
 	"runtime"
 
@@ -102,5 +103,24 @@ func cmdAdd(args *skel.CmdArgs) error {
 	}
 	args.IfName = ifName
 	result, _ := t020.GetResult(results[0])
-	return result.Print()
+	if conf.CNIVersion == result.CNIVersion || conf.CNIVersion == "" {
+		return result.Print()
+	}
+
+	currentResult := &current.Result{}
+	currentResult.IPs = []*current.IPConfig{
+		{
+			Version: "4",
+			Gateway: result.IP4.Gateway,
+			Address: result.IP4.IP,
+		},
+	}
+	currentResult.Routes = []*types.Route{}
+
+	for _, r := range result.IP4.Routes {
+		currentResult.Routes = append(currentResult.Routes, &r)
+	}
+	currentResult.CNIVersion = conf.CNIVersion
+	currentResult.DNS = result.DNS
+	return currentResult.Print()
 }