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

Update karmada-apiserve and kube-controller-manager to v1.28.9 by default. 

Signed-off-by: Lan Liang <gcslyp@gmail.com>
This commit is contained in:
Lan Liang 2024-06-19 08:38:01 +00:00
parent 6fba282fd7
commit c8524d0d78
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
charts/karmada/README.md
View File

@ -308,7 +308,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.image.pullSecrets` | Image pull secret of the karmada-apiserver | `[]` | | `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.repository` | Image of the karmada-apiserver | `"registry.k8s.io/kube-apiserver"` |
| `apiServer.image.tag` | Image tag of the karmada-apiserver | `"v1.27.11"` | | `apiServer.image.tag` | Image tag of the karmada-apiserver | `"v1.28.9"` |
| `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"` |
@ -337,7 +337,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.image.pullSecrets` | Image pull secret of the kube-controller-manager | `[]` | | `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.repository` | Image of the kube-controller-manager | `"registry.k8s.io/kube-controller-manager"` |
| `kubeControllerManager.image.tag` | Image tag of the kube-controller-manager | `"v1.27.11"` | | `kubeControllerManager.image.tag` | Image tag of the kube-controller-manager | `"v1.28.9"` |
| `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

@ -371,7 +371,7 @@ apiServer:
image: image:
registry: registry.k8s.io registry: registry.k8s.io
repository: kube-apiserver repository: kube-apiserver
tag: "v1.27.11" tag: "v1.28.9"
## 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.
@ -571,7 +571,7 @@ kubeControllerManager:
image: image:
registry: registry.k8s.io registry: registry.k8s.io
repository: kube-controller-manager repository: kube-controller-manager
tag: "v1.27.11" tag: "v1.28.9"
## 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.

2
hack/deploy-karmada.sh
View File

@ -200,7 +200,7 @@ fi
# deploy karmada apiserver # deploy karmada apiserver
TEMP_PATH_APISERVER=$(mktemp -d) TEMP_PATH_APISERVER=$(mktemp -d)
trap '{ rm -rf ${TEMP_PATH_APISERVER}; }' EXIT trap '{ rm -rf ${TEMP_PATH_APISERVER}; }' EXIT
KARMADA_APISERVER_VERSION=${KARMADA_APISERVER_VERSION:-"v1.27.11"} KARMADA_APISERVER_VERSION=${KARMADA_APISERVER_VERSION:-"v1.28.9"}
cp "${REPO_ROOT}"/artifacts/deploy/karmada-apiserver.yaml "${TEMP_PATH_APISERVER}"/karmada-apiserver.yaml 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/{{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 sed -i'' -e "s/{{karmada_apiserver_version}}/${KARMADA_APISERVER_VERSION}/g" "${TEMP_PATH_APISERVER}"/karmada-apiserver.yaml

4
operator/README.md
View File

@ -211,7 +211,7 @@ You can change it to `NodePort`:
... ...
karmadaAPIServer: karmadaAPIServer:
imageRepository: registry.k8s.io/kube-apiserver imageRepository: registry.k8s.io/kube-apiserver
imageTag: v1.27.11 imageTag: v1.28.9
replicas: 1 replicas: 1
serviceType: NodePort serviceType: NodePort
serviceSubnet: 10.96.0.0/12 serviceSubnet: 10.96.0.0/12
@ -226,7 +226,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.27.11 imageTag: v1.28.9
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.27.11 imageTag: v1.28.9
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.27.11 imageTag: v1.28.9
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.13-0" EtcdDefaultVersion = "3.5.13-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.27.11" KubeDefaultVersion = "v1.28.9"
// 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

@ -120,7 +120,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.27.11", "Choose a specific Kubernetes version for the control plane.") flags.StringVar(&opts.KubeImageTag, "kube-image-tag", "v1.28.9", "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)")