From 5810fa47411de4848455eb974ee18a37ec64f729 Mon Sep 17 00:00:00 2001
From: Haitao Pan <manbuzhe2009@qq.com>
Date: Fri, 10 Mar 2023 11:56:30 +0800
Subject: [PATCH] merged: app-runner-images.yaml & iac-runner-images.yaml

---
 .github/workflows/app-runner-images.yaml    | 72 +++++++++++++++++++++
 .github/workflows/chart-builder-alpine.yaml | 32 ---------
 .github/workflows/iac-runner-images.yaml    | 71 ++++++++++++++++++++
 .github/workflows/image-builder-alpine.yaml | 28 --------
 .github/workflows/kube-tools-alpine.yaml    | 32 ---------
 .github/workflows/pulumi-aws.yaml           | 31 ---------
 .github/workflows/terraform-aws-finops.yaml | 31 ---------
 .github/workflows/terraform-aws.yaml        | 29 ---------
 8 files changed, 143 insertions(+), 183 deletions(-)
 create mode 100644 .github/workflows/app-runner-images.yaml
 delete mode 100644 .github/workflows/chart-builder-alpine.yaml
 create mode 100644 .github/workflows/iac-runner-images.yaml
 delete mode 100644 .github/workflows/image-builder-alpine.yaml
 delete mode 100644 .github/workflows/kube-tools-alpine.yaml
 delete mode 100644 .github/workflows/pulumi-aws.yaml
 delete mode 100644 .github/workflows/terraform-aws-finops.yaml
 delete mode 100644 .github/workflows/terraform-aws.yaml

