From 5b5bd605e4a9c2320f1973a693ce43312ef3efc6 Mon Sep 17 00:00:00 2001 From: The Magician Date: Mon, 11 Mar 2019 14:20:07 -0700 Subject: [PATCH] Node Pool versioning (#206) Signed-off-by: Modular Magician --- plugins/modules/gcp_container_cluster.py | 16 +--------------- plugins/modules/gcp_container_node_pool.py | 6 ++++++ 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/plugins/modules/gcp_container_cluster.py b/plugins/modules/gcp_container_cluster.py index 3f0edf6e..d526d578 100644 --- a/plugins/modules/gcp_container_cluster.py +++ b/plugins/modules/gcp_container_cluster.py @@ -221,14 +221,6 @@ options: set of masters, as well as the ILB VIP. This range must not overlap with any other ranges in use within the cluster's network. required: false - private_endpoint: - description: - - The internal IP address of this cluster's master endpoint. - required: false - public_endpoint: - description: - - The external IP address of this cluster's master endpoint. - required: false cluster_ipv4_cidr: description: - The IP address range of the container pods in this cluster, in CIDR notation @@ -664,13 +656,7 @@ def main(): network=dict(type='str'), private_cluster_config=dict( type='dict', - options=dict( - enable_private_nodes=dict(type='bool'), - enable_private_endpoint=dict(type='bool'), - master_ipv4_cidr_block=dict(type='str'), - private_endpoint=dict(type='str'), - public_endpoint=dict(type='str'), - ), + options=dict(enable_private_nodes=dict(type='bool'), enable_private_endpoint=dict(type='bool'), master_ipv4_cidr_block=dict(type='str')), ), cluster_ipv4_cidr=dict(type='str'), addons_config=dict( diff --git a/plugins/modules/gcp_container_node_pool.py b/plugins/modules/gcp_container_node_pool.py index d7416aab..341d8311 100644 --- a/plugins/modules/gcp_container_node_pool.py +++ b/plugins/modules/gcp_container_node_pool.py @@ -144,6 +144,11 @@ options: resource quota is sufficient for this number of instances. You must also have available firewall and routes quota. required: true + version: + description: + - The version of the Kubernetes of this node. + required: false + version_added: 2.8 autoscaling: description: - Autoscaler configuration for this NodePool. Autoscaler is enabled only if a @@ -452,6 +457,7 @@ def main(): ), ), initial_node_count=dict(required=True, type='int'), + version=dict(type='str'), autoscaling=dict(type='dict', options=dict(enabled=dict(type='bool'), min_node_count=dict(type='int'), max_node_count=dict(type='int'))), management=dict( type='dict', options=dict(auto_upgrade=dict(type='bool'), auto_repair=dict(type='bool'), upgrade_options=dict(type='dict', options=dict()))