Skip to content

Commit 1b19d9c

Browse files
Update kebeadm download URL (#137)
1 parent efe295d commit 1b19d9c

File tree

11 files changed

+111
-5
lines changed

11 files changed

+111
-5
lines changed

.github/workflows/molecule.yml

+6
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ jobs:
3131
- 1.26.15
3232
- 1.27.16
3333
- 1.28.13
34+
- 1.29.12
35+
- 1.30.8
3436
distro:
3537
- rockylinux9
3638
- ubuntu2004
@@ -72,6 +74,10 @@ jobs:
7274
version: 1.27.16
7375
- old_version: 1.27.16
7476
version: 1.28.13
77+
- old_version: 1.28.13
78+
version: 1.29.12
79+
- old_version: 1.29.12
80+
version: 1.30.8
7581
steps:
7682
- name: Checkout project
7783
uses: actions/checkout@v3

roles/kube_vip/defaults/main.yml

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
# License for the specific language governing permissions and limitations
1313
# under the License.
1414

15+
# Inventory group containing controllers
16+
kube_vip_control_plane_group: "{{ kubernetes_control_plane_group | default('controllers') }}"
17+
1518
# Image to use for kube-vip
1619
kube_vip_image: ghcr.io/kube-vip/kube-vip:v0.6.4
1720

roles/kube_vip/tasks/main.yml

+27
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,40 @@
4040
notify:
4141
- Restart "kubelet" service
4242

43+
- name: Check if super-admin.conf exists
44+
ansible.builtin.stat:
45+
path: /etc/kubernetes/super-admin.conf
46+
failed_when: false
47+
changed_when: false
48+
register: kube_vip_stat_super_admin
49+
50+
- name: Check if kubeadm has already run
51+
ansible.builtin.stat:
52+
path: /var/lib/kubelet/config.yaml
53+
get_attributes: false
54+
get_checksum: false
55+
get_mime: false
56+
register: kube_vip_stat_kubelet_config
57+
58+
- name: Set fact with KUBECONFIG path
59+
ansible.builtin.set_fact:
60+
kube_vip_kubeconfig_path: /etc/kubernetes/admin.conf
61+
62+
- name: Set fact with KUBECONFIG path (with super-admin.conf)
63+
ansible.builtin.set_fact:
64+
kube_vip_kubeconfig_path: /etc/kubernetes/super-admin.conf
65+
when:
66+
- inventory_hostname == groups[kube_vip_control_plane_group] | first
67+
- (kube_vip_stat_super_admin.stat.exists and kube_vip_stat_super_admin.stat.isreg) or (not kube_vip_stat_kubelet_config.stat.exists)
68+
4369
- name: Upload Kubernetes manifest
4470
ansible.builtin.template:
4571
src: kube-vip.yaml.j2
4672
dest: /etc/kubernetes/manifests/kube-vip.yaml
4773
owner: root
4874
group: root
4975
mode: "0644"
76+
changed_when: false
5077

5178
- name: Flush handlers
5279
ansible.builtin.meta: flush_handlers

roles/kube_vip/templates/kube-vip.yaml.j2

+5-1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ spec:
5959
hostNetwork: true
6060
volumes:
6161
- hostPath:
62-
path: /etc/kubernetes/admin.conf
62+
{% if kubernetes_version is ansible.builtin.version('1.28.14', '<') %}
63+
path: "/etc/kubernetes/admin.conf"
64+
{% else %}
65+
path: "{{ kube_vip_kubeconfig_path }}"
66+
{% endif %}
6367
name: kubeconfig
6468
status: {}

roles/kubeadm/defaults/main.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ kubeadm_checksums:
3030
1.27.16: 33622018f83515331ac70c2041eba5d814a6d78a40b8869f089ea502f63a1421
3131
1.28.4: b4d2531b7cddf782f59555436bc098485b5fa6c05afccdeecf0d62d21d84f5bd
3232
1.28.13: f23e9586811312998bc5e8847f6df52fc04809aed8c2c2fd750f2c42b3f87192
33+
1.29.12: bce712631bc425726b45930e58b00790c2ab3deec4282f86af353ea907817c46
34+
1.30.8: ffe1a2b6345fae55e059afe7eed90ae9f46f0a755fde5fc17b9113134ab8b79e
3335
arm64:
3436
1.19.16: f72db475c7a52deaab3ac04ee66e2c99dc4dc50b4fa85faf34ff319de869e1d6
3537
1.20.15: 76e132da8185a7c33e6178348d05570a1f78878d5e118c7402c9ad02e8b6fb77
@@ -47,8 +49,10 @@ kubeadm_checksums:
4749
1.27.16: 39fb88ab0f6b943bbe61dde5d7ea58ce728045a0556f9b6f56d66fe1f20affcc
4850
1.28.4: a4422780020954436b8e76ab1c59b68c5581a54432dd3e566c4709bb40c8d4f9
4951
1.28.13: 989630fb0de6fe750c6ee25ee01b72654a3087434ff488ff8fddedd0278720cc
52+
1.29.12: d953ed504c2ddd08272d45cc94439fc69b7ffd77ff1d0c78917b3275a5c9c044
53+
1.30.8: 7bca884b54e2c3988e81250f8eba6a49d718994dd7fe67d14905cb65dcec8b56
5054

51-
kubeadm_download_url: "https://storage.googleapis.com/kubernetes-release/release/v{{ kubeadm_version }}/bin/{{ ansible_facts['system'] | lower }}/{{ download_artifact_goarch }}/kubeadm" # noqa: yaml[line-length]
55+
kubeadm_download_url: "https://cdn.dl.k8s.io/release/v{{ kubeadm_version }}/bin/{{ ansible_facts['system'] | lower }}/{{ download_artifact_goarch }}/kubeadm" # noqa: yaml[line-length]
5256
kubeadm_download_dest: /usr/bin/kubeadm
5357
kubeadm_binary_checksum: "{{ kubeadm_checksums[download_artifact_goarch][kubeadm_version] }}"
5458

roles/kubectl/defaults/main.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ kubectl_checksums:
3030
1.27.16: 97ea7cd771d0c6e3332614668a40d2c5996f0053ff11b44b198ea84dba0818cb
3131
1.28.4: 893c92053adea6edbbd4e959c871f5c21edce416988f968bec565d115383f7b8
3232
1.28.13: d7d363dd5a4c95444329bc5239b8718ebe84a043052958b2f15ee2feef9a28c6
33+
1.29.12: 35fc028853e6f5299a53f22ab58273ea2d882c0f261ead0a2eed5b844b12dbfb
34+
1.30.8: 7f39bdcf768ce4b8c1428894c70c49c8b4d2eee52f3606eb02f5f7d10f66d692
3335
arm64:
3436
1.19.16: 6ad55694db34b9ffbc3cb41761a50160eea0a962eb86899410593931b4e602d0
3537
1.20.15: d479febfb2e967bd86240b5c0b841e40e39e1ef610afd6f224281a23318c13dc
@@ -47,8 +49,10 @@ kubectl_checksums:
4749
1.27.16: 2f50cb29d73f696ffb57437d3e2c95b22c54f019de1dba19e2b834e0b4501eb9
4850
1.28.4: edf1e17b41891ec15d59dd3cc62bcd2cdce4b0fd9c2ee058b0967b17534457d7
4951
1.28.13: a22d234724b82101e1f17e95ab60e0e13c91a0fe17ad0890b3d92681cd551bfa
52+
1.29.12: 1cf2c00bb4f5ee6df69678e95af8ba9a4d4b1050ddefb0ae9d84b5c6f6c0e817
53+
1.30.8: e51d6a76fade0871a9143b64dc62a5ff44f369aa6cb4b04967d93798bf39d15b
5054

51-
kubectl_download_url: "https://storage.googleapis.com/kubernetes-release/release/v{{ kubectl_version }}/bin/{{ ansible_facts['system'] | lower }}/{{ download_artifact_goarch }}/kubectl" # noqa: yaml[line-length]
55+
kubectl_download_url: "https://cdn.dl.k8s.io/release/v{{ kubectl_version }}/bin/{{ ansible_facts['system'] | lower }}/{{ download_artifact_goarch }}/kubectl" # noqa: yaml[line-length]
5256
kubectl_download_dest: /usr/bin/kubectl
5357
kubectl_binary_checksum: "{{ kubectl_checksums[download_artifact_goarch][kubectl_version] }}"
5458

roles/kubelet/defaults/main.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ kubelet_checksums:
3030
1.27.16: 1b390641b47c6f9265ed8d19b48a8aa334ac28c825ad7ee8201717a5d9e8b759
3131
1.28.4: db2a473b73c3754d4011590f2f0aa877657608499590c6b0f8b40bec96a3e9ba
3232
1.28.13: 9b9cc3a19551ade6f3d98ad3acf0a2b65a27ef575bd089f115f8bb80791f3900
33+
1.29.12: 45475d908f6c44bfbf994fec91a4d5ceebf41d93c9f3867e687b2fa67b57b5b0
34+
1.30.8: 7b5191dfed6a27faadefebdc4a3b602b9a76adfc58fd04c50307f1377eabc590
3335
arm64:
3436
1.19.16: 6e51cc1f16259b1016858f32bd48f44929b8330a26eb4da26929907872ab116f
3537
1.20.15: 8e3f08018fb66ee8b01d468779dc88608ce86f7a8bada85b5c5ddaae0280aeca
@@ -47,8 +49,10 @@ kubelet_checksums:
4749
1.27.16: 2d3cfefc64e1ff5f1e1b8bcba0589a4a9b247f7bcd43cb78645f346687cbbef3
4850
1.28.4: bf203989dd9b3987b8a0d2331dcce6319f834b57df810fafba5a4805d54823ac
4951
1.28.13: e1c222cfe7ba457e0b3dc54bbe6149231586e2031e4e0ffddd6e34836e80acea
52+
1.29.12: 92237be83840bf8dd2318cb281ce309e907e0b665cac6b7629a5fa43a11ae606
53+
1.30.8: fdda0047c8c6a59956db72c781705eb705018d00ba594afffdb15ef630f81e28
5054

51-
kubelet_download_url: "https://storage.googleapis.com/kubernetes-release/release/v{{ kubelet_version }}/bin/{{ ansible_facts['system'] | lower }}/{{ download_artifact_goarch }}/kubelet" # noqa: yaml[line-length]
55+
kubelet_download_url: "https://cdn.dl.k8s.io/release/v{{ kubelet_version }}/bin/{{ ansible_facts['system'] | lower }}/{{ download_artifact_goarch }}/kubelet" # noqa: yaml[line-length]
5256
kubelet_download_dest: /usr/bin/kubelet
5357
kubelet_binary_checksum: "{{ kubelet_checksums[download_artifact_goarch][kubelet_version] }}"
5458

roles/kubernetes/templates/kubeadm.yaml.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ dns:
6767
{% endif %}
6868
apiServer:
6969
extraArgs:
70-
oidc-username-claim: email
7170
{% if kubernetes_oidc_issuer_url is defined %}
71+
oidc-username-claim: "{{ kubernetes_oidc_username_claim }}"
7272
oidc-issuer-url: {{ kubernetes_oidc_issuer_url }}
7373
oidc-client-id: {{ kubernetes_oidc_client_id }}
7474
{% endif %}

zuul.d/jobs-focal.yaml

+18
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,33 @@
3939
tox_environment:
4040
KUBERNETES_VERSION: 1.28.13
4141

42+
- job:
43+
name: ansible-collection-kubernetes-molecule-focal-aio-1-29
44+
parent: ansible-collection-kubernetes-molecule-focal-aio
45+
vars:
46+
tox_environment:
47+
KUBERNETES_VERSION: 1.29.12
48+
49+
- job:
50+
name: ansible-collection-kubernetes-molecule-focal-aio-1-30
51+
parent: ansible-collection-kubernetes-molecule-focal-aio
52+
vars:
53+
tox_environment:
54+
KUBERNETES_VERSION: 1.30.8
55+
4256
- project-template:
4357
name: ansible-collection-kubernetes-molecule-focal
4458
check:
4559
jobs:
4660
- ansible-collection-kubernetes-molecule-focal-aio-1-26
4761
- ansible-collection-kubernetes-molecule-focal-aio-1-27
4862
- ansible-collection-kubernetes-molecule-focal-aio-1-28
63+
- ansible-collection-kubernetes-molecule-focal-aio-1-29
64+
- ansible-collection-kubernetes-molecule-focal-aio-1-30
4965
gate:
5066
jobs:
5167
- ansible-collection-kubernetes-molecule-focal-aio-1-26
5268
- ansible-collection-kubernetes-molecule-focal-aio-1-27
5369
- ansible-collection-kubernetes-molecule-focal-aio-1-28
70+
- ansible-collection-kubernetes-molecule-focal-aio-1-29
71+
- ansible-collection-kubernetes-molecule-focal-aio-1-30

zuul.d/jobs-jammy.yaml

+18
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,33 @@
3636
tox_environment:
3737
KUBERNETES_VERSION: 1.28.13
3838

39+
- job:
40+
name: ansible-collection-kubernetes-molecule-jammy-aio-1-29
41+
parent: ansible-collection-kubernetes-molecule-jammy-aio
42+
vars:
43+
tox_environment:
44+
KUBERNETES_VERSION: 1.29.12
45+
46+
- job:
47+
name: ansible-collection-kubernetes-molecule-jammy-aio-1-30
48+
parent: ansible-collection-kubernetes-molecule-jammy-aio
49+
vars:
50+
tox_environment:
51+
KUBERNETES_VERSION: 1.30.8
52+
3953
- project-template:
4054
name: ansible-collection-kubernetes-molecule-jammy
4155
check:
4256
jobs:
4357
- ansible-collection-kubernetes-molecule-jammy-aio-1-26
4458
- ansible-collection-kubernetes-molecule-jammy-aio-1-27
4559
- ansible-collection-kubernetes-molecule-jammy-aio-1-28
60+
- ansible-collection-kubernetes-molecule-jammy-aio-1-29
61+
- ansible-collection-kubernetes-molecule-jammy-aio-1-30
4662
gate:
4763
jobs:
4864
- ansible-collection-kubernetes-molecule-jammy-aio-1-26
4965
- ansible-collection-kubernetes-molecule-jammy-aio-1-27
5066
- ansible-collection-kubernetes-molecule-jammy-aio-1-28
67+
- ansible-collection-kubernetes-molecule-jammy-aio-1-29
68+
- ansible-collection-kubernetes-molecule-jammy-aio-1-30

zuul.d/jobs-rockylinux9.yaml

+18
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,33 @@
4040
tox_environment:
4141
KUBERNETES_VERSION: 1.28.13
4242

43+
- job:
44+
name: ansible-collection-kubernetes-molecule-rockylinux9-aio-1-29
45+
parent: ansible-collection-kubernetes-molecule-rockylinux9-aio
46+
vars:
47+
tox_environment:
48+
KUBERNETES_VERSION: 1.29.12
49+
50+
- job:
51+
name: ansible-collection-kubernetes-molecule-rockylinux9-aio-1-30
52+
parent: ansible-collection-kubernetes-molecule-rockylinux9-aio
53+
vars:
54+
tox_environment:
55+
KUBERNETES_VERSION: 1.30.8
56+
4357
- project-template:
4458
name: ansible-collection-kubernetes-molecule-rockylinux9
4559
check:
4660
jobs:
4761
- ansible-collection-kubernetes-molecule-rockylinux9-aio-1-26
4862
- ansible-collection-kubernetes-molecule-rockylinux9-aio-1-27
4963
- ansible-collection-kubernetes-molecule-rockylinux9-aio-1-28
64+
- ansible-collection-kubernetes-molecule-rockylinux9-aio-1-29
65+
- ansible-collection-kubernetes-molecule-rockylinux9-aio-1-30
5066
gate:
5167
jobs:
5268
- ansible-collection-kubernetes-molecule-rockylinux9-aio-1-26
5369
- ansible-collection-kubernetes-molecule-rockylinux9-aio-1-27
5470
- ansible-collection-kubernetes-molecule-rockylinux9-aio-1-28
71+
- ansible-collection-kubernetes-molecule-rockylinux9-aio-1-29
72+
- ansible-collection-kubernetes-molecule-rockylinux9-aio-1-30

0 commit comments

Comments
 (0)