From ac42c00cc416b2133f096f9a9f657d5f37c3aeff Mon Sep 17 00:00:00 2001 From: changzhen Date: Fri, 22 Oct 2021 14:31:48 +0800 Subject: [PATCH] upgrade k8s version to v1.20.11 Signed-off-by: changzhen --- artifacts/deploy/karmada-apiserver.yaml | 7 +++++-- artifacts/deploy/kube-controller-manager.yaml | 2 +- charts/templates/karmada_apiserver.yaml | 5 ++++- charts/values.yaml | 4 ++-- hack/local-up-karmada.sh | 2 +- pkg/webhook/work/mutating.go | 1 + 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/artifacts/deploy/karmada-apiserver.yaml b/artifacts/deploy/karmada-apiserver.yaml index 9872ec754..e7f69f685 100644 --- a/artifacts/deploy/karmada-apiserver.yaml +++ b/artifacts/deploy/karmada-apiserver.yaml @@ -43,13 +43,16 @@ spec: - --etcd-keyfile=/etc/kubernetes/pki/karmada.key - --etcd-servers=https://etcd-client.karmada-system.svc.cluster.local:2379 - --bind-address=0.0.0.0 - - --insecure-port=8080 + - --insecure-port=0 - --kubelet-client-certificate=/etc/kubernetes/pki/karmada.crt - --kubelet-client-key=/etc/kubernetes/pki/karmada.key - --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname - --disable-admission-plugins=StorageObjectInUseProtection,ServiceAccount - --runtime-config= - --secure-port=5443 + - --service-account-issuer=https://kubernetes.default.svc.cluster.local + - --service-account-key-file=/etc/kubernetes/pki/karmada.key + - --service-account-signing-key-file=/etc/kubernetes/pki/karmada.key - --service-cluster-ip-range=10.96.0.0/12 - --proxy-client-cert-file=/etc/kubernetes/pki/karmada.crt - --proxy-client-key-file=/etc/kubernetes/pki/karmada.key @@ -61,7 +64,7 @@ spec: - --tls-cert-file=/etc/kubernetes/pki/karmada.crt - --tls-private-key-file=/etc/kubernetes/pki/karmada.key name: karmada-apiserver - image: k8s.gcr.io/kube-apiserver:v1.19.1 + image: k8s.gcr.io/kube-apiserver:v1.20.11 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 8 diff --git a/artifacts/deploy/kube-controller-manager.yaml b/artifacts/deploy/kube-controller-manager.yaml index df7861e9a..dee42c516 100644 --- a/artifacts/deploy/kube-controller-manager.yaml +++ b/artifacts/deploy/kube-controller-manager.yaml @@ -52,7 +52,7 @@ spec: - --service-cluster-ip-range=10.96.0.0/12 - --use-service-account-credentials=true - --v=4 - image: k8s.gcr.io/kube-controller-manager:v1.19.1 + image: k8s.gcr.io/kube-controller-manager:v1.20.11 imagePullPolicy: IfNotPresent name: kube-controller-manager resources: diff --git a/charts/templates/karmada_apiserver.yaml b/charts/templates/karmada_apiserver.yaml index 181a76f83..366ad3899 100644 --- a/charts/templates/karmada_apiserver.yaml +++ b/charts/templates/karmada_apiserver.yaml @@ -51,12 +51,15 @@ spec: - --etcd-servers=https://etcd-client.{{ include "karmada.namespace" . }}.svc.{{ .Values.clusterDomain }}:2379 {{- end }} - --bind-address=0.0.0.0 - - --insecure-port=8080 + - --insecure-port=0 - --kubelet-client-certificate=/etc/kubernetes/pki/karmada.crt - --kubelet-client-key=/etc/kubernetes/pki/karmada.key - --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname - --runtime-config= - --secure-port=5443 + - --service-account-issuer=https://kubernetes.default.svc.{{ .Values.clusterDomain }} + - --service-account-key-file=/etc/kubernetes/pki/karmada.key + - --service-account-signing-key-file=/etc/kubernetes/pki/karmada.key - --service-cluster-ip-range=10.96.0.0/12 - --proxy-client-cert-file=/etc/kubernetes/pki/karmada.crt - --proxy-client-key-file=/etc/kubernetes/pki/karmada.key diff --git a/charts/values.yaml b/charts/values.yaml index 811e45831..48859a369 100644 --- a/charts/values.yaml +++ b/charts/values.yaml @@ -188,7 +188,7 @@ apiServer: ## @param apiServer.image.pullPolicy pull policy of image pullPolicy: IfNotPresent ## @param apiServer.image.tag overrides the image tag whose default is the latest - tag: "v1.19.1" + tag: "v1.20.11" ## @param apiServer.resources resources: { } # If you do want to specify resources, uncomment the following @@ -227,7 +227,7 @@ kubeControllerManager: ## @param kubeControllerManager.image.pullPolicy pull policy of image pullPolicy: IfNotPresent ## @param kubeControllerManager.image.tag overrides the image tag whose default is the latest - tag: "v1.19.1" + tag: "v1.20.11" ## @param kubeControllerManager.resources resources: # If you do want to specify resources, uncomment the following diff --git a/hack/local-up-karmada.sh b/hack/local-up-karmada.sh index d045c520c..51604c991 100755 --- a/hack/local-up-karmada.sh +++ b/hack/local-up-karmada.sh @@ -23,7 +23,7 @@ MEMBER_CLUSTER_2_NAME=${MEMBER_CLUSTER_2_NAME:-"member2"} PULL_MODE_CLUSTER_NAME=${PULL_MODE_CLUSTER_NAME:-"member3"} HOST_IPADDRESS=${1:-} -CLUSTER_VERSION=${CLUSTER_VERSION:-"kindest/node:v1.19.1"} +CLUSTER_VERSION=${CLUSTER_VERSION:-"kindest/node:v1.20.7"} KIND_LOG_FILE=${KIND_LOG_FILE:-"/tmp/karmada"} #step0: prepare diff --git a/pkg/webhook/work/mutating.go b/pkg/webhook/work/mutating.go index 152b2cbec..cf5d9f2ce 100644 --- a/pkg/webhook/work/mutating.go +++ b/pkg/webhook/work/mutating.go @@ -118,6 +118,7 @@ func removeIrrelevantField(workload *unstructured.Unstructured) error { clusterIP, exist, _ := unstructured.NestedString(workload.Object, "spec", "clusterIP") if exist && clusterIP != corev1.ClusterIPNone { unstructured.RemoveNestedField(workload.Object, "spec", "clusterIP") + unstructured.RemoveNestedField(workload.Object, "spec", "clusterIPs") } }