From 24ec78cd5ed0fb46a8011c11e9d0a8f3fbd7108e Mon Sep 17 00:00:00 2001
From: Haitao Pan <manbuzhe2009@qq.com>
Date: Thu, 9 Mar 2023 17:18:07 +0800
Subject: [PATCH] merged: flux-*.yaml -> fluxcd-iamges.yaml

---
 .github/workflows/flux-cli-image.yaml         |  28 ----
 .../workflows/flux-helm-controller-image.yaml |  28 ----
 .../flux-image-automation-controller.yaml     |  28 ----
 .../flux-image-reflector-controller.yaml      |  28 ----
 .../flux-kustomize-controller-image.yaml      |  28 ----
 .../flux-notification-controller-image.yaml   |  28 ----
 .../flux-source-controller-image.yaml         |  28 ----
 .github/workflows/fluxcd-iamges.yaml          | 136 ++++++++++++++++++
 .../Dockerfile}                               |   0
 .../Dockerfile}                               |   0
 .../Dockerfile}                               |   0
 .../Dockerfile}                               |   0
 .../Dockerfile}                               |   0
 .../flux-kustomize-controller.Dockerfile      |   0
 .../Dockerfile}                               |   0
 .../Dockerfile}                               |   0
 16 files changed, 136 insertions(+), 196 deletions(-)
 delete mode 100644 .github/workflows/flux-cli-image.yaml
 delete mode 100644 .github/workflows/flux-helm-controller-image.yaml
 delete mode 100644 .github/workflows/flux-image-automation-controller.yaml
 delete mode 100644 .github/workflows/flux-image-reflector-controller.yaml
 delete mode 100644 .github/workflows/flux-kustomize-controller-image.yaml
 delete mode 100644 .github/workflows/flux-notification-controller-image.yaml
 delete mode 100644 .github/workflows/flux-source-controller-image.yaml
 create mode 100644 .github/workflows/fluxcd-iamges.yaml
 rename oci/fluxcd/{flux-cli.Dockerfile => flux-cli/Dockerfile} (100%)
 rename oci/fluxcd/{flux-helm-controller.Dockerfile => flux-helm-controller/Dockerfile} (100%)
 rename oci/fluxcd/{flux-helm-flux-image-automation-controller.Dockerfile => flux-helm-flux-image-automation-controller/Dockerfile} (100%)
 rename oci/fluxcd/{flux-image-automation-controller.Dockerfile => flux-image-automation-controller/Dockerfile} (100%)
 rename oci/fluxcd/{flux-image-reflector-controller.Dockerfile => flux-image-reflector-controller/Dockerfile} (100%)
 rename oci/fluxcd/{ => flux-kustomize-controller}/flux-kustomize-controller.Dockerfile (100%)
 rename oci/fluxcd/{flux-notification-controller.Dockerfile => flux-notification-controller/Dockerfile} (100%)
 rename oci/fluxcd/{flux-source-controller.Dockerfile => flux-source-controller/Dockerfile} (100%)

diff --git a/.github/workflows/flux-cli-image.yaml b/.github/workflows/flux-cli-image.yaml
deleted file mode 100644
index de36ccb..0000000
--- a/.github/workflows/flux-cli-image.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Build & push flux-cli image
-on:
-  pull_request:
-  push:
-    paths:
-      - 'oci/fluxcd/flux-cli.Dockerfile'
-      - '.github/workflows/fluxcd/flux-cli-image.yaml'
-    branches:
-      - main
-
-jobs:
-  docker:
-    name: Build docker image
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@master
-
-      - name: 'Artifact: build && push fluxcd/flux-cli image'
-        uses: aevea/action-kaniko@master
-        with:
-          registry: artifact.onwalk.net
-          username: admin
-          password: ${{ secrets.HELM_REPO_PASSWORD }}
-          build_file: oci/fluxcd/flux-cli.Dockerfile
-          image: public/fluxcd/flux-cli
-          tag: v0.31.3
-          cache: true
-          cache_registry: cache
diff --git a/.github/workflows/flux-helm-controller-image.yaml b/.github/workflows/flux-helm-controller-image.yaml
deleted file mode 100644
index 8cf48c9..0000000
--- a/.github/workflows/flux-helm-controller-image.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Build & push flux-helm-controller image
-on:
-  pull_request:
-  push:
-    paths:
-      - 'oci/fluxcd/flux-helm-controller.Dockerfile'
-      - '.github/workflows/flux-helm-controller-image.yaml'
-    branches:
-      - main
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    name: Build docker image
-    steps:
-      - uses: actions/checkout@master
-
-      - name: 'Artifact: build && push fluxcd/helm-controller image'
-        uses: aevea/action-kaniko@master
-        with:
-          registry: artifact.onwalk.net
-          username: admin
-          password: ${{ secrets.HELM_REPO_PASSWORD }}
-          build_file: oci/fluxcd/flux-helm-controller.Dockerfile
-          image: public/fluxcd/helm-controller
-          tag: v0.22.1
-          cache: true
-          cache_registry: cache
diff --git a/.github/workflows/flux-image-automation-controller.yaml b/.github/workflows/flux-image-automation-controller.yaml
deleted file mode 100644
index 8f1256a..0000000
--- a/.github/workflows/flux-image-automation-controller.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Build & push flux-automation-controller image
-on:
-  pull_request:
-  push:
-    paths:
-      - 'fluxcd/flux-image-automation-controller.Dockerfile'
-      - '.github/workflows/fluxcd/flux-image-automation-controller.yaml'
-    branches:
-      - main
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    name: Build docker image
-    steps:
-      - uses: actions/checkout@master
-
-      - name: 'Artifact: build && push fluxcd/image-automation-controller image'
-        uses: aevea/action-kaniko@v0.10.0
-        with:
-          registry: artifact.onwalk.net
-          username: admin
-          password: ${{ secrets.HELM_REPO_PASSWORD }}
-          build_file: oci/fluxcd/flux-image-automation-controller.Dockerfile
-          image: public/fluxcd/image-automation-controller
-          tag: v0.23.4
-          cache: true
-          cache_registry: cache
diff --git a/.github/workflows/flux-image-reflector-controller.yaml b/.github/workflows/flux-image-reflector-controller.yaml
deleted file mode 100644
index ffd9352..0000000
--- a/.github/workflows/flux-image-reflector-controller.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Build & push image-reflector-controller image
-on:
-  pull_request:
-  push:
-    paths:
-      - 'fluxcd/flux-image-reflector-controller.Dockerfile'
-      - '.github/workflows/fluxcd/flux-image-reflector-controller.yaml'
-    branches:
-      - main
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    name: Build docker image
-    steps:
-      - uses: actions/checkout@master
-
-      - name: 'Artifact: build && push fluxcd/image-reflector-controller image'
-        uses: aevea/action-kaniko@v0.10.0
-        with:
-          registry: artifact.onwalk.net
-          username: admin
-          password: ${{ secrets.HELM_REPO_PASSWORD }}
-          build_file: oci/fluxcd/flux-image-reflector-controller.Dockerfile
-          image: public/fluxcd/image-reflector-controller
-          tag: v0.19.2
-          cache: true
-          cache_registry: cache
diff --git a/.github/workflows/flux-kustomize-controller-image.yaml b/.github/workflows/flux-kustomize-controller-image.yaml
deleted file mode 100644
index 3525784..0000000
--- a/.github/workflows/flux-kustomize-controller-image.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Build & push flux-kustomize-controller image
-on:
-  pull_request:
-  push:
-    paths:
-      - 'fluxcd/flux-kustomize-controller.Dockerfile'
-      - '.github/workflows/fluxcd/flux-kustomize-controller-image.yaml'
-    branches:
-      - main
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    name: Build docker image
-    steps:
-      - uses: actions/checkout@master
-
-      - name: 'Artifact: build && push fluxcd/kustomize-controller image'
-        uses: aevea/action-kaniko@v0.10.0
-        with:
-          registry: artifact.onwalk.net
-          username: admin
-          password: ${{ secrets.HELM_REPO_PASSWORD }}
-          build_file: oci/fluxcd/flux-kustomize-controller.Dockerfile
-          image: public/fluxcd/kustomize-controller
-          tag: v0.26.2
-          cache: true
-          cache_registry: cache
diff --git a/.github/workflows/flux-notification-controller-image.yaml b/.github/workflows/flux-notification-controller-image.yaml
deleted file mode 100644
index b0210ae..0000000
--- a/.github/workflows/flux-notification-controller-image.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Build & push notification-controller image
-on:
-  pull_request:
-  push:
-    paths:
-      - '.github/workflows/fluxcd/flux-notification-controller-image.yaml'
-      - 'dockerfiles/flux-notification-controller.Dockerfile'
-    branches:
-      - main
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    name: Build docker image
-    steps:
-      - uses: actions/checkout@master
-
-      - name: 'Artifact: build && push fluxcd/notification-controller image'
-        uses: aevea/action-kaniko@v0.10.0
-        with:
-          registry: artifact.onwalk.net
-          username: admin
-          password: ${{ secrets.HELM_REPO_PASSWORD }}
-          build_file: oci/fluxcd/flux-notification-controller.Dockerfile
-          image: public/fluxcd/notification-controller
-          tag: v0.24.0
-          cache: true
-          cache_registry: cache
diff --git a/.github/workflows/flux-source-controller-image.yaml b/.github/workflows/flux-source-controller-image.yaml
deleted file mode 100644
index 89e2592..0000000
--- a/.github/workflows/flux-source-controller-image.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Build & push source-controller image
-on:
-  pull_request:
-  push:
-    paths:
-      - 'fluxcd/flux-source-controller.Dockerfile'
-      - '.github/workflows/fluxcd/flux-source-controller-image.yaml'
-    branches:
-      - main
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    name: Build docker image
-    steps:
-      - uses: actions/checkout@master
-
-      - name: 'Artifact: build && push fluxcd/source-controller image'
-        uses: aevea/action-kaniko@v0.10.0
-        with:
-          registry: artifact.onwalk.net
-          username: admin
-          password: ${{ secrets.HELM_REPO_PASSWORD }}
-          build_file: oci/fluxcd/flux-source-controller.Dockerfile
-          image: public/fluxcd/source-controller
-          tag: v0.25.9
-          cache: true
-          cache_registry: cache
diff --git a/.github/workflows/fluxcd-iamges.yaml b/.github/workflows/fluxcd-iamges.yaml
new file mode 100644
index 0000000..2225b3d
--- /dev/null
+++ b/.github/workflows/fluxcd-iamges.yaml
@@ -0,0 +1,136 @@
+name: Build & push flux-cd images
+on:
+  pull_request:
+  push:
+    paths:
+      - '.github/workflows/fluxcd/fluxcd-images.yaml'
+      - 'oci/fluxcd/flux-cli/Dockerfile'
+      - 'oci/fluxcd/flux-helm-controller/Dockerfile'
+      - 'oci/fluxcd/flux-image-automation-controller/Dockerfile'
+      - 'oci/fluxcd/flux-image-reflector-controller/Dockerfile'
+      - 'oci/fluxcd/flux-kustomize-controller/Dockerfile'
+      - 'oci/fluxcd/flux-notification-controller/Dockerfile'
+      - 'oci/fluxcd/flux-source-controller/Dockerfile'
+    branches:
+      - main
+
+jobs:
+  flux-cli:
+    name: Build docker image
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+
+      - name: 'Artifact: build && push fluxcd/flux-cli image'
+        uses: aevea/action-kaniko@master
+        with:
+          registry: artifact.onwalk.net
+          username: admin
+          password: ${{ secrets.HELM_REPO_PASSWORD }}
+          path: oci/fluxcd/flux-cli/
+          image: public/fluxcd/flux-cli
+          tag: v0.31.3
+          cache: true
+          cache_registry: cache
+  fluxcd-helm-controller:
+    runs-on: ubuntu-latest
+    name: Build docker image
+    steps:
+      - uses: actions/checkout@master
+
+      - name: 'Artifact: build && push fluxcd/helm-controller image'
+        uses: aevea/action-kaniko@master
+        with:
+          registry: artifact.onwalk.net
+          username: admin
+          password: ${{ secrets.HELM_REPO_PASSWORD }}
+          path: oci/fluxcd/flux-helm-controller/
+          image: public/fluxcd/helm-controller
+          tag: v0.22.1
+          cache: true
+          cache_registry: cache
+  fluxcd-image-automation-controller:
+    runs-on: ubuntu-latest
+    name: Build docker image
+    steps:
+      - uses: actions/checkout@master
+
+      - name: 'Artifact: build && push fluxcd/image-automation-controller image'
+        uses: aevea/action-kaniko@v0.10.0
+        with:
+          registry: artifact.onwalk.net
+          username: admin
+          password: ${{ secrets.HELM_REPO_PASSWORD }}
+          path: oci/fluxcd/flux-image-automation-controller/
+          image: public/fluxcd/image-automation-controller
+          tag: v0.23.4
+          cache: true
+          cache_registry: cache
+  flux-image-reflector-controller:
+    runs-on: ubuntu-latest
+    name: Build docker image
+    steps:
+      - uses: actions/checkout@master
+
+      - name: 'Artifact: build && push fluxcd/image-reflector-controller image'
+        uses: aevea/action-kaniko@v0.10.0
+        with:
+          registry: artifact.onwalk.net
+          username: admin
+          password: ${{ secrets.HELM_REPO_PASSWORD }}
+          path: oci/fluxcd/flux-image-reflector-controller/
+          image: public/fluxcd/image-reflector-controller
+          tag: v0.19.2
+          cache: true
+          cache_registry: cache
+  flux-kustomize-controller:
+    runs-on: ubuntu-latest
+    name: Build docker image
+    steps:
+      - uses: actions/checkout@master
+
+      - name: 'Artifact: build && push fluxcd/kustomize-controller image'
+        uses: aevea/action-kaniko@v0.10.0
+        with:
+          registry: artifact.onwalk.net
+          username: admin
+          password: ${{ secrets.HELM_REPO_PASSWORD }}
+          path: oci/fluxcd/flux-kustomize-controller/
+          image: public/fluxcd/kustomize-controller
+          tag: v0.26.2
+          cache: true
+          cache_registry: cache
+  flux-notification-controller:
+    runs-on: ubuntu-latest
+    name: Build docker image
+    steps:
+      - uses: actions/checkout@master
+
+      - name: 'Artifact: build && push fluxcd/notification-controller image'
+        uses: aevea/action-kaniko@v0.10.0
+        with:
+          registry: artifact.onwalk.net
+          username: admin
+          password: ${{ secrets.HELM_REPO_PASSWORD }}
+          path: oci/fluxcd/flux-notification-controller/
+          image: public/fluxcd/notification-controller
+          tag: v0.24.0
+          cache: true
+          cache_registry: cache
+  flux-source-controller:
+    runs-on: ubuntu-latest
+    name: Build docker image
+    steps:
+      - uses: actions/checkout@master
+
+      - name: 'Artifact: build && push fluxcd/source-controller image'
+        uses: aevea/action-kaniko@v0.10.0
+        with:
+          registry: artifact.onwalk.net
+          username: admin
+          password: ${{ secrets.HELM_REPO_PASSWORD }}
+          path: oci/fluxcd/flux-source-controller/
+          image: public/fluxcd/source-controller
+          tag: v0.25.9
+          cache: true
+          cache_registry: cache
diff --git a/oci/fluxcd/flux-cli.Dockerfile b/oci/fluxcd/flux-cli/Dockerfile
similarity index 100%
rename from oci/fluxcd/flux-cli.Dockerfile
rename to oci/fluxcd/flux-cli/Dockerfile
diff --git a/oci/fluxcd/flux-helm-controller.Dockerfile b/oci/fluxcd/flux-helm-controller/Dockerfile
similarity index 100%
rename from oci/fluxcd/flux-helm-controller.Dockerfile
rename to oci/fluxcd/flux-helm-controller/Dockerfile
diff --git a/oci/fluxcd/flux-helm-flux-image-automation-controller.Dockerfile b/oci/fluxcd/flux-helm-flux-image-automation-controller/Dockerfile
similarity index 100%
rename from oci/fluxcd/flux-helm-flux-image-automation-controller.Dockerfile
rename to oci/fluxcd/flux-helm-flux-image-automation-controller/Dockerfile
diff --git a/oci/fluxcd/flux-image-automation-controller.Dockerfile b/oci/fluxcd/flux-image-automation-controller/Dockerfile
similarity index 100%
rename from oci/fluxcd/flux-image-automation-controller.Dockerfile
rename to oci/fluxcd/flux-image-automation-controller/Dockerfile
diff --git a/oci/fluxcd/flux-image-reflector-controller.Dockerfile b/oci/fluxcd/flux-image-reflector-controller/Dockerfile
similarity index 100%
rename from oci/fluxcd/flux-image-reflector-controller.Dockerfile
rename to oci/fluxcd/flux-image-reflector-controller/Dockerfile
diff --git a/oci/fluxcd/flux-kustomize-controller.Dockerfile b/oci/fluxcd/flux-kustomize-controller/flux-kustomize-controller.Dockerfile
similarity index 100%
rename from oci/fluxcd/flux-kustomize-controller.Dockerfile
rename to oci/fluxcd/flux-kustomize-controller/flux-kustomize-controller.Dockerfile
diff --git a/oci/fluxcd/flux-notification-controller.Dockerfile b/oci/fluxcd/flux-notification-controller/Dockerfile
similarity index 100%
rename from oci/fluxcd/flux-notification-controller.Dockerfile
rename to oci/fluxcd/flux-notification-controller/Dockerfile
diff --git a/oci/fluxcd/flux-source-controller.Dockerfile b/oci/fluxcd/flux-source-controller/Dockerfile
similarity index 100%
rename from oci/fluxcd/flux-source-controller.Dockerfile
rename to oci/fluxcd/flux-source-controller/Dockerfile