From 5c3e1d6dc05ea217a76c62993246227db94e9a11 Mon Sep 17 00:00:00 2001 From: Michael McCulloch Date: Sat, 3 Feb 2024 16:46:23 -0700 Subject: [PATCH 1/2] Make TCPRoute and UDPRoute Available (Experimental) (#3) Co-authored-by: Michael McCulloch --- tasks/control-plane-setup.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tasks/control-plane-setup.yml b/tasks/control-plane-setup.yml index 2e86b16..669a95d 100644 --- a/tasks/control-plane-setup.yml +++ b/tasks/control-plane-setup.yml @@ -10,17 +10,15 @@ dest: "{{ kubernetes_kubeadm_kubelet_config_file_path }}" - name: Determine if we are replacing kube-proxy with cilium - set_fact: - replace_kube_proxy="{{ (kubernetes_pod_network.cni == 'cilium') and - (kubernetes_cilium_values is defined) and - (kubernetes_cilium_values.kubeProxyReplacement is defined) and - (kubernetes_cilium_values.kubeProxyReplacement) | bool }}" + set_fact: replace_kube_proxy="{{ (kubernetes_pod_network.cni == 'cilium') and + (kubernetes_cilium_values is defined) and + (kubernetes_cilium_values.kubeProxyReplacement is defined) and + (kubernetes_cilium_values.kubeProxyReplacement) | bool }}" - name: Determine if we installing Gateway API - set_fact: - install_gateway_api="{{ (replace_kube_proxy) and - (kubernetes_cilium_values.gatewayAPI.enabled is defined) and - (kubernetes_cilium_values.gatewayAPI.enabled)| bool }}" + set_fact: install_gateway_api="{{ (replace_kube_proxy) and + (kubernetes_cilium_values.gatewayAPI.enabled is defined) and + (kubernetes_cilium_values.gatewayAPI.enabled)| bool }}" - name: Initialize Kubernetes control plane with kubeadm init command: > @@ -120,6 +118,8 @@ - https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.0.0/config/crd/standard/gateway.networking.k8s.io_referencegrants.yaml - https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.0.0/config/crd/experimental/gateway.networking.k8s.io_grpcroutes.yaml - https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.0.0/config/crd/experimental/gateway.networking.k8s.io_tlsroutes.yaml + - https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.0.0/config/crd/experimental/gateway.networking.k8s.io_tcproutes.yaml + - https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.0.0/config/crd/experimental/gateway.networking.k8s.io_udproutes.yaml - name: Configure Cilium networking command: > From 210a0ab262dcb9d664651f200f28357ff6ed908b Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Tue, 16 Jul 2024 14:22:27 -0500 Subject: [PATCH 2/2] Fixup CI versions. Drop all older RHEL releases which are broken. --- .github/workflows/ci.yml | 2 +- molecule/default/molecule.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e25bd67..a3578b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,7 @@ jobs: strategy: matrix: include: - - distro: rockylinux8 + - distro: rockylinux9 playbook: converge.yml - distro: ubuntu2004 playbook: converge.yml diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 253c8f2..722231d 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -8,7 +8,7 @@ driver: name: docker platforms: - name: instance - image: "geerlingguy/docker-${MOLECULE_DISTRO:-rockylinux8}-ansible:latest" + image: "geerlingguy/docker-${MOLECULE_DISTRO:-rockylinux9}-ansible:latest" command: ${MOLECULE_DOCKER_COMMAND:-""} volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw