Include default /etc/nginx files in controller images.

Signed-off-by: Nashwan Azhari <[email protected]>
canonical · Aug 12, 2024 · c1d4c93 · c1d4c93
1 parent d3e8d4d
commit c1d4c93
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/controller/v1.10.1/rockcraft.yaml b/controller/v1.10.1/rockcraft.yaml
@@ -134,6 +134,12 @@ parts:
   build-nginx:
     plugin: nil
     after: ['build-libgrpcpp', 'build-libssl']
+
+    source-type: git
+    source: https://github.com/kubernetes/ingress-nginx
+    source-tag: controller-v1.10.1
+    source-depth: 1
+
     build-packages:
       - bash
       - gcc
@@ -775,6 +781,7 @@ parts:
       cp -rp /opt/* $CRAFT_PART_INSTALL/opt
 
       mkdir -p $CRAFT_PART_INSTALL/etc/nginx
+      cp -rp $CRAFT_PART_SRC/rootfs/etc/nginx/* $CRAFT_PART_INSTALL/etc/nginx
       cp -rp /etc/nginx/* $CRAFT_PART_INSTALL/etc/nginx
 
       # Added files/directories that need creating:

diff --git a/controller/v1.11.0/rockcraft.yaml b/controller/v1.11.0/rockcraft.yaml
@@ -134,6 +134,12 @@ parts:
   build-nginx:
     plugin: nil
     after: ['build-libgrpcpp', 'build-libssl']
+
+    source-type: git
+    source: https://github.com/kubernetes/ingress-nginx
+    source-tag: controller-v1.11.0
+    source-depth: 1
+
     build-packages:
       - bash
       - gcc
@@ -775,6 +781,7 @@ parts:
       cp -rp /opt/* $CRAFT_PART_INSTALL/opt
 
       mkdir -p $CRAFT_PART_INSTALL/etc/nginx
+      cp -rp $CRAFT_PART_SRC/rootfs/etc/nginx/* $CRAFT_PART_INSTALL/etc/nginx
       cp -rp /etc/nginx/* $CRAFT_PART_INSTALL/etc/nginx
 
       # Added files/directories that need creating: