Support k8s version 1.24 and 1.25 (#647)

Praveenrajmani · web-flow · commit a3cf8b863f8d · 2022-09-22T10:04:23.000-07:00
Migrate psp to built-in podSecurityPolicy admission controller Fixes #631 Fixes #632
diff --git a/.github/workflows/functional-test-1.19.16-ubuntu-18.04.yaml b/.github/workflows/functional-test-1.19.16-ubuntu-18.04.yaml
@@ -50,9 +50,9 @@ jobs:
           docker build -t quay.io/minio/directpv:${BUILD_TAG} .
 
       - name: Setup Minikube
-        uses: manusa/actions-setup-minikube@v2.4.3
+        uses: manusa/actions-setup-minikube@v2.7.0
         with:
-          minikube version: 'v1.24.0'
+          minikube version: 'v1.27.0'
           kubernetes version: 'v1.19.16'
           github token: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.github/workflows/functional-test-1.19.16.yaml b/.github/workflows/functional-test-1.19.16.yaml
@@ -50,9 +50,9 @@ jobs:
           docker build -t quay.io/minio/directpv:${BUILD_TAG} .
 
       - name: Setup Minikube
-        uses: manusa/actions-setup-minikube@v2.4.3
+        uses: manusa/actions-setup-minikube@v2.7.0
         with:
-          minikube version: 'v1.24.0'
+          minikube version: 'v1.27.0'
           kubernetes version: 'v1.19.16'
           github token: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.github/workflows/functional-test-1.20.14-ubuntu-18.04.yaml b/.github/workflows/functional-test-1.20.14-ubuntu-18.04.yaml
@@ -50,9 +50,9 @@ jobs:
           docker build -t quay.io/minio/directpv:${BUILD_TAG} .
 
       - name: Setup Minikube
-        uses: manusa/actions-setup-minikube@v2.4.3
+        uses: manusa/actions-setup-minikube@v2.7.0
         with:
-          minikube version: 'v1.24.0'
+          minikube version: 'v1.27.0'
           kubernetes version: 'v1.20.14'
           github token: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.github/workflows/functional-test-1.20.14.yaml b/.github/workflows/functional-test-1.20.14.yaml
@@ -50,9 +50,9 @@ jobs:
           docker build -t quay.io/minio/directpv:${BUILD_TAG} .
 
       - name: Setup Minikube
-        uses: manusa/actions-setup-minikube@v2.4.3
+        uses: manusa/actions-setup-minikube@v2.7.0
         with:
-          minikube version: 'v1.24.0'
+          minikube version: 'v1.27.0'
           kubernetes version: 'v1.20.14'
           github token: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.github/workflows/functional-test-1.21.8-ubuntu-18.04.yaml b/.github/workflows/functional-test-1.21.8-ubuntu-18.04.yaml
@@ -50,9 +50,9 @@ jobs:
           docker build -t quay.io/minio/directpv:${BUILD_TAG} .
 
       - name: Setup Minikube
-        uses: manusa/actions-setup-minikube@v2.4.3
+        uses: manusa/actions-setup-minikube@v2.7.0
         with:
-          minikube version: 'v1.24.0'
+          minikube version: 'v1.27.0'
           kubernetes version: 'v1.21.8'
           github token: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.github/workflows/functional-test-1.21.8.yaml b/.github/workflows/functional-test-1.21.8.yaml
@@ -50,9 +50,9 @@ jobs:
           docker build -t quay.io/minio/directpv:${BUILD_TAG} .
 
       - name: Setup Minikube
-        uses: manusa/actions-setup-minikube@v2.4.3
+        uses: manusa/actions-setup-minikube@v2.7.0
         with:
-          minikube version: 'v1.24.0'
+          minikube version: 'v1.27.0'
           kubernetes version: 'v1.21.8'
           github token: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.github/workflows/functional-test-1.22.5-ubuntu-18.04.yaml b/.github/workflows/functional-test-1.22.5-ubuntu-18.04.yaml
@@ -50,9 +50,9 @@ jobs:
           docker build -t quay.io/minio/directpv:${BUILD_TAG} .
 
       - name: Setup Minikube
-        uses: manusa/actions-setup-minikube@v2.4.3
+        uses: manusa/actions-setup-minikube@v2.7.0
         with:
-          minikube version: 'v1.24.0'
+          minikube version: 'v1.27.0'
           kubernetes version: 'v1.22.5'
           github token: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.github/workflows/functional-test-1.22.5.yaml b/.github/workflows/functional-test-1.22.5.yaml
@@ -50,9 +50,9 @@ jobs:
           docker build -t quay.io/minio/directpv:${BUILD_TAG} .
 
       - name: Setup Minikube
-        uses: manusa/actions-setup-minikube@v2.4.3
+        uses: manusa/actions-setup-minikube@v2.7.0
         with:
-          minikube version: 'v1.24.0'
+          minikube version: 'v1.27.0'
           kubernetes version: 'v1.22.5'
           github token: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.github/workflows/functional-test-1.23.3-ubuntu-18.04.yaml b/.github/workflows/functional-test-1.23.3-ubuntu-18.04.yaml
@@ -50,9 +50,9 @@ jobs:
           docker build -t quay.io/minio/directpv:${BUILD_TAG} .
 
       - name: Setup Minikube
-        uses: manusa/actions-setup-minikube@v2.4.3
+        uses: manusa/actions-setup-minikube@v2.7.0
         with:
-          minikube version: 'v1.24.0'
+          minikube version: 'v1.27.0'
           kubernetes version: 'v1.23.3'
           github token: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.github/workflows/functional-test-1.23.3.yaml b/.github/workflows/functional-test-1.23.3.yaml
@@ -50,9 +50,9 @@ jobs:
           docker build -t quay.io/minio/directpv:${BUILD_TAG} .
 
       - name: Setup Minikube
-        uses: manusa/actions-setup-minikube@v2.4.3
+        uses: manusa/actions-setup-minikube@v2.7.0
         with:
-          minikube version: 'v1.24.0'
+          minikube version: 'v1.27.0'
           kubernetes version: 'v1.23.3'
           github token: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.github/workflows/functional-test-1.24.4-ubuntu-18.04.yaml b/.github/workflows/functional-test-1.24.4-ubuntu-18.04.yaml
@@ -1,4 +1,4 @@
-name: Testing on k8s v1.18.20 (Ubuntu 18.04)
+name: Testing on k8s v1.24.4 (Ubuntu 18.04)
 
 on:
   push:
@@ -50,10 +50,10 @@ jobs:
           docker build -t quay.io/minio/directpv:${BUILD_TAG} .
 
       - name: Setup Minikube
-        uses: manusa/actions-setup-minikube@v2.4.3
+        uses: manusa/actions-setup-minikube@v2.7.0
         with:
-          minikube version: 'v1.24.0'
-          kubernetes version: 'v1.18.20'
+          minikube version: 'v1.27.0'
+          kubernetes version: 'v1.24.4'
           github token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Check Minikube
diff --git a/.github/workflows/functional-test-1.24.4.yaml b/.github/workflows/functional-test-1.24.4.yaml
@@ -1,4 +1,4 @@
-name: Testing on k8s v1.18.20
+name: Testing on k8s v1.24.4
 
 on:
   push:
@@ -50,10 +50,10 @@ jobs:
           docker build -t quay.io/minio/directpv:${BUILD_TAG} .
 
       - name: Setup Minikube
-        uses: manusa/actions-setup-minikube@v2.4.3
+        uses: manusa/actions-setup-minikube@v2.7.0
         with:
-          minikube version: 'v1.24.0'
-          kubernetes version: 'v1.18.20'
+          minikube version: 'v1.27.0'
+          kubernetes version: 'v1.24.4'
           github token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Check Minikube
diff --git a/.github/workflows/functional-test-1.25.1-ubuntu-18.04.yaml b/.github/workflows/functional-test-1.25.1-ubuntu-18.04.yaml
@@ -0,0 +1,66 @@
+name: Testing on k8s v1.25.1 (Ubuntu 18.04)
+
+on:
+  push:
+    branches: [ master ]
+
+  pull_request:
+    branches: [ master ]
+
+# This ensures that previous jobs for the PR are canceled when the PR is
+# updated.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+    timeout-minutes: 60
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v2
+        with:
+          go-version: 1.18.x
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install jq -y
+          jq --version
+
+      - name: Set environment
+        run: |
+          echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
+          mkdir -p "$(go env GOPATH)/src/github.com/minio/"
+          ln -s "$PWD" "$(go env GOPATH)/src/github.com/minio/directpv"
+          echo "VERSION=$(git describe --tags --always --dirty)" >> $GITHUB_ENV
+
+      - name: Build binaries
+        env:
+          CGO_ENABLED: 0
+          GO111MODULE: on
+        run: |
+          go build -tags "osusergo netgo static_build" -ldflags="-X main.Version=${VERSION} -extldflags=-static" github.com/minio/directpv/cmd/directpv
+          go build -tags "osusergo netgo static_build" -ldflags="-X main.Version=${VERSION} -extldflags=-static" github.com/minio/directpv/cmd/kubectl-direct_csi
+          echo "BUILD_TAG=v0.0.0-$(./directpv --version)" >> $GITHUB_ENV
+
+      - name: Build docker image
+        run: |
+          docker build -t quay.io/minio/directpv:${BUILD_TAG} .
+
+      - name: Setup Minikube
+        uses: manusa/actions-setup-minikube@v2.7.0
+        with:
+          minikube version: 'v1.27.0'
+          kubernetes version: 'v1.25.1'
+          github token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check Minikube
+        run: |
+          kubectl get nodes
+          kubectl get pods -A
+
+      - name: Run tests
+        run: |
+          functests/run.sh ${BUILD_TAG}
diff --git a/.github/workflows/functional-test-1.25.1.yaml b/.github/workflows/functional-test-1.25.1.yaml
@@ -0,0 +1,66 @@
+name: Testing on k8s v1.25.1
+
+on:
+  push:
+    branches: [ master ]
+
+  pull_request:
+    branches: [ master ]
+
+# This ensures that previous jobs for the PR are canceled when the PR is
+# updated.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v2
+        with:
+          go-version: 1.18.x
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install jq -y
+          jq --version
+
+      - name: Set environment
+        run: |
+          echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
+          mkdir -p "$(go env GOPATH)/src/github.com/minio/"
+          ln -s "$PWD" "$(go env GOPATH)/src/github.com/minio/directpv"
+          echo "VERSION=$(git describe --tags --always --dirty)" >> $GITHUB_ENV
+
+      - name: Build binaries
+        env:
+          CGO_ENABLED: 0
+          GO111MODULE: on
+        run: |
+          go build -tags "osusergo netgo static_build" -ldflags="-X main.Version=${VERSION} -extldflags=-static" github.com/minio/directpv/cmd/directpv
+          go build -tags "osusergo netgo static_build" -ldflags="-X main.Version=${VERSION} -extldflags=-static" github.com/minio/directpv/cmd/kubectl-direct_csi
+          echo "BUILD_TAG=v0.0.0-$(./directpv --version)" >> $GITHUB_ENV
+
+      - name: Build docker image
+        run: |
+          docker build -t quay.io/minio/directpv:${BUILD_TAG} .
+
+      - name: Setup Minikube
+        uses: manusa/actions-setup-minikube@v2.7.0
+        with:
+          minikube version: 'v1.27.0'
+          kubernetes version: 'v1.25.1'
+          github token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check Minikube
+        run: |
+          kubectl get nodes
+          kubectl get pods -A
+
+      - name: Run tests
+        run: |
+          functests/run.sh ${BUILD_TAG}
diff --git a/functests/tests.sh b/functests/tests.sh
@@ -144,26 +144,29 @@ setup_luks
 echo "$ME: ================================= Run build test ================================="
 test_build
 
-# run v1.4.6 upgrade test only on 18.04 as there was a regression caused in
-# virtual environment version upgrade
-# refer: https://github.com/actions/virtual-environments/issues/5934
-version=$(lsb_release -r | cut -f2)
-if [ "$version" = "18.04" ]; then
-    echo "$ME: ================================= Run upgrade test from v1.4.6 ================================="
-    do_upgrade_test "1.4.6"
-fi
-
-# kubernetes version 1.22+ is not supported in directpv:v2.0.9
-# skipping v2.0.9 upgrade test for v1.22+ versions
+# get the kubernetes version
 minor=$(kubectl version -o json | jq .serverVersion.minor)
 minor=$(echo "$minor" | tr -d '"')
-if [ "$minor" -lt 23 ]; then
-    echo "$ME: ================================= Run upgrade test from v2.0.9 ================================="
-    do_upgrade_test "2.0.9"
-fi
 
-echo "$ME: ================================= Run upgrade test from v3.0.4 ================================="
-do_upgrade_test "3.0.4"
+# skipping upgrade test as directpv versions <= v3.1.0 doesn't support kubernetes v1.25 and above
+if [ "$minor" -lt 25 ]; then
+    # run v1.4.6 upgrade test only on 18.04 as there was a regression caused in
+    # virtual environment version upgrade
+    # refer: https://github.com/actions/virtual-environments/issues/5934
+    version=$(lsb_release -r | cut -f2)
+    if [ "$version" = "18.04" ]; then
+            echo "$ME: ================================= Run upgrade test from v1.4.6 ================================="
+            do_upgrade_test "1.4.6"
+    fi
+    # kubernetes version 1.22+ is not supported in directpv:v2.0.9
+    # skipping v2.0.9 upgrade test for v1.22+ versions
+    if [ "$minor" -lt 23 ]; then
+        echo "$ME: ================================= Run upgrade test from v2.0.9 ================================="
+        do_upgrade_test "2.0.9"
+    fi
+    echo "$ME: ================================= Run upgrade test from v3.0.4 ================================="
+    do_upgrade_test "3.0.4"
+fi
 
 # unmount all direct-csi mounts of previous installation if any.
 mount | awk '/direct-csi/ {print $3}' | xargs sudo umount -fl
diff --git a/pkg/installer/config.go b/pkg/installer/config.go
@@ -86,12 +86,13 @@ type Config struct {
 	// Image pull secrets
 	ImagePullSecrets []string
 
-	// internal
-	conversionWebhookCaBundle []byte
-	validationWebhookCaBundle []byte
-
 	// Drive discovery
 	DisableUDevListener bool
+
+	// internal
+	conversionWebhookCaBundle  []byte
+	validationWebhookCaBundle  []byte
+	enablePodSecurityAdmission bool
 }
 
 type installer interface {
diff --git a/pkg/installer/default.go b/pkg/installer/default.go
diff --git a/pkg/installer/install_test.go b/pkg/installer/install_test.go
diff --git a/pkg/installer/installer.go b/pkg/installer/installer.go
diff --git a/pkg/installer/ns.go b/pkg/installer/ns.go
diff --git a/pkg/installer/v1dot24.go b/pkg/installer/v1dot24.go
diff --git a/pkg/installer/v1dot25.go b/pkg/installer/v1dot25.go
