use Dockerfile from code-generator for building controller image (#167)

Issue #, if available: aws-controllers-k8s/community#1112 Description of changes: * use Dockerfile from code-generator for building controller image * This helps in maintaining only single Dockerfile for building ACK controller images By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
aws-controllers-k8s · Dec 28, 2021 · 8dc93e3 · 8dc93e3
1 parent 75752b2
commit 8dc93e3
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 51 deletions.
diff --git a/cd/controller/Dockerfile b/cd/controller/Dockerfile
diff --git a/cd/scripts/release-controller.sh b/cd/scripts/release-controller.sh
@@ -39,6 +39,7 @@ CD_DIR=$DIR/..
 TEST_INFRA_DIR=$CD_DIR/..
 WORKSPACE_DIR=$TEST_INFRA_DIR/..
 SERVICE_CONTROLLER_DIR="$WORKSPACE_DIR/$AWS_SERVICE-controller"
+CODE_GEN_DIR="$WORKSPACE_DIR/code-generator"
 
 # Check all the dependencies are present in container.
 source "$TEST_INFRA_DIR"/scripts/lib/common.sh
@@ -116,7 +117,7 @@ if ! (echo "$VERSION" | grep -Eq "stable$"); then
   SERVICE_CONTROLLER_GIT_COMMIT=$(git rev-parse HEAD)
   QUIET=${QUIET:-"false"}
   BUILD_DATE=$(date +%Y-%m-%dT%H:%M)
-  CONTROLLER_IMAGE_DOCKERFILE_PATH=$CD_DIR/controller/Dockerfile
+  CONTROLLER_IMAGE_DOCKERFILE_PATH=$CODE_GEN_DIR/Dockerfile
 
   DEFAULT_DOCKER_REPOSITORY="public.ecr.aws/aws-controllers-k8s/$AWS_SERVICE-controller"
   DOCKER_REPOSITORY=${DOCKER_REPOSITORY:-"$DEFAULT_DOCKER_REPOSITORY"}

diff --git a/prow/jobs/jinja/postsubmits/controller_release.jinja2 b/prow/jobs/jinja/postsubmits/controller_release.jinja2
@@ -7,6 +7,10 @@
       repo: test-infra
       base_ref: main
       workdir: true
+    - org: aws-controllers-k8s
+      repo: code-generator
+      base_ref: main
+      workdir: false
     spec:
       serviceAccountName: post-submit-service-account
       containers:

diff --git a/prow/jobs/jobs.yaml b/prow/jobs/jobs.yaml
@@ -1,5 +1,5 @@
 # Autogenerated. Do NOT update Manually.
-# Last generated on 2021-12-07 14:15:19.851246.
+# Last generated on 2021-12-28 13:36:49.688687.
 periodics:
 - name: periodic-close
   interval: 6h
@@ -280,6 +280,10 @@ postsubmits:
       repo: test-infra
       base_ref: main
       workdir: true
+    - org: aws-controllers-k8s
+      repo: code-generator
+      base_ref: main
+      workdir: false
     spec:
       serviceAccountName: post-submit-service-account
       containers:
@@ -430,6 +434,10 @@ postsubmits:
       repo: test-infra
       base_ref: main
       workdir: true
+    - org: aws-controllers-k8s
+      repo: code-generator
+      base_ref: main
+      workdir: false
     spec:
       serviceAccountName: post-submit-service-account
       containers:
@@ -580,6 +588,10 @@ postsubmits:
       repo: test-infra
       base_ref: main
       workdir: true
+    - org: aws-controllers-k8s
+      repo: code-generator
+      base_ref: main
+      workdir: false
     spec:
       serviceAccountName: post-submit-service-account
       containers:
@@ -730,6 +742,10 @@ postsubmits:
       repo: test-infra
       base_ref: main
       workdir: true
+    - org: aws-controllers-k8s
+      repo: code-generator
+      base_ref: main
+      workdir: false
     spec:
       serviceAccountName: post-submit-service-account
       containers:
@@ -880,6 +896,10 @@ postsubmits:
       repo: test-infra
       base_ref: main
       workdir: true
+    - org: aws-controllers-k8s
+      repo: code-generator
+      base_ref: main
+      workdir: false
     spec:
       serviceAccountName: post-submit-service-account
       containers:
@@ -1030,6 +1050,10 @@ postsubmits:
       repo: test-infra
       base_ref: main
       workdir: true
+    - org: aws-controllers-k8s
+      repo: code-generator
+      base_ref: main
+      workdir: false
     spec:
       serviceAccountName: post-submit-service-account
       containers:
@@ -1180,6 +1204,10 @@ postsubmits:
       repo: test-infra
       base_ref: main
       workdir: true
+    - org: aws-controllers-k8s
+      repo: code-generator
+      base_ref: main
+      workdir: false
     spec:
       serviceAccountName: post-submit-service-account
       containers:
@@ -1330,6 +1358,10 @@ postsubmits:
       repo: test-infra
       base_ref: main
       workdir: true
+    - org: aws-controllers-k8s
+      repo: code-generator
+      base_ref: main
+      workdir: false
     spec:
       serviceAccountName: post-submit-service-account
       containers:
@@ -1480,6 +1512,10 @@ postsubmits:
       repo: test-infra
       base_ref: main
       workdir: true
+    - org: aws-controllers-k8s
+      repo: code-generator
+      base_ref: main
+      workdir: false
     spec:
       serviceAccountName: post-submit-service-account
       containers:
@@ -1630,6 +1666,10 @@ postsubmits:
       repo: test-infra
       base_ref: main
       workdir: true
+    - org: aws-controllers-k8s
+      repo: code-generator
+      base_ref: main
+      workdir: false
     spec:
       serviceAccountName: post-submit-service-account
       containers:
@@ -1780,6 +1820,10 @@ postsubmits:
       repo: test-infra
       base_ref: main
       workdir: true
+    - org: aws-controllers-k8s
+      repo: code-generator
+      base_ref: main
+      workdir: false
     spec:
       serviceAccountName: post-submit-service-account
       containers:
@@ -1930,6 +1974,10 @@ postsubmits:
       repo: test-infra
       base_ref: main
       workdir: true
+    - org: aws-controllers-k8s
+      repo: code-generator
+      base_ref: main
+      workdir: false
     spec:
       serviceAccountName: post-submit-service-account
       containers:
@@ -2080,6 +2128,10 @@ postsubmits:
       repo: test-infra
       base_ref: main
       workdir: true
+    - org: aws-controllers-k8s
+      repo: code-generator
+      base_ref: main
+      workdir: false
     spec:
       serviceAccountName: post-submit-service-account
       containers:
@@ -2230,6 +2282,10 @@ postsubmits:
       repo: test-infra
       base_ref: main
       workdir: true
+    - org: aws-controllers-k8s
+      repo: code-generator
+      base_ref: main
+      workdir: false
     spec:
       serviceAccountName: post-submit-service-account
       containers:
@@ -2380,6 +2436,10 @@ postsubmits:
       repo: test-infra
       base_ref: main
       workdir: true
+    - org: aws-controllers-k8s
+      repo: code-generator
+      base_ref: main
+      workdir: false
     spec:
       serviceAccountName: post-submit-service-account
       containers:
@@ -2530,6 +2590,10 @@ postsubmits:
       repo: test-infra
       base_ref: main
       workdir: true
+    - org: aws-controllers-k8s
+      repo: code-generator
+      base_ref: main
+      workdir: false
     spec:
       serviceAccountName: post-submit-service-account
       containers:
@@ -2680,6 +2744,10 @@ postsubmits:
       repo: test-infra
       base_ref: main
       workdir: true
+    - org: aws-controllers-k8s
+      repo: code-generator
+      base_ref: main
+      workdir: false
     spec:
       serviceAccountName: post-submit-service-account
       containers: