Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

470 - Update k8s to 1.23 #471

Merged
merged 2 commits into from
Jun 18, 2023
Merged

470 - Update k8s to 1.23 #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b60b7d
update to k8s v1.19
hippogriffin Apr 29, 2022
f5006ee
use k8s 1.23 instead
hippogriffin Apr 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kubernetes/examples/files/tiller-rbac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: rbac.authorization.k8s.io/v1beta1
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: tiller
Expand Down
29 changes: 22 additions & 7 deletions kubernetes/files/manifests/kube-system/kube-flannel-vagrant.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# kube-flannel container in the 'kube-flannel-ds-amd64' DaemonSet.
---
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1beta1
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: flannel
rules:
Expand All @@ -28,7 +28,7 @@ rules:
- patch
---
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1beta1
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: flannel
roleRef:
Expand Down Expand Up @@ -82,7 +82,7 @@ data:
}
}
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: kube-flannel-ds-amd64
Expand All @@ -91,6 +91,9 @@ metadata:
tier: node
app: flannel
spec:
selector:
matchLabels:
app: flannel
template:
metadata:
labels:
Expand Down Expand Up @@ -161,7 +164,7 @@ spec:
configMap:
name: kube-flannel-cfg
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: kube-flannel-ds-arm64
Expand All @@ -170,6 +173,9 @@ metadata:
tier: node
app: flannel
spec:
selector:
matchLabels:
app: flannel
template:
metadata:
labels:
Expand Down Expand Up @@ -239,7 +245,7 @@ spec:
configMap:
name: kube-flannel-cfg
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: kube-flannel-ds-arm
Expand All @@ -248,6 +254,9 @@ metadata:
tier: node
app: flannel
spec:
selector:
matchLabels:
app: flannel
template:
metadata:
labels:
Expand Down Expand Up @@ -317,7 +326,7 @@ spec:
configMap:
name: kube-flannel-cfg
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: kube-flannel-ds-ppc64le
Expand All @@ -326,6 +335,9 @@ metadata:
tier: node
app: flannel
spec:
selector:
matchLabels:
app: flannel
template:
metadata:
labels:
Expand Down Expand Up @@ -395,7 +407,7 @@ spec:
configMap:
name: kube-flannel-cfg
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: kube-flannel-ds-s390x
Expand All @@ -404,6 +416,9 @@ metadata:
tier: node
app: flannel
spec:
selector:
matchLabels:
app: flannel
template:
metadata:
labels:
Expand Down
8 changes: 4 additions & 4 deletions kubernetes/vars/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ swap_file_path: /dev/mapper/packer--debian--9--amd64--vg-swap_1
docker_package: docker-ce=5:18.09.0~3-0~debian-stretch
docker_install_compose: False

kubernetes_version: '1.13'
kubernetes_version: '1.23'
kubernetes_allow_pods_on_master: False
kubernetes_pod_network_cidr: '10.244.0.0/16'
kubernetes_packages:
- name: kubelet=1.13.8-00
- name: kubelet=1.23.5-00
state: present
- name: kubectl=1.13.8-00
- name: kubectl=1.23.5-00
state: present
- name: kubeadm=1.13.8-00
- name: kubeadm=1.23.5-00
state: present
- name: kubernetes-cni
state: present
Expand Down