Skip to content

Commit 4ad9f9b

Browse files
authored
Merge pull request #11763 from tico88612/feat/gateway-api-v1.2.1
Refactor Gateway API installation process and bump Gateway API v1.2.1
2 parents 79fbfdf + 6f58b33 commit 4ad9f9b

File tree

8 files changed

+45
-31807
lines changed

8 files changed

+45
-31807
lines changed

inventory/sample/group_vars/k8s_cluster/addons.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ local_volume_provisioner_enabled: false
6767

6868
# Gateway API CRDs
6969
gateway_api_enabled: false
70-
# gateway_api_experimental_channel: false
7170

7271
# Nginx ingress controller deployment
7372
ingress_nginx_enabled: false
Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
---
22
gateway_api_enabled: false
3-
gateway_api_version: 1.1.0
4-
gateway_api_experimental_channel: false
3+
gateway_api_version: 1.2.1
4+
5+
# `gateway_api_channel` default is "standard".
6+
# "standard" release channel includes all resources that have graduated to GA or beta, including GatewayClass, Gateway, HTTPRoute, and ReferenceGrant.
7+
# "experimental" for some experimental resources and fields. Note that future releases of the API could include breaking changes to experimental resources and fields. For example, any experimental resource or field could be removed in a future release.
8+
# https://gateway-api.sigs.k8s.io/guides/#install-experimental-channel
9+
gateway_api_channel: "standard"

roles/kubernetes-apps/gateway_api/tasks/main.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
---
2+
- name: Gateway API | Download YAML
3+
include_tasks: "../../../download/tasks/download_file.yml"
4+
vars:
5+
download: "{{ download_defaults | combine(downloads.gateway_api_crds) }}"
6+
27
- name: Gateway API | Create addon dir
38
file:
49
path: "{{ kube_config_dir }}/addons/gateway_api"
@@ -9,17 +14,12 @@
914
when:
1015
- inventory_hostname == groups['kube_control_plane'][0]
1116

12-
- name: Gateway API | Set channel
13-
set_fact:
14-
gateway_api_channel: "{{ 'experimental' if gateway_api_experimental_channel else 'standard' }}"
15-
when:
16-
- "inventory_hostname == groups['kube_control_plane'][0]"
17-
18-
- name: Gateway API | Copy Gateway API manifests to remote
19-
template:
20-
src: "{{ gateway_api_channel }}-install.yaml.j2"
17+
- name: Gateway API | Copy YAML from download dir
18+
copy:
19+
src: "{{ local_release_dir }}/gateway-api-{{ gateway_api_channel }}-install.yaml"
2120
dest: "{{ kube_config_dir }}/addons/gateway_api/{{ gateway_api_channel }}-install.yaml"
2221
mode: "0644"
22+
remote_src: true
2323
when:
2424
- "inventory_hostname == groups['kube_control_plane'][0]"
2525

0 commit comments

Comments
 (0)