Skip to content

Commit

Permalink
upgrade 1.22 (#175)
Browse files Browse the repository at this point in the history
* fix flags

* Update to latest 1.22 version
  • Loading branch information
george-angel committed Jan 14, 2022
1 parent fee2813 commit 2c117d4
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 11 deletions.
21 changes: 12 additions & 9 deletions resources/kube-controller-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,27 @@ spec:
image: k8s.gcr.io/kube-controller-manager:${kubernetes_version}
command:
- kube-controller-manager
- --kubeconfig=/etc/kubernetes/config/controller-manager.conf
- --leader-elect=true
- --use-service-account-credentials
- --service-account-private-key-file=/etc/kubernetes/ssl/signing-key.pem
- --root-ca-file=/etc/kubernetes/ssl/ca.pem
${cloud_provider == "" ? "" : "- --cloud-provider=${cloud_provider}"}
${cloud_config == "" ? "" : "- --cloud-config=/etc/kubernetes/config/cloud_provider/cloud.conf"}
- --configure-cloud-routes=false
${cloud_provider == "" ? "" : "- --cloud-provider=${cloud_provider}"}
${feature_gates == "" ? "" : "- --feature-gates=${feature_gates}"}
- --allocate-node-cidrs=true
- --authentication-kubeconfig=/etc/kubernetes/config/controller-manager.conf
- --authorization-kubeconfig=/etc/kubernetes/config/controller-manager.conf
- --cluster-cidr=${pod_network}
- --configure-cloud-routes=false
- --kubeconfig=/etc/kubernetes/config/controller-manager.conf
- --leader-elect=true
- --node-monitor-grace-period=120s
${feature_gates == "" ? "" : "- --feature-gates=${feature_gates}"}
- --root-ca-file=/etc/kubernetes/ssl/ca.pem
- --service-account-private-key-file=/etc/kubernetes/ssl/signing-key.pem
- --use-service-account-credentials
- --v=0
livenessProbe:
httpGet:
host: 127.0.0.1
path: /healthz
port: 10252
port: 10257
scheme: HTTPS
initialDelaySeconds: 15
timeoutSeconds: 15
volumeMounts:
Expand Down
4 changes: 3 additions & 1 deletion resources/kube-scheduler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ spec:
image: k8s.gcr.io/kube-scheduler:${kubernetes_version}
command:
- kube-scheduler
- --config=/etc/kubernetes/config/kube-scheduler-config.yaml
${feature_gates == "" ? "" : "- --feature-gates=${feature_gates}"}
- --authentication-kubeconfig=/etc/kubernetes/config/scheduler.conf
- --authorization-kubeconfig=/etc/kubernetes/config/scheduler.conf
- --config=/etc/kubernetes/config/kube-scheduler-config.yaml
- --v=0
livenessProbe:
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ variable "node_exporter_image_tag" {

variable "kubernetes_version" {
description = "Kubernetes version, used to specify k8s.gcr.io docker image version and Kubernetes binaries"
default = "v1.21.5"
default = "v1.22.5"
}

variable "cluster_dns" {
Expand Down

0 comments on commit 2c117d4

Please sign in to comment.