Skip to content

Commit

Permalink
23.0.0+1.27.5 (#43)
Browse files Browse the repository at this point in the history
* update k8s_release to 1.27.5

* moved container-runtime-endpoint setting from k8s_worker_kubelet_settings (/etc/systemd/system/kubelet.service) to k8s_worker_kubelet_conf_yaml (kubelet-config.yaml)

* update CHANGELOG

* change role_name from kubernetes-worker to kubernetes_worker

* rename kubernetes-controller to kubernetes_controller

* meta/main.yml: remove Ubuntu 18.04 as supported OS (reached EOL)

* update CHANGELOG

* tasks/main.yml: remove - Install some network packages - task for Red Hat based OSes (was actually never officially supported)

* meta/main.yml: put focal into double quotes
  • Loading branch information
githubixx committed Sep 4, 2023
1 parent 1ab3f65 commit c7c8649
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 22 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## 23.0.0+1.27.5

- **BREAKING**: `meta/main.yml`: change role_name from `kubernetes-worker` to `kubernetes_worker`. This is a requirement since quite some time for Ansible Galaxy. But the requirement was introduced after this role already existed for quite some time. So please update the name of the role in your playbook accordingly!
- rename `kubernetes-controller` to `kubernetes_controller` as role name changed (requirement as before)
- update `k8s_release` to `1.27.5`
- `meta/main.yml`: remove Ubuntu 18.04 as supported OS (reached EOL)
- moved `container-runtime-endpoint` setting from `k8s_worker_kubelet_settings` variable (`/etc/systemd/system/kubelet.service`) to `k8s_worker_kubelet_conf_yaml` variable (`kubelet-config.yaml`). The name changed from `container-runtime-endpoint` to `containerRuntimeEndpoint`. For more information see pull request [kubelet: migrate container runtime endpoint flag to config](https://github.com/kubernetes/kubernetes/pull/112136).
- remove `Install some network packages` task for Red Hat based OSes (was actually never officially supported)

## 22.0.1+1.26.8

- update `k8s_release` to `1.26.8`
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ k8s_conf_dir: "/var/lib/kubernetes"
k8s_bin_dir: "/usr/local/bin"

# K8s release
k8s_release: "1.26.8"
k8s_release: "1.27.5"

# The interface on which the K8s services should listen on. As all cluster
# communication should use a VPN interface the interface name is
Expand Down Expand Up @@ -139,7 +139,7 @@ k8s_worker_kubeproxy_conf_yaml: |
Dependencies
------------

- [kubernetes-controller](https://galaxy.ansible.com/githubixx/kubernetes-controller/)
- [kubernetes_controller](https://galaxy.ansible.com/githubixx/kubernetes_controller/)
- [containerd](https://galaxy.ansible.com/githubixx/containerd)

Example Playbook
Expand All @@ -148,7 +148,7 @@ Example Playbook
```yaml
- hosts: k8s_worker
roles:
- githubixx.kubernetes-worker
- githubixx.kubernetes_worker
```

License
Expand Down
4 changes: 2 additions & 2 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ k8s_conf_dir: "/var/lib/kubernetes"
k8s_bin_dir: "/usr/local/bin"

# K8s release
k8s_release: "1.26.8"
k8s_release: "1.27.5"

# The interface on which the K8s services should listen on. As all cluster
# communication should use a VPN interface the interface name is
Expand Down Expand Up @@ -56,7 +56,6 @@ k8s_worker_kubelet_conf_dir: "/var/lib/kubelet"
k8s_worker_kubelet_settings:
"config": "{{ k8s_worker_kubelet_conf_dir }}/kubelet-config.yaml"
"node-ip": "{{ hostvars[inventory_hostname]['ansible_' + k8s_interface].ipv4.address }}"
"container-runtime-endpoint": "unix:///run/containerd/containerd.sock"
"kubeconfig": "{{ k8s_worker_kubelet_conf_dir }}/kubeconfig"

# kubelet kubeconfig
Expand Down Expand Up @@ -85,6 +84,7 @@ k8s_worker_kubelet_conf_yaml: |
tlsPrivateKeyFile: "{{ k8s_conf_dir }}/cert-{{ inventory_hostname }}-key.pem"
cgroupDriver: "systemd"
registerNode: true
containerRuntimeEndpoint: "unix:///run/containerd/containerd.sock"
# Directory to store kube-proxy configuration
k8s_worker_kubeproxy_conf_dir: "/var/lib/kube-proxy"
Expand Down
5 changes: 2 additions & 3 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ galaxy_info:
description: Installs Kubernetes worker.
license: GPLv3
min_ansible_version: "2.9"
role_name: kubernetes-worker
role_name: kubernetes_worker
namespace: githubixx
platforms:
- name: Ubuntu
versions:
- bionic
- focal
- "focal"
galaxy_tags:
- kubernetes
- worker
2 changes: 1 addition & 1 deletion molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
when:
- k8s_worker_setup_networking is not defined
ansible.builtin.include_role:
name: githubixx.kubernetes-worker
name: githubixx.kubernetes_worker

- name: Setup Cilium
hosts: k8s_worker
Expand Down
4 changes: 2 additions & 2 deletions molecule/default/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,9 @@
become: true
gather_facts: true
tasks:
- name: Include kubernetes-controller role
- name: Include kubernetes_controller role
ansible.builtin.include_role:
name: githubixx.kubernetes-controller
name: githubixx.kuberneter_controller

- name: Setup containerd
hosts: k8s_worker
Expand Down
4 changes: 2 additions & 2 deletions molecule/default/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ roles:
- githubixx.kubernetes-ca
- githubixx.etcd
- githubixx.kubectl
- githubixx.kubernetes-controller
- githubixx.kubernetes-worker
- githubixx.kubernetes_controller
- githubixx.kubernetes_worker
- githubixx.containerd
- githubixx.cilium_kubernetes
9 changes: 0 additions & 9 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,6 @@
pkg: ['ebtables', 'ethtool', 'ipset', 'conntrack', 'iptables', 'iptstate', 'netstat-nat', 'socat', 'netbase']
tags:
- k8s-worker
when: ansible_os_family == "Debian"

- name: Install some network packages
ansible.builtin.yum:
state: present
name: ['ebtables', 'ethtool', 'ipset', 'conntrack', 'iptables', 'iptstate', 'net-tools']
tags:
- k8s-worker
when: ansible_os_family == "RedHat"

- name: Copy worker certificates (part 1)
ansible.builtin.copy:
Expand Down

0 comments on commit c7c8649

Please sign in to comment.