From 31d22a2fb98dec46324a8bb7409d98521ac5e3e9 Mon Sep 17 00:00:00 2001 From: Andre Araujo Date: Thu, 7 Jul 2022 13:29:54 +1000 Subject: [PATCH 1/2] Added subnet filters to the df_service module. Signed-off-by: Andre Araujo --- docs/configuration.yml | 2 +- roles/runtime/defaults/main.yml | 8 +++++--- roles/runtime/tasks/setup_base.yml | 4 +++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/docs/configuration.yml b/docs/configuration.yml index 2924a040..2c0531d0 100644 --- a/docs/configuration.yml +++ b/docs/configuration.yml @@ -50,7 +50,7 @@ df: max_k8s_nodes: public_loadbalancer: loadbalancer_ip_ranges: - kube_ip_ranges: + k8s_ip_ranges: cluster_subnets: loadbalancer_subnets: teardown: diff --git a/roles/runtime/defaults/main.yml b/roles/runtime/defaults/main.yml index c2a2beaf..62c0ee77 100644 --- a/roles/runtime/defaults/main.yml +++ b/roles/runtime/defaults/main.yml @@ -87,9 +87,11 @@ run__df_nodes_min: "{{ df.min_k8s_nodes | default(3) }}" run__df_nodes_max: "{{ df.max_k8s_nodes | default(5) }}" run__df_public_loadbalancer: "{{ df.public_loadbalancer | default(run__public_endpoint_access) }}" run__df_lb_ip_ranges: "{{ df.loadbalancer_ip_ranges | default([]) }}" -run__df_kube_ip_ranges: "{{ df.kube_ip_ranges | default([]) }}" -run__df_cluster_subnets: "{{ df.cluster_subnets | default([]) }}" -run__df_lb_subnets: "{{ df.loadbalancer_subnets | default([]) }}" +run__df_k8s_ip_ranges: "{{ df.k8s_ip_ranges | default([]) }}" +run__df_cluster_subnets: "{{ df.cluster_subnets | default(omit) }}" +run__df_cluster_subnets_filter: "{{ df.cluster_subnets_filter | default(omit) }}" +run__df_lb_subnets: "{{ df.loadbalancer_subnets | default(omit) }}" +run__df_lb_subnets_filter: "{{ df.loadbalancer_subnets_filter | default(omit) }}" run__df_persist: "{{ df.teardown.persist | default(False) }}" run__df_force_delete: "{{ df.force_delete | default(run__force_teardown) }}" run__df_terminate_deployments: "{{ df.terminate_deployments | default(True) }}" diff --git a/roles/runtime/tasks/setup_base.yml b/roles/runtime/tasks/setup_base.yml index 463d1177..f0d97600 100644 --- a/roles/runtime/tasks/setup_base.yml +++ b/roles/runtime/tasks/setup_base.yml @@ -116,9 +116,11 @@ nodes_max: "{{ run__df_nodes_max }}" public_loadbalancer: "{{ run__df_public_loadbalancer }}" loadbalancer_ip_ranges: "{{ run__df_lb_ip_ranges }}" - kube_ip_ranges: "{{ run__df_kube_ip_ranges }}" + k8s_ip_ranges: "{{ run__df_k8s_ip_ranges }}" cluster_subnets: "{{ run__df_cluster_subnets }}" + cluster_subnets_filter: "{{ run__df_cluster_subnets_filter }}" loadbalancer_subnets: "{{ run__df_lb_subnets }}" + loadbalancer_subnets_filter: "{{ run__df_lb_subnets_filter }}" tags: "{{ run__df_tags }}" state: present wait: no From 58642910477a181c2f0c583f5f268270d3676ecb Mon Sep 17 00:00:00 2001 From: Andre Araujo Date: Mon, 7 Nov 2022 13:03:20 +1100 Subject: [PATCH 2/2] Added subnet filters to datahub cluster. Signed-off-by: Andre Araujo --- docs/configuration.yml | 8 ++++++++ roles/runtime/tasks/initialize_base.yml | 3 +++ roles/runtime/tasks/setup_base.yml | 5 ++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/docs/configuration.yml b/docs/configuration.yml index 2c0531d0..e81a18bf 100644 --- a/docs/configuration.yml +++ b/docs/configuration.yml @@ -20,6 +20,14 @@ datahub: azure: gcp: definitions: + - name: + template: + definition: + instance_groups: + extension: + subnets_filter: + multi_az: + tags: image_catalog: name: url: diff --git a/roles/runtime/tasks/initialize_base.yml b/roles/runtime/tasks/initialize_base.yml index 657f9185..fda73adb 100644 --- a/roles/runtime/tasks/initialize_base.yml +++ b/roles/runtime/tasks/initialize_base.yml @@ -102,6 +102,9 @@ template: "{{ __datahub_config.template | default(include.template | default(omit) ) }}" definition: "{{ __datahub_config.definition | default(include.definition | default(omit) ) }}" instance_groups: "{{ (overlay | length > 0) | ternary(overlay | map('cloudera.exe.combine_onto', base, recursive=True) | list, omit) }}" + extension: "{{ __datahub_config.extension | default(omit) }}" + subnets_filter: "{{ __datahub_config.subnets_filter | default(omit) }}" + multi_az: "{{ __datahub_config.multi_az | default(omit) }}" tags: "{{ __datahub_config.tags | default(run__datahub_tags) }}" loop: "{{ run__datahub_definitions }}" loop_control: diff --git a/roles/runtime/tasks/setup_base.yml b/roles/runtime/tasks/setup_base.yml index f0d97600..7b0f2e6a 100644 --- a/roles/runtime/tasks/setup_base.yml +++ b/roles/runtime/tasks/setup_base.yml @@ -27,6 +27,9 @@ template: "{{ ('template' in __datahub_config_item) | ternary(run__datahub_available_templates | select('ansible.builtin.search', __datahub_config_item.template | default(omit)) | list | first, omit, omit) }}" definition: "{{ ('definition' in __datahub_config_item) | ternary(run__datahub_available_definitions | select('ansible.builtin.search', __datahub_config_item.definition | default(omit)) | list | first, omit, omit) }}" groups: "{{ __datahub_config_item.instance_groups | default(omit) }}" + extension: "{{ __datahub_config_item.extension | default(omit) }}" + subnets_filter: "{{ __datahub_config_item.subnets_filter | default(omit) }}" + multi_az: "{{ __datahub_config_item.multi_az | default(omit) }}" tags: "{{ __datahub_config_item.tags }}" wait: yes loop_control: @@ -295,4 +298,4 @@ loop: "{{ __df_deployments.results }}" loop_control: loop_var: __df_deployment - label: "{{ __df_deployment.__df_deploy_item.0.name | default ('None') }}" \ No newline at end of file + label: "{{ __df_deployment.__df_deploy_item.0.name | default ('None') }}"