chore: pin to KIC helm 0.15.2 / image 2.4.2 (#226)

nginxinc · Jan 18, 2023 · 45bf269 · 45bf269
1 parent ecb9611
commit 45bf269
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/config/pulumi/Pulumi.stackname.yaml.example b/config/pulumi/Pulumi.stackname.yaml.example
@@ -151,7 +151,7 @@ config:
   # Chart name for the helm chart for kic
   kic-helm:chart_name: nginx-ingress
   # Chart version for the helm chart for kic
-  kic-helm:chart_version: 0.15.0
+  kic-helm:chart_version: 0.15.2
   # Name of the repo to pull the kic chart from
   kic-helm:helm_repo_name: nginx-stable
   # URL of the chart repo to pull kic from
@@ -175,12 +175,12 @@ config:
   # https://docs.nginx.com/nginx-ingress-controller/installation/pulling-ingress-controller-image/
   #
   # The following are all valid image names:
-  # kic:image_name: private-registry.nginx.com/nginx-ic/nginx-plus-ingress:2.3.0
-  # kic:image_name: private-registry.nginx.com/nginx-ic/nginx-plus-ingress:2.3.0-ot
-  # kic:image_name: docker.io/nginx/nginx-ingress:2.3.0
-  # kic:image_name: nginx/nginx-ingress:2.3.0
-  # kic:image_name: nginx/nginx-ingress:2.3.0-alpine
-  kic:image_name: nginx/nginx-ingress:2.3.0
+  # kic:image_name: private-registry.nginx.com/nginx-ic/nginx-plus-ingress:2.4.2
+  # kic:image_name: private-registry.nginx.com/nginx-ic/nginx-plus-ingress:2.4.2-ot
+  # kic:image_name: docker.io/nginx/nginx-ingress:2.4.2
+  # kic:image_name: nginx/nginx-ingress:2.4.2
+  # kic:image_name: nginx/nginx-ingress:2.4.2-alpine
+  kic:image_name: nginx/nginx-ingress:2.4.2
 
 
   ############################################################################

diff --git a/pulumi/python/kubernetes/nginx/ingress-controller-repo-only/__main__.py b/pulumi/python/kubernetes/nginx/ingress-controller-repo-only/__main__.py
@@ -19,7 +19,7 @@
     chart_name = 'nginx-ingress'
 chart_version = config.get('chart_version')
 if not chart_version:
-    chart_version = '0.15.0'
+    chart_version = '0.15.2'
 helm_repo_name = config.get('helm_repo_name')
 if not helm_repo_name:
     helm_repo_name = 'nginx-stable'
@@ -31,7 +31,7 @@
     nginx_repository = "nginx/nginx-ingress"
 nginx_tag = config.get('nginx_tag')
 if not nginx_tag:
-    nginx_tag = "2.4.0"
+    nginx_tag = "2.4.2"
 nginx_plus_flag = config.get_bool('nginx_plus_flag')
 if not nginx_plus_flag:
     nginx_plus_flag = False

diff --git a/pulumi/python/kubernetes/nginx/ingress-controller/__main__.py b/pulumi/python/kubernetes/nginx/ingress-controller/__main__.py
@@ -17,7 +17,7 @@
     chart_name = 'nginx-ingress'
 chart_version = config.get('chart_version')
 if not chart_version:
-    chart_version = '0.15.0'
+    chart_version = '0.15.2'
 helm_repo_name = config.get('helm_repo_name')
 if not helm_repo_name:
     helm_repo_name = 'nginx-stable'

diff --git a/pulumi/python/utility/kic-image-build/__main__.py b/pulumi/python/utility/kic-image-build/__main__.py
@@ -5,6 +5,8 @@
 from ingress_controller_image_puller_args import IngressControllerImagePullerArgs
 from nginx_plus_args import NginxPlusArgs
 
+DEFAULT_KIC = "nginx/nginx-ingress:2.4.2"
+
 stack_name = pulumi.get_stack()
 project_name = pulumi.get_project()
 
@@ -42,7 +44,11 @@
     ingress_image = IngressControllerImage(name='nginx-ingress-controller',
                                            kic_image_args=image_args)
 elif image_origin == 'registry':
-    image_args = IngressControllerImagePullerArgs(image_name=config.get('image_name'))
+    if not config.get('image_name'):
+        image_args = IngressControllerImagePullerArgs(image_name=DEFAULT_KIC)
+    else:
+        image_args = IngressControllerImagePullerArgs(image_name=config.get('image_name'))
+
     ingress_image = IngressControllerImage(name='nginx-ingress-controller',
                                            kic_image_args=image_args)
 else: