Update CI tools versions to work with K8s v24, go 1.18

This commit will:

- Update KinD K8s image to v1.24
- Add golangci config file and fix linting
- Update CI workflows to enable Docker clean-up step when running locally (self-hosted runners)
- Enable GithubActions workflow to pull images from local registry when in private repo
- Enable docker image clean-up step in GithubActions workflow.
- Adding make image step in go-build workflow.

Author: togashidm

.github/scripts/e2e_get_tools.sh

@@ -2,7 +2,7 @@
 set -o errexit
 
 root="$(dirname "$0")/../../"
-VERSION="v0.11.1"
+VERSION="v0.14.0"
 KIND_BINARY_URL="https://github.com/kubernetes-sigs/kind/releases/download/${VERSION}/kind-$(uname)-amd64"
 K8_STABLE_RELEASE_URL="https://storage.googleapis.com/kubernetes-release/release/stable.txt"
 

.github/scripts/e2e_setup_cluster.sh

@@ -12,8 +12,8 @@ K8_ADDITIONS_PATH="${root}/.github/scripts/policies"
 TMP_DIR="${root}/tmp"
 CNIS_DAEMONSET_URL="https://raw.githubusercontent.com/intel/multus-cni/master/e2e/cni-install.yml"
 CNIS_NAME="cni-plugins"
-# running the latest available image my default, unless instructured to
-KIND_IMAGE="kindest/node:v1.23.0@sha256:49824ab1727c04e56a21a5d8372a402fcd32ea51ac96a2706a12af38934f81ac"
+# running the latest available image my default, unless instructed to
+KIND_IMAGE="kindest/node:v1.24.0@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e"
 [ -n "$1" ] && KIND_IMAGE=$1
 
 # private registry set-up variables

.github/workflows/end-to-end-test.yaml

@@ -6,15 +6,15 @@ on:
       goVersion:
         required: false
         type: string
-        default: 1.17
+        default: 1.18
       kindversion:
         required: false
         type: string
-        default: v0.11.1
+        default: v0.14.0
       imagehash:
         required: false
         type: string
-        default: kindest/node:v1.23.0@sha256:49824ab1727c04e56a21a5d8372a402fcd32ea51ac96a2706a12af38934f81ac
+        default: kindest/node:v1.24.0@sha256:0866296e693efe1fed79d5e6c7af8df71fc73ae45e3679af05342239cdc5bc8e
       runson:
         required: false
         type: string

.github/workflows/go-build-and-test.yml

@@ -10,7 +10,7 @@ on:
       goVersion:
         required: false
         type: string
-        default: 1.17
+        default: 1.18
 
 jobs:
   build-test:
@@ -22,7 +22,9 @@ jobs:
         with:
           go-version: ${{ inputs.goVersion }}
       - name: Build
-        run: make test
-      - name: Test
         run: make build
+      - name: Image
+        run: make image
+      - name: Test
+        run: make test
 

.github/workflows/static-analysis.yaml

@@ -22,19 +22,19 @@ on:
       goVersion:
         required: false
         type: string
-        default: 1.17
+        default: 1.18
       hadolintVersion:
         required: false
         type: string
-        default: v2.8.0
+        default: v2.10.0
       goLangCIVersion:
         required: false
         type: string
-        default: v1.42.1
+        default: v1.46.2
       goImportsVersion:
         required: false
         type: string
-        default: v0.1.9
+        default: v0.1.10
 jobs:
   shellcheck:
     name: Shellcheck
@@ -96,4 +96,5 @@ jobs:
           skip-go-installation: true
           working-directory: ${{matrix.workingdir }}
           # Additional linting tools can be added here
-          args: --enable=golint --timeout=5m
+          args: --timeout=5m -v --color='always'
+

.github/workflows/workflow.yaml

@@ -37,4 +37,5 @@ jobs:
     if: ( !contains(github.repository, '/platform-aware-scheduling') && github.event_name == 'pull_request' )
     with:
       runson: self-hosted-kind
+      cleanup: true
       isLocal: "true"

.golangci.yml

@@ -0,0 +1,65 @@
+run:
+  tests: true
+  max-issues-per-linter: 0
+  max-same-issues: 0
+
+linters:
+  enable-all: true
+  disable:
+    - paralleltest
+    - gomoddirectives
+    - exhaustivestruct
+    - exhaustruct
+    - nonamedreturns
+    - varnamelen
+    - gofumpt
+    - godox
+    - gci
+    - gocognit
+    - unparam
+    - cyclop
+    - forcetypeassert
+    - exhaustive
+    - testpackage
+    - thelper
+    - ireturn
+    - containedctx
+    - maintidx
+    - typecheck
+    - gochecknoglobals
+
+linters-settings:
+  gofmt:
+    simplify: true
+  gofumpt:
+    lang-version: "1.17"
+  golint:
+    min-confidence: 0.9
+  govet:
+    check-shadowing: true
+#    enable:
+#      - "fieldalignment"
+  gocyclo:
+    min-complexity: 18
+  gocognit:
+    min-complexity: 31
+  funlen:
+    lines: 70
+  cyclop:
+    max-complexity: 12
+  lll:
+    line-length: 160
+  nestif:
+    min-complexity: 7
+
+issues:
+  exclude-rules:
+    - path: _test\.go
+      linters:
+        # Until the testing package allows pinning variables disable scopelint
+        # for tests. See https://github.com/kyoh86/scopelint/issues/4.
+        - scopelint
+        - funlen
+        - goimports
+        - gofmt
+

extender/client.go

