Skip to content

Commit

Permalink
Merge pull request #5209 from liangyuanpeng/karmada_apiserver_1.29
Browse files Browse the repository at this point in the history 
Update karmada-apiserve and kube-controller-manager to v1.29.6 by default.
  • Loading branch information
@karmada-bot
karmada-bot committed Jul 17, 2024
2 parents 8859cb9 + 70cb862 commit 8736fae
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions charts/karmada/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ helm install karmada-scheduler-estimator -n karmada-system ./charts/karmada
| `apiServer.podAnnotations` | Annotations of the karmada-apiserver pods | `{}` |
| `apiServer.image.pullSecrets` | Image pull secret of the karmada-apiserver | `[]` |
| `apiServer.image.repository` | Image of the karmada-apiserver | `"registry.k8s.io/kube-apiserver"` |
| `apiServer.image.tag` | Image tag of the karmada-apiserver | `"v1.28.9"` |
| `apiServer.image.tag` | Image tag of the karmada-apiserver | `"v1.29.6"` |
| `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" | `"false"` |
Expand Down Expand Up @@ -337,7 +337,7 @@ helm install karmada-scheduler-estimator -n karmada-system ./charts/karmada
| `kubeControllerManager.podAnnotations` | Annotations of the kube-controller-manager pods | `{}` |
| `kubeControllerManager.image.pullSecrets` | 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.tag` | Image tag of the kube-controller-manager | `"v1.28.9"` |
| `kubeControllerManager.image.tag` | Image tag of the kube-controller-manager | `"v1.29.6"` |
| `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 | `{}` |
Expand Down
4 changes: 2 additions & 2 deletions charts/karmada/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ apiServer:
image:
registry: registry.k8s.io
repository: kube-apiserver
tag: "v1.28.9"
tag: "v1.29.6"
## Specify a imagePullPolicy, defaults to 'IfNotPresent'
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
Expand Down Expand Up @@ -568,7 +568,7 @@ kubeControllerManager:
image:
registry: registry.k8s.io
repository: kube-controller-manager
tag: "v1.28.9"
tag: "v1.29.6"
## Specify a imagePullPolicy, defaults to 'IfNotPresent'
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
Expand Down
2 changes: 1 addition & 1 deletion hack/deploy-karmada.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ fi
# deploy karmada apiserver
TEMP_PATH_APISERVER=$(mktemp -d)
trap '{ rm -rf ${TEMP_PATH_APISERVER}; }' EXIT
KARMADA_APISERVER_VERSION=${KARMADA_APISERVER_VERSION:-"v1.28.9"}
KARMADA_APISERVER_VERSION=${KARMADA_APISERVER_VERSION:-"v1.29.6"}
cp "${REPO_ROOT}"/artifacts/deploy/karmada-apiserver.yaml "${TEMP_PATH_APISERVER}"/karmada-apiserver.yaml
sed -i'' -e "s/{{service_type}}/${KARMADA_APISERVER_SERVICE_TYPE}/g" "${TEMP_PATH_APISERVER}"/karmada-apiserver.yaml
sed -i'' -e "s/{{karmada_apiserver_version}}/${KARMADA_APISERVER_VERSION}/g" "${TEMP_PATH_APISERVER}"/karmada-apiserver.yaml
Expand Down
4 changes: 2 additions & 2 deletions operator/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ You can change it to `NodePort`:
...
karmadaAPIServer:
imageRepository: registry.k8s.io/kube-apiserver
imageTag: v1.28.9
imageTag: v1.29.6
replicas: 1
serviceType: NodePort
serviceSubnet: 10.96.0.0/12
Expand All @@ -226,7 +226,7 @@ You can add more SANs to karmada-apiserver certificate:
...
karmadaAPIServer:
imageRepository: registry.k8s.io/kube-apiserver
imageTag: v1.28.9
imageTag: v1.29.6
replicas: 1
serviceSubnet: 10.96.0.0/12
certSANs:
Expand Down
4 changes: 2 additions & 2 deletions operator/config/samples/karmada.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
storage: 3Gi
karmadaAPIServer:
imageRepository: registry.k8s.io/kube-apiserver
imageTag: v1.28.9
imageTag: v1.29.6
replicas: 1
serviceType: NodePort
serviceSubnet: 10.96.0.0/12
Expand All @@ -47,7 +47,7 @@ spec:
replicas: 1
kubeControllerManager:
imageRepository: registry.k8s.io/kube-controller-manager
imageTag: v1.28.9
imageTag: v1.29.6
replicas: 1
karmadaMetricsAdapter:
imageRepository: docker.io/karmada/karmada-metrics-adapter
Expand Down
2 changes: 1 addition & 1 deletion operator/pkg/constants/constants.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const (
// EtcdDefaultVersion defines the default of the karmada etcd image tag
EtcdDefaultVersion = "3.5.13-0"
// KubeDefaultVersion defines the default of the karmada apiserver and kubeControllerManager image tag
KubeDefaultVersion = "v1.28.9"
KubeDefaultVersion = "v1.29.6"
// KarmadaDefaultServiceSubnet defines the default of the subnet used by k8s services.
KarmadaDefaultServiceSubnet = "10.96.0.0/12"
// KarmadaDefaultDNSDomain defines the default of the DNSDomain
Expand Down
2 changes: 1 addition & 1 deletion pkg/karmadactl/cmdinit/cmdinit.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func NewCmdInit(parentCommand string) *cobra.Command {
// 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.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.28.9", "Choose a specific Kubernetes version for the control plane.")
flags.StringVar(&opts.KubeImageTag, "kube-image-tag", "v1.29.6", "Choose a specific Kubernetes version for the control plane.")
// 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.ExternalDNS, "cert-external-dns", "", "the external DNS of Karmada certificate (e.g localhost,localhost.com)")
Expand Down

0 comments on commit 8736fae

Please sign in to comment.