diff --git a/.github/workflows/app-runner-images.yaml b/.github/workflows/app-runner-images.yaml
new file mode 100644
index 0000000..50a0bc1
--- /dev/null
+++ b/.github/workflows/app-runner-images.yaml
@@ -0,0 +1,72 @@
+name: Build & push chart builder apline base image
+on:
+  pull_request:
+  push:
+    paths:
+      - '.github/workflows/app-runner-images.yaml'
+      - 'oci/app-runner/kube-tools-alpine/ca.crt'
+      - 'oci/app-runner/kube-tools-alpine/Makefile'
+      - 'oci/app-runner/kube-tools-alpine/Dockerfile'
+      - 'oci/app-runner/kube-tools-alpine/repositories'
+      - 'oci/app-runner/chart-builder-alpine/ca.crt'
+      - 'oci/app-runner/chart-builder-alpine/Makefile'
+      - 'oci/app-runner/chart-builder-alpine/Dockerfile'
+      - 'oci/app-runner/chart-builder-alpine/repositories'
+      - 'oci/app-runner/image-builder-alpine/Dockerfile'
+    branches:
+      - main
+
+jobs:
+  chart-builder-alpine:
+    runs-on: ubuntu-latest
+    name: build chart builder alpine base image
+    steps:
+      - uses: actions/checkout@master
+
+      - name: 'Artifact: build && push chart builder alpine base image'
+        uses: aevea/action-kaniko@master
+        with:
+          registry: artifact.onwalk.net
+          username: admin 
+          password: ${{ secrets.HELM_REPO_PASSWORD }}
+          path: 'oci/app-runner/chart-builder-alpine/'
+          build_file: 'Dockerfile'
+          image: public/chart-builder-alpine
+          tag: latest
+          cache: false
+          cache_registry: cache
+  image-buider-alpine:
+    runs-on: ubuntu-latest
+    name: build chart builder alpine base image
+    steps:
+      - uses: actions/checkout@master
+
+      - name: 'Artifact: build && push image builder alpine base image'
+        uses: aevea/action-kaniko@master
+        with:
+          registry: artifact.onwalk.net
+          username: admin 
+          password: ${{ secrets.HELM_REPO_PASSWORD }}
+          path: 'oci/app-runner/image-builder-alpine/'
+          build_file: 'Dockerfile'
+          image: devops/image-builder-alpine
+          tag: latest
+          cache: false
+  kube-tools-alpine:
+    runs-on: ubuntu-latest
+    name: build k8s app runner alpine base image
+    steps:
+      - uses: actions/checkout@master
+
+      - name: 'Artifact: build && push k8s app runner alpine base image'
+        uses: aevea/action-kaniko@master
+        with:
+          registry: artifact.onwalk.net
+          username: admin 
+          password: ${{ secrets.HELM_REPO_PASSWORD }}
+          path: 'oci/app-runner/kube-tools-alpine/'
+          build_file: 'Dockerfile'
+          image: devops/kube-tools-alpine
+          tag: latest
+          cache: false
+          cache_registry: cache
diff --git a/.github/workflows/chart-builder-alpine.yaml b/.github/workflows/chart-builder-alpine.yaml
deleted file mode 100644
index a729054..0000000
--- a/.github/workflows/chart-builder-alpine.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: Build & push chart builder apline base image
-on:
-  pull_request:
-  push:
-    paths:
-      - '.github/workflows/chart-builder-alpine.yaml'
-      - 'oci/app-runner/chart-builder-alpine/ca.crt'
-      - 'oci/app-runner/chart-builder-alpine/Makefile'
-      - 'oci/app-runner/chart-builder-alpine/Dockerfile'
-      - 'oci/app-runner/chart-builder-alpine/repositories'
-    branches:
-      - main
-
-jobs:
-  base-image:
-    runs-on: ubuntu-latest
-    name: build chart builder alpine base image
-    steps:
-      - uses: actions/checkout@master
-
-      - name: 'Artifact: build && push chart builder alpine base image'
-        uses: aevea/action-kaniko@master
-        with:
-          registry: artifact.onwalk.net
-          username: admin 
-          password: ${{ secrets.HELM_REPO_PASSWORD }}
-          path: 'oci/app-runner/chart-builder-alpine/'
-          build_file: 'Dockerfile'
-          image: public/chart-builder-alpine
-          tag: latest
-          cache: false
-          cache_registry: cache
diff --git a/.github/workflows/iac-runner-images.yaml b/.github/workflows/iac-runner-images.yaml
new file mode 100644
index 0000000..465cabb
--- /dev/null
+++ b/.github/workflows/iac-runner-images.yaml
@@ -0,0 +1,71 @@
+name: Build & push ci runner terraform for aws image
+on:
+  pull_request:
+  push:
+    paths:
+      - '.github/workflows/iac-runner-images.yaml'
+      - 'oci/iac-runner/terraform-aws-finops/main.tf'
+      - 'oci/iac-runner/terraform-aws-finops/Dockerfile'
+      - 'oci/iac-runner/terraform-aws-finops/.terraformrc'
+      - 'oci/iac-runner/terraform-aws/Dockerfile'
+      - 'oci/iac-runner/pulumi-aws/main.tf'
+      - 'oci/iac-runner/pulumi-aws/Dockerfile'
+      - 'oci/iac-runner/pulumi-aws/.terraformrc'
+    branches:
+      - main
+
+jobs:
+  terraform-aws-finops:
+    runs-on: ubuntu-latest
+    name: Build ci runner terraform for aws image
+    steps:
+      - uses: actions/checkout@master
+
+      - name: 'Artifact: build && push terraform for aws image'
+        uses: aevea/action-kaniko@master
+        with:
+          registry: artifact.onwalk.net
+          username: admin 
+          password: ${{ secrets.HELM_REPO_PASSWORD }}
+          path: 'oci/iac-runner/terraform-aws-finops/'
+          build_file: 'Dockerfile'
+          image: public/terraform-aws
+          tag: latest
+          cache: true
+          cache_registry: cache
+  terraform-aws:
+    runs-on: ubuntu-latest
+    name: Build ci runner terraform for aws image
+    steps:
+      - uses: actions/checkout@master
+
+      - name: 'Artifact: build && push terraform for aws custom image'
+        uses: aevea/action-kaniko@master
+        with:
+          registry: artifact.onwalk.net
+          username: admin 
+          password: ${{ secrets.HELM_REPO_PASSWORD }}
+          path: 'oci/iac-runner/terraform-aws/'
+          build_file: 'Dockerfile'
+          image: public/terraform-aws
+          tag: latest
+          cache: true
+          cache_registry: cache
+  pulumi-aws:
+    runs-on: ubuntu-latest
+    name: Build ci runner pulumi for aws image
+    steps:
+      - uses: actions/checkout@master
+
+      - name: 'Artifact: build && push pulumi for aws image'
+        uses: aevea/action-kaniko@master
+        with:
+          registry: artifact.onwalk.net
+          username: admin 
+          password: ${{ secrets.HELM_REPO_PASSWORD }}
+          path: 'oci/iac-runner/pulumi-aws/'
+          build_file: 'Dockerfile'
+          image: devops/pulumi-aws
+          tag: latest
+          cache: true
+          cache_registry: cache
diff --git a/.github/workflows/image-builder-alpine.yaml b/.github/workflows/image-builder-alpine.yaml
deleted file mode 100644
index 84fd30d..0000000
--- a/.github/workflows/image-builder-alpine.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Build & push image builder apline base image
-on:
-  pull_request:
-  push:
-    paths:
-      - '.github/workflows/image-builder-alpine.yaml'
-      - 'oci/app-runner/image-builder-alpine/Dockerfile'
-    branches:
-      - main
-
-jobs:
-  base-image:
-    runs-on: ubuntu-latest
-    name: build chart builder alpine base image
-    steps:
-      - uses: actions/checkout@master
-
-      - name: 'Artifact: build && push image builder alpine base image'
-        uses: aevea/action-kaniko@master
-        with:
-          registry: artifact.onwalk.net
-          username: admin 
-          password: ${{ secrets.HELM_REPO_PASSWORD }}
-          path: 'oci/app-runner/image-builder-alpine/'
-          build_file: 'Dockerfile'
-          image: devops/image-builder-alpine
-          tag: latest
-          cache: false
diff --git a/.github/workflows/kube-tools-alpine.yaml b/.github/workflows/kube-tools-alpine.yaml
deleted file mode 100644
index 7aeb7f2..0000000
--- a/.github/workflows/kube-tools-alpine.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: Build & push k8s app runner apline base image
-on:
-  pull_request:
-  push:
-    paths:
-      - '.github/workflows/kube-tools-alpine.yaml'
-      - 'oci/app-runner/kube-tools-alpine/ca.crt'
-      - 'oci/app-runner/kube-tools-alpine/Makefile'
-      - 'oci/app-runner/kube-tools-alpine/Dockerfile'
-      - 'oci/app-runner/kube-tools-alpine/repositories'
-    branches:
-      - main
-
-jobs:
-  base-image:
-    runs-on: ubuntu-latest
-    name: build k8s app runner alpine base image
-    steps:
-      - uses: actions/checkout@master
-
-      - name: 'Artifact: build && push k8s app runner alpine base image'
-        uses: aevea/action-kaniko@master
-        with:
-          registry: artifact.onwalk.net
-          username: admin 
-          password: ${{ secrets.HELM_REPO_PASSWORD }}
-          path: 'oci/app-runner/kube-tools-alpine/'
-          build_file: 'Dockerfile'
-          image: devops/kube-tools-alpine
-          tag: latest
-          cache: false
-          cache_registry: cache
diff --git a/.github/workflows/pulumi-aws.yaml b/.github/workflows/pulumi-aws.yaml
deleted file mode 100644
index 154c28e..0000000
--- a/.github/workflows/pulumi-aws.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Build & push ci runner pulumi for aws image
-on:
-  pull_request:
-  push:
-    paths:
-      - 'oci/iac-runner/pulumi-aws/main.tf'
-      - 'oci/iac-runner/pulumi-aws/Dockerfile'
-      - 'oci/iac-runner/pulumi-aws/.terraformrc'
-      - '.github/workflows/pulumi-aws.yaml'
-    branches:
-      - main
-
-jobs:
-  base-image:
-    runs-on: ubuntu-latest
-    name: Build ci runner pulumi for aws image
-    steps:
-      - uses: actions/checkout@master
-
-      - name: 'Artifact: build && push pulumi for aws image'
-        uses: aevea/action-kaniko@master
-        with:
-          registry: artifact.onwalk.net
-          username: admin 
-          password: ${{ secrets.HELM_REPO_PASSWORD }}
-          path: 'oci/iac-runner/pulumi-aws/'
-          build_file: 'Dockerfile'
-          image: devops/pulumi-aws
-          tag: latest
-          cache: true
-          cache_registry: cache
diff --git a/.github/workflows/terraform-aws-finops.yaml b/.github/workflows/terraform-aws-finops.yaml
deleted file mode 100644
index 124c430..0000000
--- a/.github/workflows/terraform-aws-finops.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Build & push ci runner terraform for aws image
-on:
-  pull_request:
-  push:
-    paths:
-      - 'oci/iac-runner/terraform-aws-finops/main.tf'
-      - 'oci/iac-runner/terraform-aws-finops/Dockerfile'
-      - 'oci/iac-runner/terraform-aws-finops/.terraformrc'
-      - '.github/workflows/terraform-aws-finops.yaml'
-    branches:
-      - main
-
-jobs:
-  base-image:
-    runs-on: ubuntu-latest
-    name: Build ci runner terraform for aws image
-    steps:
-      - uses: actions/checkout@master
-
-      - name: 'Artifact: build && push terraform for aws image'
-        uses: aevea/action-kaniko@master
-        with:
-          registry: artifact.onwalk.net
-          username: admin 
-          password: ${{ secrets.HELM_REPO_PASSWORD }}
-          path: 'oci/iac-runner/terraform-aws-finops/'
-          build_file: 'Dockerfile'
-          image: public/terraform-aws
-          tag: latest
-          cache: true
-          cache_registry: cache
diff --git a/.github/workflows/terraform-aws.yaml b/.github/workflows/terraform-aws.yaml
deleted file mode 100644
index e5fa055..0000000
--- a/.github/workflows/terraform-aws.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Build & push ci runner terraform for aws custom image
-on:
-  pull_request:
-  push:
-    paths:
-      - '.github/workflows/terraform-aws.yaml'
-      - 'oci/iac-runner/terraform-aws/Dockerfile'
-    branches:
-      - main
-
-jobs:
-  base-image:
-    runs-on: ubuntu-latest
-    name: Build ci runner terraform for aws image
-    steps:
-      - uses: actions/checkout@master
-
-      - name: 'Artifact: build && push terraform for aws custom image'
-        uses: aevea/action-kaniko@master
-        with:
-          registry: artifact.onwalk.net
-          username: admin 
-          password: ${{ secrets.HELM_REPO_PASSWORD }}
-          path: 'oci/iac-runner/terraform-aws/'
-          build_file: 'Dockerfile'
-          image: public/terraform-aws
-          tag: latest
-          cache: true
-          cache_registry: cache