diff --git a/.github/actions/kubebuilder/Dockerfile b/.github/actions/kubebuilder/Dockerfile deleted file mode 100644 index 2ebd6334..00000000 --- a/.github/actions/kubebuilder/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM giantswarm/tiny-tools - -COPY entrypoint.sh /entrypoint.sh -RUN chmod +x /entrypoint.sh - -ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/kubebuilder/action.yml b/.github/actions/kubebuilder/action.yml deleted file mode 100644 index b582dbbd..00000000 --- a/.github/actions/kubebuilder/action.yml +++ /dev/null @@ -1,9 +0,0 @@ -name: 'kubebuilder' -description: 'A GitHub Action to run kubebuilder commands' -author: 'Stefan Prodan' -branding: - icon: 'command' - color: 'blue' -runs: - using: 'docker' - image: 'Dockerfile' diff --git a/.github/actions/kubebuilder/entrypoint.sh b/.github/actions/kubebuilder/entrypoint.sh deleted file mode 100644 index f7f2dad4..00000000 --- a/.github/actions/kubebuilder/entrypoint.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -l - -VERSION=2.3.1 - -curl -sL https://go.kubebuilder.io/dl/${VERSION}/linux/amd64 | tar -xz -C /tmp/ - -mkdir -p $GITHUB_WORKSPACE/kubebuilder -mv /tmp/kubebuilder_${VERSION}_linux_amd64/* $GITHUB_WORKSPACE/kubebuilder/ -ls -lh $GITHUB_WORKSPACE/kubebuilder/bin - -echo "::add-path::$GITHUB_WORKSPACE/kubebuilder/bin" -echo "::add-path::$RUNNER_WORKSPACE/$(basename $GITHUB_REPOSITORY)/kubebuilder/bin" diff --git a/.github/actions/kubectl/Dockerfile b/.github/actions/kubectl/Dockerfile deleted file mode 100644 index 97429a0f..00000000 --- a/.github/actions/kubectl/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM stefanprodan/alpine-base:latest - -COPY entrypoint.sh /entrypoint.sh -RUN chmod +x /entrypoint.sh - -ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/kubectl/action.yml b/.github/actions/kubectl/action.yml deleted file mode 100644 index f8b2c9f0..00000000 --- a/.github/actions/kubectl/action.yml +++ /dev/null @@ -1,9 +0,0 @@ -name: 'kubectl' -description: 'A GitHub Action to run kubectl commands' -author: 'Stefan Prodan' -branding: - icon: 'command' - color: 'blue' -runs: - using: 'docker' - image: 'Dockerfile' diff --git a/.github/actions/kubectl/entrypoint.sh b/.github/actions/kubectl/entrypoint.sh deleted file mode 100644 index c355776d..00000000 --- a/.github/actions/kubectl/entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -set -e - -kubectl_ver=1.18.3 && \ -curl -sL https://storage.googleapis.com/kubernetes-release/release/v${kubectl_ver}/bin/linux/amd64/kubectl > kubectl - -mkdir -p $GITHUB_WORKSPACE/bin -cp ./kubectl $GITHUB_WORKSPACE/bin -chmod +x $GITHUB_WORKSPACE/bin/kubectl - -$GITHUB_WORKSPACE/bin/kubectl version --client - -echo "::add-path::$GITHUB_WORKSPACE/bin" -echo "::add-path::$RUNNER_WORKSPACE/$(basename $GITHUB_REPOSITORY)/bin" diff --git a/.github/actions/kustomize/Dockerfile b/.github/actions/kustomize/Dockerfile deleted file mode 100644 index 97429a0f..00000000 --- a/.github/actions/kustomize/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM stefanprodan/alpine-base:latest - -COPY entrypoint.sh /entrypoint.sh -RUN chmod +x /entrypoint.sh - -ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/kustomize/action.yml b/.github/actions/kustomize/action.yml deleted file mode 100644 index bd53d1d7..00000000 --- a/.github/actions/kustomize/action.yml +++ /dev/null @@ -1,9 +0,0 @@ -name: 'kustomize' -description: 'A GitHub Action to run kustomize commands' -author: 'Stefan Prodan' -branding: - icon: 'command' - color: 'blue' -runs: - using: 'docker' - image: 'Dockerfile' diff --git a/.github/actions/kustomize/entrypoint.sh b/.github/actions/kustomize/entrypoint.sh deleted file mode 100644 index 49c25c4b..00000000 --- a/.github/actions/kustomize/entrypoint.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -set -e - -kustomize_ver=3.8.0 && \ -kustomize_url=https://github.com/kubernetes-sigs/kustomize/releases/download && \ -curl -sL ${kustomize_url}/kustomize%2Fv${kustomize_ver}/kustomize_v${kustomize_ver}_linux_amd64.tar.gz | \ -tar xz - -mkdir -p $GITHUB_WORKSPACE/bin -cp ./kustomize $GITHUB_WORKSPACE/bin -chmod +x $GITHUB_WORKSPACE/bin/kustomize - -$GITHUB_WORKSPACE/bin/kustomize version - -echo "::add-path::$GITHUB_WORKSPACE/bin" -echo "::add-path::$RUNNER_WORKSPACE/$(basename $GITHUB_REPOSITORY)/bin" diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 339732e4..53f2e7a3 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -26,11 +26,11 @@ jobs: - name: Setup Kubernetes uses: engineerd/setup-kind@v0.3.0 - name: Setup Kustomize - uses: ./.github/actions/kustomize + uses: fluxcd/pkg//actions/kustomize@master - name: Setup Kubebuilder - uses: ./.github/actions/kubebuilder + uses: fluxcd/pkg//actions/kubebuilder@master - name: Setup Kubectl - uses: ./.github/actions/kubectl + uses: fluxcd/pkg/actions/kubectl@master - name: Run tests run: make test env: @@ -85,4 +85,4 @@ jobs: kubectl -n kustomize-system get kustomizations -oyaml kubectl -n kustomize-system get all kubectl -n kustomize-system logs deploy/source-controller - kubectl -n kustomize-system logs deploy/kustomize-controller \ No newline at end of file + kubectl -n kustomize-system logs deploy/kustomize-controller diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a15ada7c..918ebc1c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Setup Kustomize - uses: ./.github/actions/kustomize + uses: fluxcd/pkg/actions/kustomize@master - name: Get version id: get_version run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}