Merge pull request #2551 from jwcesign/update-kind-to-1.25.0

Update kind to 0.15 to support deploy k8s 1.25 environment
karmada-io · Sep 22, 2022 · 48d9ed1 · 48d9ed1
2 parents 91e4e72 + 4f1436d
commit 48d9ed1
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -86,7 +86,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        k8s: [ v1.21.10, v1.22.7, v1.23.4, v1.24.2 ]
+        k8s: [ v1.21.10, v1.22.7, v1.23.4, v1.24.2, v1.25.0 ]
     steps:
       - name: checkout code
         uses: actions/checkout@v2

diff --git a/artifacts/kindClusterConfig/general-config.yaml b/artifacts/kindClusterConfig/general-config.yaml
@@ -4,8 +4,6 @@ networking:
   disableDefaultCNI: {{disable_cni}}
   podSubnet: {{pod_cidr}}
   serviceSubnet: {{service_cidr}}
-featureGates:
-  EndpointSliceProxying: true
 nodes:
   - role: control-plane
   - role: worker
diff --git a/artifacts/kindClusterConfig/member1.yaml b/artifacts/kindClusterConfig/member1.yaml
@@ -3,7 +3,5 @@ apiVersion: "kind.x-k8s.io/v1alpha4"
 networking:
   podSubnet: "10.10.0.0/16"
   serviceSubnet: "10.11.0.0/16"
-featureGates:
-  EndpointSliceProxying: true
 nodes:
   - role: control-plane
diff --git a/artifacts/kindClusterConfig/member2.yaml b/artifacts/kindClusterConfig/member2.yaml
@@ -3,7 +3,5 @@ apiVersion: "kind.x-k8s.io/v1alpha4"
 networking:
   podSubnet: "10.12.0.0/16"
   serviceSubnet: "10.13.0.0/16"
-featureGates:
-  EndpointSliceProxying: true
 nodes:
   - role: control-plane
diff --git a/hack/deploy-karmada.sh b/hack/deploy-karmada.sh
@@ -125,10 +125,10 @@ function installCRDs() {
     kubectl --context="${context_name}" apply -k "${crd_path}"/_crds
 }
 
-# Use x.x.x.6 IP address, which is the same CIDR with the node address of the Kind cluster,
+# Use x.x.x.8 IP address, which is the same CIDR with the node address of the Kind cluster,
 # as the loadBalancer service address of component karmada-interpreter-webhook-example.
 interpreter_webhook_example_service_external_ip_prefix=$(echo $(util::get_apiserver_ip_from_kubeconfig "${HOST_CLUSTER_NAME}") | awk -F. '{printf "%s.%s.%s",$1,$2,$3}')
-interpreter_webhook_example_service_external_ip_address=${interpreter_webhook_example_service_external_ip_prefix}.6
+interpreter_webhook_example_service_external_ip_address=${interpreter_webhook_example_service_external_ip_prefix}.8
 
 # generate cert
 util::cmd_must_exist "openssl"

diff --git a/hack/local-up-karmada.sh b/hack/local-up-karmada.sh
@@ -40,7 +40,7 @@ util::verify_go_version
 util::cmd_must_exist "docker"
 
 # install kind and kubectl
-kind_version=v0.14.0
+kind_version=v0.15.0
 echo -n "Preparing: 'kind' existence check - "
 if util::cmd_exist kind; then
   echo "passed"

diff --git a/hack/post-run-e2e.sh b/hack/post-run-e2e.sh
@@ -21,8 +21,7 @@ kubectl --context="${HOST_CLUSTER_NAME}" delete -f "${REPO_ROOT}"/examples/custo
 
 # uninstall metallb
 kubectl --context="${HOST_CLUSTER_NAME}" delete configmap config -n metallb-system
-kubectl --context="${HOST_CLUSTER_NAME}" delete -f https://raw.githubusercontent.com/metallb/metallb/v0.12.1/manifests/metallb.yaml
-kubectl --context="${HOST_CLUSTER_NAME}" delete -f https://raw.githubusercontent.com/metallb/metallb/v0.12.1/manifests/namespace.yaml
+kubectl --context="${HOST_CLUSTER_NAME}" delete -f https://raw.githubusercontent.com/metallb/metallb/v0.13.5/config/manifests/metallb-native.yaml
 
 kubectl --context="${HOST_CLUSTER_NAME}" get configmap kube-proxy -n kube-system -o yaml | \
 sed -e "s/strictARP: true/strictARP: false/" | \

diff --git a/hack/pre-run-e2e.sh b/hack/pre-run-e2e.sh
@@ -34,29 +34,30 @@ sed -e "s/strictARP: false/strictARP: true/" | \
 kubectl --context="${HOST_CLUSTER_NAME}" apply -f - -n kube-system
 
 # install metallb by manifest, refer to https://metallb.universe.tf/installation/#installation-by-manifest
-kubectl --context="${HOST_CLUSTER_NAME}" apply -f https://raw.githubusercontent.com/metallb/metallb/v0.12.1/manifests/namespace.yaml
-kubectl --context="${HOST_CLUSTER_NAME}" apply -f https://raw.githubusercontent.com/metallb/metallb/v0.12.1/manifests/metallb.yaml
+kubectl --context="${HOST_CLUSTER_NAME}" apply -f https://raw.githubusercontent.com/metallb/metallb/v0.13.5/config/manifests/metallb-native.yaml
 util::wait_pod_ready "${HOST_CLUSTER_NAME}" metallb metallb-system
 
-# Use x.x.x.6 IP address, which is the same CIDR with the node address of the Kind cluster,
+# Use x.x.x.8 IP address, which is the same CIDR with the node address of the Kind cluster,
 # as the loadBalancer service address of component karmada-interpreter-webhook-example.
 interpreter_webhook_example_service_external_ip_prefix=$(echo $(util::get_apiserver_ip_from_kubeconfig "${HOST_CLUSTER_NAME}") | awk -F. '{printf "%s.%s.%s",$1,$2,$3}')
-interpreter_webhook_example_service_external_ip_address=${interpreter_webhook_example_service_external_ip_prefix}.6
+interpreter_webhook_example_service_external_ip_address=${interpreter_webhook_example_service_external_ip_prefix}.8
 
 # config with layer 2 configuration. refer to https://metallb.universe.tf/configuration/#layer-2-configuration
 cat <<EOF | kubectl --context="${HOST_CLUSTER_NAME}" apply -f -
-apiVersion: v1
-kind: ConfigMap
+apiVersion: metallb.io/v1beta1
+kind: IPAddressPool
 metadata:
+  name: metallb-config
+  namespace: metallb-system
+spec:
+  addresses:
+  - ${interpreter_webhook_example_service_external_ip_address}-${interpreter_webhook_example_service_external_ip_address}
+---
+apiVersion: metallb.io/v1beta1
+kind: L2Advertisement
+metadata:
+  name: metallb-advertisement
   namespace: metallb-system
-  name: config
-data:
-  config: |
-    address-pools:
-    - name: default
-      protocol: layer2
-      addresses:
-      - ${interpreter_webhook_example_service_external_ip_address}-${interpreter_webhook_example_service_external_ip_address}
 EOF
 
 # deploy interpreter webhook example in karmada-host