karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upgrade k8s version to v1.20.11 

Signed-off-by: changzhen <changzhen5@huawei.com>
This commit is contained in:
changzhen 2021-10-22 14:31:48 +08:00
parent 53125c6ce2
commit ac42c00cc4
6 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
artifacts/deploy/karmada-apiserver.yaml
View File

@ -43,13 +43,16 @@ spec:
- --etcd-keyfile=/etc/kubernetes/pki/karmada.key - --etcd-keyfile=/etc/kubernetes/pki/karmada.key
- --etcd-servers=https://etcd-client.karmada-system.svc.cluster.local:2379 - --etcd-servers=https://etcd-client.karmada-system.svc.cluster.local:2379
- --bind-address=0.0.0.0 - --bind-address=0.0.0.0
- --insecure-port=8080 - --insecure-port=0
- --kubelet-client-certificate=/etc/kubernetes/pki/karmada.crt - --kubelet-client-certificate=/etc/kubernetes/pki/karmada.crt
- --kubelet-client-key=/etc/kubernetes/pki/karmada.key - --kubelet-client-key=/etc/kubernetes/pki/karmada.key
- --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname - --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname
- --disable-admission-plugins=StorageObjectInUseProtection,ServiceAccount - --disable-admission-plugins=StorageObjectInUseProtection,ServiceAccount
- --runtime-config= - --runtime-config=
- --secure-port=5443 - --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 - --service-cluster-ip-range=10.96.0.0/12
- --proxy-client-cert-file=/etc/kubernetes/pki/karmada.crt - --proxy-client-cert-file=/etc/kubernetes/pki/karmada.crt
- --proxy-client-key-file=/etc/kubernetes/pki/karmada.key - --proxy-client-key-file=/etc/kubernetes/pki/karmada.key
@ -61,7 +64,7 @@ spec:
- --tls-cert-file=/etc/kubernetes/pki/karmada.crt - --tls-cert-file=/etc/kubernetes/pki/karmada.crt
- --tls-private-key-file=/etc/kubernetes/pki/karmada.key - --tls-private-key-file=/etc/kubernetes/pki/karmada.key
name: karmada-apiserver name: karmada-apiserver
image: k8s.gcr.io/kube-apiserver:v1.19.1 image: k8s.gcr.io/kube-apiserver:v1.20.11
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:
failureThreshold: 8 failureThreshold: 8

2
artifacts/deploy/kube-controller-manager.yaml
View File

@ -52,7 +52,7 @@ spec:
- --service-cluster-ip-range=10.96.0.0/12 - --service-cluster-ip-range=10.96.0.0/12
- --use-service-account-credentials=true - --use-service-account-credentials=true
- --v=4 - --v=4
image: k8s.gcr.io/kube-controller-manager:v1.19.1 image: k8s.gcr.io/kube-controller-manager:v1.20.11
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
name: kube-controller-manager name: kube-controller-manager
resources: resources:

5
charts/templates/karmada_apiserver.yaml
View File

@ -51,12 +51,15 @@ spec:
- --etcd-servers=https://etcd-client.{{ include "karmada.namespace" . }}.svc.{{ .Values.clusterDomain }}:2379 - --etcd-servers=https://etcd-client.{{ include "karmada.namespace" . }}.svc.{{ .Values.clusterDomain }}:2379
{{- end }} {{- end }}
- --bind-address=0.0.0.0 - --bind-address=0.0.0.0
- --insecure-port=8080 - --insecure-port=0
- --kubelet-client-certificate=/etc/kubernetes/pki/karmada.crt - --kubelet-client-certificate=/etc/kubernetes/pki/karmada.crt
- --kubelet-client-key=/etc/kubernetes/pki/karmada.key - --kubelet-client-key=/etc/kubernetes/pki/karmada.key
- --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname - --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname
- --runtime-config= - --runtime-config=
- --secure-port=5443 - --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 - --service-cluster-ip-range=10.96.0.0/12
- --proxy-client-cert-file=/etc/kubernetes/pki/karmada.crt - --proxy-client-cert-file=/etc/kubernetes/pki/karmada.crt
- --proxy-client-key-file=/etc/kubernetes/pki/karmada.key - --proxy-client-key-file=/etc/kubernetes/pki/karmada.key

4
charts/values.yaml
View File

@ -188,7 +188,7 @@ apiServer:
## @param apiServer.image.pullPolicy pull policy of image ## @param apiServer.image.pullPolicy pull policy of image
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
## @param apiServer.image.tag overrides the image tag whose default is the latest ## @param apiServer.image.tag overrides the image tag whose default is the latest
tag: "v1.19.1" tag: "v1.20.11"
## @param apiServer.resources ## @param apiServer.resources
resources: { } resources: { }
# If you do want to specify resources, uncomment the following # If you do want to specify resources, uncomment the following
@ -227,7 +227,7 @@ kubeControllerManager:
## @param kubeControllerManager.image.pullPolicy pull policy of image ## @param kubeControllerManager.image.pullPolicy pull policy of image
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
## @param kubeControllerManager.image.tag overrides the image tag whose default is the latest ## @param kubeControllerManager.image.tag overrides the image tag whose default is the latest
tag: "v1.19.1" tag: "v1.20.11"
## @param kubeControllerManager.resources ## @param kubeControllerManager.resources
resources: resources:
# If you do want to specify resources, uncomment the following # If you do want to specify resources, uncomment the following

2
hack/local-up-karmada.sh
View File

@ -23,7 +23,7 @@ MEMBER_CLUSTER_2_NAME=${MEMBER_CLUSTER_2_NAME:-"member2"}
PULL_MODE_CLUSTER_NAME=${PULL_MODE_CLUSTER_NAME:-"member3"} PULL_MODE_CLUSTER_NAME=${PULL_MODE_CLUSTER_NAME:-"member3"}
HOST_IPADDRESS=${1:-} 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"} KIND_LOG_FILE=${KIND_LOG_FILE:-"/tmp/karmada"}
#step0: prepare #step0: prepare

1
pkg/webhook/work/mutating.go
View File

@ -118,6 +118,7 @@ func removeIrrelevantField(workload *unstructured.Unstructured) error {
clusterIP, exist, _ := unstructured.NestedString(workload.Object, "spec", "clusterIP") clusterIP, exist, _ := unstructured.NestedString(workload.Object, "spec", "clusterIP")
if exist && clusterIP != corev1.ClusterIPNone { if exist && clusterIP != corev1.ClusterIPNone {
unstructured.RemoveNestedField(workload.Object, "spec", "clusterIP") unstructured.RemoveNestedField(workload.Object, "spec", "clusterIP")
unstructured.RemoveNestedField(workload.Object, "spec", "clusterIPs")
} }
} }