@@ -1,6 +1,7 @@
 package extender
 
 import (
+	"fmt"
 	"log"
 
 	"k8s.io/client-go/kubernetes"
@@ -13,14 +14,17 @@ func GetKubeClient(kubeConfig string) (kubernetes.Interface, *rest.Config, error
 	clientConfig, err := rest.InClusterConfig()
 	if err != nil {
 		log.Print("not in cluster - trying file-based configuration")
+
 		clientConfig, err = clientcmd.BuildConfigFromFlags("", kubeConfig)
 		if err != nil {
-			return nil, nil, err
+			return nil, nil, fmt.Errorf("failed to get clientconfig: %w", err)
 		}
 	}
+
 	kubeClient, err := kubernetes.NewForConfig(clientConfig)
 	if err != nil {
-		return nil, nil, err
+		return nil, nil, fmt.Errorf("failed to get kubeclient: %w", err)
 	}
+
 	return kubeClient, clientConfig, nil
 }

extender/scheduler.go

@@ -11,12 +11,20 @@ import (
 	"k8s.io/klog/v2"
 )
 
+const (
+	l2           = 2
+	readTimeout  = 5
+	writeTimeout = 10
+	maxHeader    = 1000
+)
+
 // postOnly check if the method type is POST.
 func postOnly(next http.HandlerFunc) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		if r.Method != http.MethodPost {
 			w.WriteHeader(http.StatusMethodNotAllowed)
-			klog.V(2).InfoS("method Type not POST", "component", "extender")
+			klog.V(l2).InfoS("method Type not POST", "component", "extender")
+
 			return
 		}
 
@@ -29,7 +37,8 @@ func contentLength(next http.HandlerFunc) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		if r.ContentLength > 1*1000*1000*1000 {
 			w.WriteHeader(http.StatusInternalServerError)
-			klog.V(2).InfoS("request size too large", "component", "extender")
+			klog.V(l2).InfoS("request size too large", "component", "extender")
+
 			return
 		}
 
@@ -43,7 +52,8 @@ func requestContentType(next http.HandlerFunc) http.HandlerFunc {
 		requestContentType := r.Header.Get("Content-Type")
 		if requestContentType != "application/json" {
 			w.WriteHeader(http.StatusNotFound)
-			klog.V(2).InfoS("request content type not application/json", "component", "extender")
+			klog.V(l2).InfoS("request content type not application/json", "component", "extender")
+
 			return
 		}
 
@@ -76,7 +86,7 @@ func handlerWithMiddleware(handle http.HandlerFunc) http.HandlerFunc {
 
 // error handler deals with requests sent to an invalid endpoint and returns a 404.
 func errorHandler(w http.ResponseWriter, r *http.Request) {
-	klog.V(2).InfoS("Requested resource: '"+r.URL.Path+"' not found", "component", "extender")
+	klog.V(l2).InfoS("Requested resource: '"+r.URL.Path+"' not found", "component", "extender")
 	w.Header().Add("Content-Type", "application/json")
 	w.WriteHeader(http.StatusNotFound)
 }
@@ -89,29 +99,34 @@ func (m Server) StartServer(port string, certFile string, keyFile string, caFile
 	mx.HandleFunc("/scheduler/prioritize", handlerWithMiddleware(m.Prioritize))
 	mx.HandleFunc("/scheduler/filter", handlerWithMiddleware(m.Filter))
 	mx.HandleFunc("/scheduler/bind", handlerWithMiddleware(m.Bind))
+
 	var err error
+
 	if unsafe {
-		klog.V(2).InfoS("Extender Listening on HTTP "+port, "component", "extender")
+		klog.V(l2).InfoS("Extender Listening on HTTP "+port, "component", "extender")
+
 		err = http.ListenAndServe(":"+port, mx)
 		if err != nil {
-			klog.V(2).InfoS("Listening on HTTP failed: "+err.Error(), "component", "extender")
+			klog.V(l2).InfoS("Listening on HTTP failed: "+err.Error(), "component", "extender")
 		}
 	} else {
 		srv := configureSecureServer(port, caFile)
 		srv.Handler = mx
-		klog.V(2).InfoS("Extender Listening on HTTPS "+port, "component", "extender")
+		klog.V(l2).InfoS("Extender Listening on HTTPS "+port, "component", "extender")
 
 		klog.Fatal(srv.ListenAndServeTLS(certFile, keyFile))
 	}
-	klog.V(2).InfoS("Scheduler extender server failed to start "+err.Error(), "component", "extender")
+
+	klog.V(l2).InfoS("Scheduler extender server failed to start "+err.Error(), "component", "extender")
 }
 
 // Configuration values including algorithms etc for the TAS scheduling endpoint.
 func configureSecureServer(port string, caFile string) *http.Server {
 	caCert, err := ioutil.ReadFile(caFile)
 	if err != nil {
-		klog.V(2).InfoS("caCert read failed: "+err.Error(), "component", "extender")
+		klog.V(l2).InfoS("caCert read failed: "+err.Error(), "component", "extender")
 	}
+
 	caCertPool := x509.NewCertPool()
 	caCertPool.AppendCertsFromPEM(caCert)
 
@@ -133,11 +148,12 @@ func configureSecureServer(port string, caFile string) *http.Server {
 	srv := &http.Server{
 		Addr:              ":" + port,
 		Handler:           nil,
-		ReadHeaderTimeout: 5 * time.Second,
-		WriteTimeout:      10 * time.Second,
-		MaxHeaderBytes:    1000,
+		ReadHeaderTimeout: readTimeout * time.Second,
+		WriteTimeout:      writeTimeout * time.Second,
+		MaxHeaderBytes:    maxHeader,
 		TLSConfig:         cfg,
 		TLSNextProto:      make(map[string]func(*http.Server, *tls.Conn, http.Handler)),
 	}
+
 	return srv
 }

extender/types.go

@@ -39,14 +39,14 @@ type FailedNodesMap map[string]string
 // Args represents the arguments needed by the extender to Filter/Prioritize
 // nodes for a pod.
 type Args struct {
-	// Pod being scheduled
-	Pod v1.Pod
 	// List of candidate nodes where the pod can be scheduled; to be populated
 	// only if ExtenderConfig.NodeCacheCapable == false
 	Nodes *v1.NodeList
 	// List of candidate node names where the pod can be scheduled; to be
 	// populated only if ExtenderConfig.NodeCacheCapable == true
 	NodeNames *[]string
+	// Pod being scheduled
+	Pod v1.Pod
 }
 
 // FilterResult stores the result from extender to be sent as response.