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 #4464 from liangyuanpeng/apiserver_1.26 

Update karmada-apiserver&controller-manager to v1.26.12
This commit is contained in:
karmada-bot 2023-12-21 19:00:17 +08:00 committed by GitHub
parent bff8aa90fb b90035f03f
commit c76322aebb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 12 additions and 12 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-private-key-file=/etc/karmada/pki/apiserver.key - --tls-private-key-file=/etc/karmada/pki/apiserver.key
- --tls-min-version=VersionTLS13 - --tls-min-version=VersionTLS13
name: karmada-apiserver name: karmada-apiserver
image: registry.k8s.io/kube-apiserver:v1.25.4 image: registry.k8s.io/kube-apiserver:v1.26.12
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: registry.k8s.io/kube-controller-manager:v1.25.4 image: registry.k8s.io/kube-controller-manager:v1.26.12
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:
failureThreshold: 8 failureThreshold: 8

4
charts/karmada/README.md
View File

@ -306,7 +306,7 @@ helm install karmada-scheduler-estimator -n karmada-system ./charts/karmada
| `apiServer.podAnnotations` | Annotations of the karmada-apiserver pods | `{}` | | `apiServer.podAnnotations` | Annotations of the karmada-apiserver pods | `{}` |
| `apiServer.imagePullSecrets` | Image pull secret of the karmada-apiserver | `[]` | | `apiServer.imagePullSecrets` | Image pull secret of the karmada-apiserver | `[]` |
| `apiServer.image.repository` | Image of the karmada-apiserver | `"registry.k8s.io/kube-apiserver"` | | `apiServer.image.repository` | Image of the karmada-apiserver | `"registry.k8s.io/kube-apiserver"` |
| `apiServer.image.tag` | Image tag of the karmada-apiserver | `"v1.25.4"` | | `apiServer.image.tag` | Image tag of the karmada-apiserver | `"v1.26.12"` |
| `apiServer.image.pullPolicy` | Image pull policy of the karmada-apiserver | `"IfNotPresent"` | | `apiServer.image.pullPolicy` | Image pull policy of the karmada-apiserver | `"IfNotPresent"` |
| `apiServer.resources` | Resource quota of the karmada-apiserver | `{}` | | `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" | `"false"` | | `apiServer.hostNetwork` | Deploy karmada-apiserver with hostNetwork. If there are multiple karmadas in one cluster, you'd better set it to "false" | `"false"` |
@ -335,7 +335,7 @@ helm install karmada-scheduler-estimator -n karmada-system ./charts/karmada
| `kubeControllerManager.podAnnotations` | Annotations of the kube-controller-manager pods | `{}` | | `kubeControllerManager.podAnnotations` | Annotations of the kube-controller-manager pods | `{}` |
| `kubeControllerManager.imagePullSecrets` | Image pull secret of the kube-controller-manager | `[]` | | `kubeControllerManager.imagePullSecrets` | Image pull secret of the kube-controller-manager | `[]` |
| `kubeControllerManager.image.repository` | Image of the kube-controller-manager | `"registry.k8s.io/kube-controller-manager"` | | `kubeControllerManager.image.repository` | Image of the kube-controller-manager | `"registry.k8s.io/kube-controller-manager"` |
| `kubeControllerManager.image.tag` | Image tag of the kube-controller-manager | `"v1.25.4"` | | `kubeControllerManager.image.tag` | Image tag of the kube-controller-manager | `"v1.26.12"` |
| `kubeControllerManager.image.pullPolicy` | Image pull policy of the kube-controller-manager | `"IfNotPresent"` | | `kubeControllerManager.image.pullPolicy` | Image pull policy of the kube-controller-manager | `"IfNotPresent"` |
| `kubeControllerManager.resources` | Resource quota of the kube-controller-manager | `{}` | | `kubeControllerManager.resources` | Resource quota of the kube-controller-manager | `{}` |
| `kubeControllerManager.nodeSelector` | Node selector of the kube-controller-manager | `{}` | | `kubeControllerManager.nodeSelector` | Node selector of the kube-controller-manager | `{}` |

4
charts/karmada/values.yaml
View File

@ -348,7 +348,7 @@ apiServer:
image: image:
registry: registry.k8s.io registry: registry.k8s.io
repository: kube-apiserver repository: kube-apiserver
tag: "v1.25.4" tag: "v1.26.12"
## Specify a imagePullPolicy, defaults to 'IfNotPresent' ## Specify a imagePullPolicy, defaults to 'IfNotPresent'
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets. ## Optionally specify an array of imagePullSecrets.
@ -548,7 +548,7 @@ kubeControllerManager:
image: image:
registry: registry.k8s.io registry: registry.k8s.io
repository: kube-controller-manager repository: kube-controller-manager
tag: "v1.25.4" tag: "v1.26.12"
## Specify a imagePullPolicy, defaults to 'IfNotPresent' ## Specify a imagePullPolicy, defaults to 'IfNotPresent'
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets. ## Optionally specify an array of imagePullSecrets.

4
operator/README.md
View File

@ -195,7 +195,7 @@ You can change it to `NodePort`:
... ...
karmadaAPIServer: karmadaAPIServer:
imageRepository: registry.k8s.io/kube-apiserver imageRepository: registry.k8s.io/kube-apiserver
imageTag: v1.25.4 imageTag: v1.26.12
replicas: 1 replicas: 1
serviceType: NodePort serviceType: NodePort
serviceSubnet: 10.96.0.0/12 serviceSubnet: 10.96.0.0/12
@ -210,7 +210,7 @@ You can add more SANs to karmada-apiserver certificate:
... ...
karmadaAPIServer: karmadaAPIServer:
imageRepository: registry.k8s.io/kube-apiserver imageRepository: registry.k8s.io/kube-apiserver
imageTag: v1.25.4 imageTag: v1.26.12
replicas: 1 replicas: 1
serviceSubnet: 10.96.0.0/12 serviceSubnet: 10.96.0.0/12
certSANs: certSANs:

4
operator/config/samples/karmada.yaml
View File

@ -25,7 +25,7 @@ spec:
storage: 3Gi storage: 3Gi
karmadaAPIServer: karmadaAPIServer:
imageRepository: registry.k8s.io/kube-apiserver imageRepository: registry.k8s.io/kube-apiserver
imageTag: v1.25.4 imageTag: v1.26.12
replicas: 1 replicas: 1
serviceType: NodePort serviceType: NodePort
serviceSubnet: 10.96.0.0/12 serviceSubnet: 10.96.0.0/12
@ -47,7 +47,7 @@ spec:
replicas: 1 replicas: 1
kubeControllerManager: kubeControllerManager:
imageRepository: registry.k8s.io/kube-controller-manager imageRepository: registry.k8s.io/kube-controller-manager
imageTag: v1.25.4 imageTag: v1.26.12
replicas: 1 replicas: 1
karmadaMetricsAdapter: karmadaMetricsAdapter:
imageRepository: docker.io/karmada/karmada-metrics-adapter imageRepository: docker.io/karmada/karmada-metrics-adapter

2
operator/pkg/constants/constants.go
View File

@ -31,7 +31,7 @@ const (
// EtcdDefaultVersion defines the default of the karmada etcd image tag // EtcdDefaultVersion defines the default of the karmada etcd image tag
EtcdDefaultVersion = "3.5.9-0" EtcdDefaultVersion = "3.5.9-0"
// KubeDefaultVersion defines the default of the karmada apiserver and kubeControllerManager image tag // KubeDefaultVersion defines the default of the karmada apiserver and kubeControllerManager image tag
KubeDefaultVersion = "v1.25.4" KubeDefaultVersion = "v1.26.12"
// KarmadaDefaultServiceSubnet defines the default of the subnet used by k8s services. // KarmadaDefaultServiceSubnet defines the default of the subnet used by k8s services.
KarmadaDefaultServiceSubnet = "10.96.0.0/12" KarmadaDefaultServiceSubnet = "10.96.0.0/12"
// KarmadaDefaultDNSDomain defines the default of the DNSDomain // KarmadaDefaultDNSDomain defines the default of the DNSDomain

2
pkg/karmadactl/cmdinit/cmdinit.go
View File

@ -118,7 +118,7 @@ func NewCmdInit(parentCommand string) *cobra.Command {
// kube image registry // kube image registry
flags.StringVarP(&opts.KubeImageMirrorCountry, "kube-image-mirror-country", "", "", "Country code of the kube image registry to be used. For Chinese mainland users, set it to cn") flags.StringVarP(&opts.KubeImageMirrorCountry, "kube-image-mirror-country", "", "", "Country code of the kube image registry to be used. For Chinese mainland users, set it to cn")
flags.StringVarP(&opts.KubeImageRegistry, "kube-image-registry", "", "", "Kube image registry. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers to override default kube image registry") flags.StringVarP(&opts.KubeImageRegistry, "kube-image-registry", "", "", "Kube image registry. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers to override default kube image registry")
flags.StringVar(&opts.KubeImageTag, "kube-image-tag", "v1.25.4", "Choose a specific Kubernetes version for the control plane.") flags.StringVar(&opts.KubeImageTag, "kube-image-tag", "v1.26.12", "Choose a specific Kubernetes version for the control plane.")
// cert // cert
flags.StringVar(&opts.ExternalIP, "cert-external-ip", "", "the external IP of Karmada certificate (e.g 192.168.1.2,172.16.1.2)") flags.StringVar(&opts.ExternalIP, "cert-external-ip", "", "the external IP of Karmada certificate (e.g 192.168.1.2,172.16.1.2)")
flags.StringVar(&opts.ExternalDNS, "cert-external-dns", "", "the external DNS of Karmada certificate (e.g localhost,localhost.com)") flags.StringVar(&opts.ExternalDNS, "cert-external-dns", "", "the external DNS of Karmada certificate (e.g localhost,localhost.com)")