Merge pull request #1175 from polyseam/k8s-version

[Enhancement] top-level k8s version override

Author: johnstonmatt

src/cndi_config/types.ts

@@ -19,6 +19,7 @@ export interface CNDIConfigSpec {
   region?: string;
   provider: CNDIProvider;
   distribution: CNDIDistribution;
+  kubernetes_version?: string;
   infrastructure: CNDIInfrastructureSpec; // Required in schema
   applications?: {
     [key: string]: CNDIApplicationSpec;

src/outputs/terraform/aws/eks/classic/network-mode-create/module/cndi_aws_eks_module.tf.json.ts

@@ -4,7 +4,9 @@ import { NormalizedCNDIConfig } from "src/cndi_config/types.ts";
 const MODULE_SOURCE =
   "git::https://github.com/terraform-aws-modules/terraform-aws-eks.git?ref=a713f6f464eb579a39918f60f130a5fbb77a6b30";
 
-export default function (_cndi_config: NormalizedCNDIConfig) {
+export default function (cndi_config: NormalizedCNDIConfig) {
+  const cluster_version = cndi_config?.kubernetes_version ||
+    DEFAULT_K8S_VERSION;
   return getPrettyJSONString({
     module: {
       cndi_aws_eks_module: {
@@ -21,7 +23,7 @@ export default function (_cndi_config: NormalizedCNDIConfig) {
           },
         },
         cluster_name: "${local.cndi_project_name}",
-        cluster_version: DEFAULT_K8S_VERSION,
+        cluster_version,
         cluster_endpoint_public_access: true, // TODO: probably bad
         enable_cluster_creator_admin_permissions: true,
         vpc_id: "${module.cndi_aws_vpc_module.vpc_id}",

src/outputs/terraform/aws/eks/classic/network-mode-insert/module/cndi_aws_eks_module.tf.json.ts

@@ -4,7 +4,9 @@ import { NormalizedCNDIConfig } from "src/cndi_config/types.ts";
 const MODULE_SOURCE =
   "git::https://github.com/terraform-aws-modules/terraform-aws-eks.git?ref=a713f6f464eb579a39918f60f130a5fbb77a6b30";
 
-export default function (_cndi_config: NormalizedCNDIConfig) {
+export default function (cndi_config: NormalizedCNDIConfig) {
+  const cluster_version = cndi_config?.kubernetes_version ||
+    DEFAULT_K8S_VERSION;
   return getPrettyJSONString({
     module: {
       cndi_aws_eks_module: {
@@ -21,7 +23,7 @@ export default function (_cndi_config: NormalizedCNDIConfig) {
           },
         },
         cluster_name: "${local.cndi_project_name}",
-        cluster_version: DEFAULT_K8S_VERSION,
+        cluster_version,
         cluster_endpoint_public_access: true, // TODO: probably bad
         enable_cluster_creator_admin_permissions: true,
         vpc_id: "${local.network_identifier}",

src/outputs/terraform/azure/aks/classic/network-mode-create/module/cndi_azurerm_aks_module.tf.json.ts

@@ -7,13 +7,15 @@ import { NETWORK_PROFILE } from "consts";
 const MODULE_SOURCE = "Azure/aks/azurerm//v4";
 
 export default function (cndi_config: NormalizedCNDIConfig): string | null {
+  const kubernetes_version = cndi_config?.kubernetes_version ||
+    DEFAULT_K8S_VERSION;
   const node_resource_group = getNodeResourceGroupName(cndi_config);
   return getPrettyJSONString({
     module: {
       cndi_azurerm_aks_module: {
         version: "10.0.1",
         source: MODULE_SOURCE,
-        kubernetes_version: DEFAULT_K8S_VERSION,
+        kubernetes_version,
         node_resource_group,
         automatic_channel_upgrade: "patch",
         prefix: "cndi-aks-${local.cndi_project_name}",

src/outputs/terraform/azure/aks/classic/network-mode-insert/module/cndi_azurerm_aks_module.tf.json.ts

@@ -17,12 +17,14 @@ export default function (cndi_config: NormalizedCNDIConfig): string | null {
   const additionalNodePoolSubnetIds =
     "${length(local.private_subnet_ids) > 1 ? jsonencode([for i in range(1, length(local.private_subnet_ids)) : local.private_subnet_ids[i]]) : '[]'}";
 
+  const kubernetes_version = cndi_config?.kubernetes_version ||
+    DEFAULT_K8S_VERSION;
   return getPrettyJSONString({
     module: {
       cndi_azurerm_aks_module: {
         version: "10.0.1",
         source: MODULE_SOURCE,
-        kubernetes_version: DEFAULT_K8S_VERSION,
+        kubernetes_version,
         node_resource_group,
         automatic_channel_upgrade: "patch",
         prefix: "cndi-aks-${local.cndi_project_name}",

src/outputs/terraform/cloud-init/microk8s/follower.yml.ts

@@ -35,7 +35,7 @@ const getFollowerCloudInitYaml = (
   );
 
   const microk8sVersion = config.infrastructure.cndi?.microk8s?.version ||
-    DEFAULT_K8S_VERSION;
+    config?.kubernetes_version || DEFAULT_K8S_VERSION;
   const microk8sChannel = config.infrastructure.cndi?.microk8s?.channel ||
     "stable";
 

src/outputs/terraform/cloud-init/microk8s/leader.yml.ts

@@ -80,7 +80,7 @@ const getLeaderCloudInitYaml = (
 ) => {
   const addons = getMicrok8sAddons(config);
   const microk8sVersion = config.infrastructure.cndi?.microk8s?.version ||
-    DEFAULT_K8S_VERSION;
+    config?.kubernetes_version || DEFAULT_K8S_VERSION;
   const microk8sChannel = config.infrastructure.cndi?.microk8s?.channel ||
     "stable";
 

src/outputs/terraform/dev/microk8s/templatefiles/cndi_local_sensitive_file_microk8s_leader_cloud_init.template.yml.tftpl.ts

@@ -81,7 +81,7 @@ const getLeaderCloudInitYaml = (
 ) => {
   const addons = getMicrok8sAddons(config);
   const microk8sVersion = config.infrastructure.cndi?.microk8s?.version ||
-    DEFAULT_K8S_VERSION;
+    config?.kubernetes_version || DEFAULT_K8S_VERSION;
   const microk8sChannel = config.infrastructure.cndi?.microk8s?.channel ||
     "stable";
 

src/outputs/terraform/gcp/gke/classic/network-mode-create/module/cndi_gcp_gke_module.tf.json.ts

@@ -8,10 +8,11 @@ const MODULE_SOURCE =
   "git::https://github.com/terraform-google-modules/terraform-google-kubernetes-engine.git?ref=" +
   SHA_36_3_0;
 
-export default function (_cndi_config: NormalizedCNDIConfig) {
+export default function (cndi_config: NormalizedCNDIConfig) {
   const ip_range_pods = "cluster-pods";
   const ip_range_services = "cluster-services";
-
+  const kubernetes_version = cndi_config?.kubernetes_version ||
+    DEFAULT_K8S_VERSION;
   return getPrettyJSONString({
     module: {
       cndi_gcp_gke_module: {
@@ -43,7 +44,7 @@ export default function (_cndi_config: NormalizedCNDIConfig) {
         ip_range_pods,
         ip_range_services,
 
-        kubernetes_version: DEFAULT_K8S_VERSION,
+        kubernetes_version,
       },
     },
   });

src/outputs/terraform/gcp/gke/classic/network-mode-insert/module/cndi_gcp_gke_module.tf.json.ts

@@ -8,12 +8,14 @@ const MODULE_SOURCE =
   "git::https://github.com/terraform-google-modules/terraform-google-kubernetes-engine.git?ref=" +
   SHA_36_3_0;
 
-export default function (_cndi_config: NormalizedCNDIConfig) {
+export default function (cndi_config: NormalizedCNDIConfig) {
   const ip_range_pods = "cluster-pods";
   const ip_range_services = "cluster-services";
   const cluster_network = "${local.network_identifier}";
   const cluster_subnet =
     "${concat(local.private_subnet_ids, local.public_subnet_ids)[0]}";
+  const kubernetes_version = cndi_config?.kubernetes_version ||
+    DEFAULT_K8S_VERSION;
   return getPrettyJSONString({
     module: {
       cndi_gcp_gke_module: {
@@ -44,7 +46,7 @@ export default function (_cndi_config: NormalizedCNDIConfig) {
         ip_range_pods,
         ip_range_services,
 
-        kubernetes_version: DEFAULT_K8S_VERSION,
+        kubernetes_version,
       },
     },
   });