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

Merge pull request #2539 from jwcesign/master 

Update karmada's k8s components to 1.25.2
This commit is contained in:
karmada-bot 2022-09-23 14:17:58 +08:00 committed by GitHub
parent bdd753df68 d8a35e2d9a
commit ed13e664d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ spec:
- --tls-cert-file=/etc/karmada/pki/apiserver.crt
- --tls-private-key-file=/etc/karmada/pki/apiserver.key
name: karmada-apiserver
image: k8s.gcr.io/kube-apiserver:v1.24.2
image: k8s.gcr.io/kube-apiserver:v1.25.2
imagePullPolicy: IfNotPresent
livenessProbe:
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
- --use-service-account-credentials=true
- --v=4
image: k8s.gcr.io/kube-controller-manager:v1.24.2
image: k8s.gcr.io/kube-controller-manager:v1.25.2
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 8

4
charts/karmada/README.md
View File

@ -262,7 +262,7 @@ helm install karmada-scheduler-estimator -n karmada-system ./charts/karmada
| `apiServer.podAnnotations` | Annotaions of the karmada-apiserver pods | `{}` |
| `apiServer.imagePullSecrets` | Image pull secret of the karmada-apiserver | `[]` |
| `apiServer.image.repository` | Image of the karmada-apiserver | `"k8s.gcr.io/kube-apiserver"` |
| `apiServer.image.tag` | Image tag of the karmada-apiserver | `"v1.24.2"` |
| `apiServer.image.tag` | Image tag of the karmada-apiserver | `"v1.25.2"` |
| `apiServer.image.pullPolicy` | Image pull policy of the karmada-apiserver | `"IfNotPresent"` |
| `apiServer.resources` | Resource quota of the karmada-apiserver | `{}` |
| `apiServer.hostNetwork` | Deploy karmada-apiserver with hostNetwork. If there are multiple karmadas in one cluster, you'd better set it to "false" | `"true"` |
@ -291,7 +291,7 @@ helm install karmada-scheduler-estimator -n karmada-system ./charts/karmada
| `kubeControllerManager.podAnnotations` | Annotaions of the kube-controller-manager pods | `{}` |
| `kubeControllerManager.imagePullSecrets` | Image pull secret of the kube-controller-manager | `[]` |
| `kubeControllerManager.image.repository` | Image of the kube-controller-manager | `"k8s.gcr.io/kube-controller-manager"` |
| `kubeControllerManager.image.tag` | Image tag of the kube-controller-manager | `"v1.24.2"` |
| `kubeControllerManager.image.tag` | Image tag of the kube-controller-manager | `"v1.25.2"` |
| `kubeControllerManager.image.pullPolicy` | Image pull policy of the kube-controller-manager | `"IfNotPresent"` |
| `kubeControllerManager.resources` | Resource quota of the kube-controller-manager | `{}` |
| `kubeControllerManager.nodeSelector` | Node selector of the kube-controller-manager | `{}` |

4
charts/karmada/values.yaml
View File

@ -306,7 +306,7 @@ apiServer:
image:
registry: k8s.gcr.io
repository: kube-apiserver
tag: "v1.24.2"
tag: "v1.25.2"
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
##
@ -446,7 +446,7 @@ kubeControllerManager:
image:
registry: k8s.gcr.io
repository: kube-controller-manager
tag: "v1.24.2"
tag: "v1.25.2"
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
##

6
pkg/karmadactl/cmdinit/kubernetes/deploy.go
View File

@ -45,8 +45,8 @@ var (
defaultKubeConfig = filepath.Join(homeDir(), ".kube", "config")
defaultEtcdImage = "etcd:3.5.3-0"
defaultKubeAPIServerImage = "kube-apiserver:v1.24.2"
defaultKubeControllerManagerImage = "kube-controller-manager:v1.24.2"
defaultKubeAPIServerImage = "kube-apiserver:v1.25.2"
defaultKubeControllerManagerImage = "kube-controller-manager:v1.25.2"
)
const (
@ -255,7 +255,7 @@ func (i *CommandInitOption) genCerts() error {
func (i *CommandInitOption) prepareCRD() error {
if strings.HasPrefix(i.CRDs, "http") {
filename := i.KarmadaDataPath + "/" + path.Base(i.CRDs)
klog.Infoln("download crds file name:", filename)
klog.Infof("download crds file:%s", i.CRDs)
if err := utils.DownloadFile(i.CRDs, filename); err != nil {
return err
}

4
pkg/karmadactl/cmdinit/utils/examples.go
View File

@ -184,7 +184,7 @@ Step 1: Use "%[2]s join" command to register the cluster to Karmada control plan
(In karmada)~# %[2]s --kubeconfig %[1]s/karmada-apiserver.config join ${MEMBER_CLUSTER_NAME} --cluster-kubeconfig=$HOME/.kube/config
Step 2: Show members of karmada
(In karmada)~# kubectl --kubeconfig %[1]s/karmada-apiserver.config get clusters
(In karmada)~# kubectl --kubeconfig %[1]s/karmada-apiserver.config get clusters
Register cluster with 'Pull' mode
@ -193,7 +193,7 @@ Step 1: Use "%[2]s register" command to register the cluster to Karmada control
(In member cluster)~# %[2]s%[3]s
Step 2: Show members of karmada
(In karmada)~# kubectl --kubeconfig %[1]s/karmada-apiserver.config get clusters
(In karmada)~# kubectl --kubeconfig %[1]s/karmada-apiserver.config get clusters
`, path, parentCommand, printRegisterCommand)
}