Rebase with upstream (#9)

* removed kong ingress documentation * switch to an active mirror * cluster: drop DisableLocalStorageCapacityIsolation it was used to workaround a kubelet crash issue with rootless providers. The Kubelet seems to work fine now with localStorageCapacityIsolation enabled in a user namespace so drop the special handling. After this change, ephemeral storage can be used in a rootless cluster. Closes: kubernetes-sigs#3359 Signed-off-by: Giuseppe Scrivano <[email protected]> * e2e-k8s.sh: support --ginkgo.label-filter The label filter query is more expressive (logical operations) and readable (no regexp unless absolutely required). Such a query can be combined with focus + skip, but in practice a single label filter can replace both of those and is easier to understand. Kubernetes has supported ginkgo v2 and thus --label-filter since v1.25.0. This makes it safe to pass that command line flag unconditionally when invoking the E2E suite. * Clean up GitHub Action definitions This defines a local action for the common actions performed by most of our workflows. This reduces duplication between them to make sure they are consistent, and also make the workflow definitions more concise to just the operations that are unique to the particular testing activities. Signed-off-by: Sean McGinnis <[email protected]> --------- Signed-off-by: Giuseppe Scrivano <[email protected]> Signed-off-by: Sean McGinnis <[email protected]> Co-authored-by: Kundan Kumar <[email protected]> Co-authored-by: Benjamin Elder <[email protected]> Co-authored-by: Giuseppe Scrivano <[email protected]> Co-authored-by: Patrick Ohly <[email protected]> Co-authored-by: Sean McGinnis <[email protected]>
bermuda-sunfish · Jun 13, 2024 · 5198005 · 5198005
1 parent d0bbb5e
commit 5198005
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 145 deletions.
diff --git a/.github/actions/setup-env/action.yaml b/.github/actions/setup-env/action.yaml
@@ -0,0 +1,34 @@
+name: "Setup environment"
+description: "Performs common setup operations."
+runs:
+  using: "composite"
+  steps:
+    - name: Get go version
+      id: golangversion
+      run: |
+        echo "go_version=$(cat .go-version)" >> "$GITHUB_OUTPUT"
+      shell: bash
+
+    - name: Set up Go
+      id: go
+      uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+      with:
+        go-version: ${{ steps.golangversion.outputs.go_version }}
+        check-latest: true
+
+    - name: Install kind
+      run: sudo make install INSTALL_DIR=/usr/local/bin
+      shell: bash
+
+    - name: Install kubectl
+      run: |
+        curl -LO https://dl.k8s.io/release/$(curl -sL https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl
+        chmod +x ./kubectl
+        sudo mv ./kubectl /usr/local/bin/kubectl
+      shell: bash
+
+    - name: Enable ipv4 and ipv6 forwarding
+      run: |
+        sudo sysctl -w net.ipv6.conf.all.forwarding=1
+        sudo sysctl -w net.ipv4.ip_forward=1
+      shell: bash
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -28,31 +28,7 @@ jobs:
       - name: Check out code into the Go module directory
         uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
 
-      - name: Get go version
-        id: golangversion
-        run: |
-          echo "go_version=$(cat .go-version)" >> "$GITHUB_OUTPUT"
-
-      - name: Set up Go
-        id: go
-        uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
-        with:
-          go-version: ${{ steps.golangversion.outputs.go_version }}
-          check-latest: true
-
-      - name: Install kind
-        run: sudo make install INSTALL_DIR=/usr/local/bin
-
-      - name: Install kubectl
-        run: |
-          curl -LO https://dl.k8s.io/release/$(curl -sL https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl
-          chmod +x ./kubectl
-          sudo mv ./kubectl /usr/local/bin/kubectl
-
-      - name: Enable ipv4 and ipv6 forwarding
-        run: |
-          sudo sysctl -w net.ipv6.conf.all.forwarding=1
-          sudo sysctl -w net.ipv4.ip_forward=1
+      - uses: ./.github/actions/setup-env
 
       - name: Create single node cluster
         if: ${{ matrix.deployment == 'singleNode' }}

diff --git a/.github/workflows/nerdctl.yaml b/.github/workflows/nerdctl.yaml
@@ -31,34 +31,8 @@ jobs:
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
-        with:
-          fetch-depth: 0
-
-      - name: Get go version
-        id: golangversion
-        run: |
-          echo "go_version=$(cat .go-version)" >> "$GITHUB_OUTPUT"
-
-      - name: Set up Go
-        id: go
-        uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
-        with:
-          go-version: ${{ steps.golangversion.outputs.go_version }}
-          check-latest: true
 
-      - name: Install kind
-        run: sudo make install INSTALL_DIR=/usr/local/bin
-
-      - name: Install kubectl
-        run: |
-          curl -LO https://dl.k8s.io/release/$(curl -sL https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl
-          chmod +x ./kubectl
-          sudo mv ./kubectl /usr/local/bin/kubectl
-
-      - name: Enable ipv4 and ipv6 forwarding
-        run: |
-          sudo sysctl -w net.ipv6.conf.all.forwarding=1
-          sudo sysctl -w net.ipv4.ip_forward=1
+      - uses: ./.github/actions/setup-env
 
       - name: Install nerdctl
         run: |

diff --git a/.github/workflows/podman.yml b/.github/workflows/podman.yml
@@ -31,34 +31,8 @@ jobs:
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
-        with:
-          fetch-depth: 0
-
-      - name: Get go version
-        id: golangversion
-        run: |
-          echo "go_version=$(cat .go-version)" >> "$GITHUB_OUTPUT"
-
-      - name: Set up Go
-        id: go
-        uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
-        with:
-          go-version: ${{ steps.golangversion.outputs.go_version }}
-          check-latest: true
 
-      - name: Install kind
-        run: sudo make install INSTALL_DIR=/usr/local/bin
-
-      - name: Install kubectl
-        run: |
-          curl -LO https://dl.k8s.io/release/$(curl -sL https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl
-          chmod +x ./kubectl
-          sudo mv ./kubectl /usr/local/bin/kubectl
-
-      - name: Enable ipv4 and ipv6 forwarding
-        run: |
-          sudo sysctl -w net.ipv6.conf.all.forwarding=1
-          sudo sysctl -w net.ipv4.ip_forward=1
+      - uses: ./.github/actions/setup-env
 
       - name: Setup podman
         run: |

diff --git a/.github/workflows/vm.yaml b/.github/workflows/vm.yaml
@@ -14,7 +14,7 @@ permissions:
 jobs:
   vm:
     # Fedora is different from Ubuntu in LSM (SELinux), filesystem (btrfs), kernel version, etc.
-    name: "VM (Fedora)"
+    name: "CGroupv2 (Fedora)"
     runs-on: ubuntu-22.04
     timeout-minutes: 30
     strategy:

diff --git a/hack/ci/Vagrantfile b/hack/ci/Vagrantfile
@@ -7,7 +7,7 @@ Vagrant.configure("2") do |config|
   # so we specify the URL explicitly.
   # Mirrors can be found at here: https://admin.fedoraproject.org/mirrormanager/mirrors/Fedora/37/x86_64
   config.vm.box = "dummy"
-  config.vm.box_url = "https://iad.mirror.rackspace.com/fedora/releases/37/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-37-1.7.x86_64.vagrant-virtualbox.box"
+  config.vm.box_url = "https://mirror.math.princeton.edu/pub/fedora-archive/fedora/linux/releases/37/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-37-1.7.x86_64.vagrant-virtualbox.box"
   # assume some ram is needed for the host environment but very little CPU
   memory = 10240
   cpus = 3

diff --git a/hack/ci/e2e-k8s.sh b/hack/ci/e2e-k8s.sh
@@ -22,6 +22,12 @@ set -o errexit -o nounset -o xtrace
 # Settings:
 # SKIP: ginkgo skip regex
 # FOCUS: ginkgo focus regex
+# LABEL_FILTER: ginkgo label query for selecting tests (see "Spec Labels" in https://onsi.github.io/ginkgo/#filtering-specs)
+#
+# The default is to focus on conformance tests. Serial tests get skipped when
+# parallel testing is enabled. Using LABEL_FILTER instead of combining SKIP and
+# FOCUS is recommended (more expressive, easier to read than regexp).
+#
 # GA_ONLY: true  - limit to GA APIs/features as much as possible
 #          false - (default) APIs and features left at defaults
 # FEATURE_GATES:
@@ -237,9 +243,13 @@ run_tests() {
     printf '%s' "${fixed_coredns}" | kubectl apply -f -
   fi
 
-  # ginkgo regexes
+  # ginkgo regexes and label filter
   SKIP="${SKIP:-}"
-  FOCUS="${FOCUS:-"\\[Conformance\\]"}"
+  FOCUS="${FOCUS:-}"
+  LABEL_FILTER="${LABEL_FILTER:-}"
+  if [ -z "${FOCUS}" ] && [ -z "${LABEL_FILTER}" ]; then
+    FOCUS="\\[Conformance\\]"
+  fi
   # if we set PARALLEL=true, skip serial tests set --ginkgo-parallel
   if [ "${PARALLEL:-false}" = "true" ]; then
     export GINKGO_PARALLEL=y
@@ -262,7 +272,7 @@ run_tests() {
   # interrupt
   ./hack/ginkgo-e2e.sh \
     '--provider=skeleton' "--num-nodes=${NUM_NODES}" \
-    "--ginkgo.focus=${FOCUS}" "--ginkgo.skip=${SKIP}" \
+    "--ginkgo.focus=${FOCUS}" "--ginkgo.skip=${SKIP}" "--ginkgo.label-filter=${LABEL_FILTER}" \
     "--report-dir=${ARTIFACTS}" '--disable-log-dump=true' &
   GINKGO_PID=$!
   wait "$GINKGO_PID"

diff --git a/pkg/cluster/internal/kubeadm/config.go b/pkg/cluster/internal/kubeadm/config.go
@@ -79,10 +79,6 @@ type ConfigData struct {
 	// RootlessProvider is true if kind is running with rootless mode
 	RootlessProvider bool
 
-	// DisableLocalStorageCapacityIsolation is typically set true based on RootlessProvider
-	// based on the Kubernetes version, if true kubelet localStorageCapacityIsolation is set false
-	DisableLocalStorageCapacityIsolation bool
-
 	// DerivedConfigData contains fields computed from the other fields for use
 	// in the config templates and should only be populated by calling Derive()
 	DerivedConfigData
@@ -453,7 +449,6 @@ evictionHard:
 {{ range $index, $gate := .SortedFeatureGates }}
   "{{ (StructuralData $gate.Name) }}": {{ $gate.Value }}
 {{end}}{{end}}
-{{if .DisableLocalStorageCapacityIsolation}}localStorageCapacityIsolation: false{{end}}
 {{if ne .KubeProxyMode "none"}}
 ---
 apiVersion: kubeproxy.config.k8s.io/v1alpha1
@@ -505,16 +500,6 @@ func Config(data ConfigData) (config string, err error) {
 			return "", errors.Errorf("version %q is not compatible with rootless provider (hint: kind v0.11.x may work with this version)", ver)
 		}
 		data.FeatureGates["KubeletInUserNamespace"] = true
-
-		// For avoiding err="failed to get rootfs info: failed to get device for dir \"/var/lib/kubelet\": could not find device with major: 0, minor: 41 in cached partitions map"
-		// https://github.com/kubernetes-sigs/kind/issues/2524
-		if ver.LessThan(version.MustParseSemantic("v1.25.0-alpha.3.440+0064010cddfa00")) {
-			// this feature gate was removed in v1.25 and replaced by an opt-out to disable
-			data.FeatureGates["LocalStorageCapacityIsolation"] = false
-		} else {
-			// added in v1.25 https://github.com/kubernetes/kubernetes/pull/111513
-			data.DisableLocalStorageCapacityIsolation = true
-		}
 	}
 
 	// assume the latest API version, then fallback if the k8s version is too low

diff --git a/site/content/docs/user/ingress.md b/site/content/docs/user/ingress.md
@@ -83,52 +83,6 @@ Note, the example in [Using Ingress](#using-ingress) will not work with Contour
 
 Additional information about Contour can be found at: [projectcontour.io](https://projectcontour.io)
 
-### Ingress Kong
-
-Deploy [Kong Ingress Controller (KIC)](https://docs.konghq.com/kubernetes-ingress-controller/2.1.x/concepts/design/).
-
-{{< codeFromInline lang="bash" >}}
-kubectl apply -f https://raw.githubusercontent.com/Kong/kubernetes-ingress-controller/master/deploy/single/all-in-one-dbless.yaml
-{{< /codeFromInline >}}
-
-Apply kind specific patches to forward the `hostPorts` to the ingress controller, set taint tolerations, and schedule it to the custom labeled node.
-
-```json
-{{% readFile "static/examples/ingress/kong/deployment.patch.json" %}}
-```
-
-Apply it by running:
-
-{{< codeFromInline lang="bash" >}}
-kubectl patch deployment -n kong proxy-kong -p '{{< minify file="static/examples/ingress/kong/deployment.patch.json" >}}'
-{{< /codeFromInline >}}
-
-Apply kind specific patch to change service type to `NodePort`:
-
-```json
-{{% readFile "static/examples/ingress/kong/service.patch.json" %}}
-```
-
-Apply it by running:
-
-{{< codeFromInline lang="bash" >}}
-kubectl patch service -n kong kong-proxy -p '{{< minify file="static/examples/ingress/kong/service.patch.json" >}}'
-{{< /codeFromInline >}}
-
-KIC can be used to configure ingress now.
-
-You can try the example in [Using Ingress](#using-ingress) at this moment,
-but KIC will not automatically handle `Ingress` object defined there.
-`Ingress` resources must include `ingressClassName: kong` under `spec` of `Ingress`  for being controlled by Kong Ingress Controller (it will be ignored otherwise).
-So once the example has been loaded, you can add this annotation with:
-
-{{< codeFromInline lang="bash" >}}
-kubectl patch ingress example-ingress -p '{"spec":{"ingressClassName":"kong"}}'
-{{< /codeFromInline >}}
-
-Refer [Using Ingress](#using-ingress) for primary example usage.
-
-
 ### Ingress NGINX
 
 {{< codeFromInline lang="bash" >}}