From 6bf1ef88a2896f701f412665d8a1868dd75b01c8 Mon Sep 17 00:00:00 2001 From: ange Date: Fri, 10 May 2024 12:40:42 +0200 Subject: [PATCH 01/10] feat: remove unused Dockerfile --- Dockerfile | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 956f96f..0000000 --- a/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM debian:12-slim as kubectl -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ - && rm -rf /var/lib/apt/lists/* -RUN V="$(curl -sSL https://dl.k8s.io/release/stable.txt)" \ - && curl -Lo /kubectl "https://dl.k8s.io/release/$V/bin/linux/amd64/kubectl" - -FROM debian:12-slim -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - ca-certificates \ - && rm -rf /var/lib/apt/lists/* -COPY --from=kubectl --chmod=0755 /kubectl /usr/local/bin/ -COPY k8sdeploy.sh /usr/local/bin/ -RUN useradd -m app -USER app -ENTRYPOINT ["k8sdeploy.sh"] From 84ec9cf196e6b3b0686d0a4f506d9bcfe9bdc5e1 Mon Sep 17 00:00:00 2001 From: ange Date: Wed, 15 May 2024 19:41:54 +0200 Subject: [PATCH 02/10] feat: export K8S_NS --- k8sdeploy.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/k8sdeploy.sh b/k8sdeploy.sh index fc27005..2f7a3d6 100755 --- a/k8sdeploy.sh +++ b/k8sdeploy.sh @@ -6,12 +6,12 @@ set -a set +a REGISTRY="${IMAGEAPP%%/*}" -NS="${GITHUB_REPOSITORY#*/}-${GITHUB_REF_NAME}" +export K8S_NS="${GITHUB_REPOSITORY#*/}-${GITHUB_REF_NAME}" mkdir -p "$HOME/.kube/" echo "$INPUT_KUBECONFIG" > "$HOME/.kube/config" -kubectl get namespace "$NS" || kubectl create namespace "$NS" -kubectl config set-context --current --namespace="$NS" +kubectl get namespace "$K8S_NS" || kubectl create namespace "$K8S_NS" +kubectl config set-context --current --namespace="$K8S_NS" if [ -n "$INPUT_REGISTRY_PASSWORD" ]; then kubectl get secret regcred \ From 860ab947e46d0fe8a75de6c4637ef4bfa5190b00 Mon Sep 17 00:00:00 2001 From: ange Date: Fri, 29 Nov 2024 04:46:13 +0000 Subject: [PATCH 03/10] fix: invalid namespace name --- action.yaml | 2 +- k8sdeploy.sh => entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename k8sdeploy.sh => entrypoint.sh (85%) diff --git a/action.yaml b/action.yaml index 0fe3cdb..763ad98 100644 --- a/action.yaml +++ b/action.yaml @@ -12,4 +12,4 @@ runs: using: composite steps: - name: k8sdeploy - run: ${{ gitea.action_path }}/k8sdeploy.sh + run: ${{ gitea.action_path }}/entrypoint.sh diff --git a/k8sdeploy.sh b/entrypoint.sh similarity index 85% rename from k8sdeploy.sh rename to entrypoint.sh index 2f7a3d6..f04b921 100755 --- a/k8sdeploy.sh +++ b/entrypoint.sh @@ -6,7 +6,7 @@ set -a set +a REGISTRY="${IMAGEAPP%%/*}" -export K8S_NS="${GITHUB_REPOSITORY#*/}-${GITHUB_REF_NAME}" +export K8S_NS; K8S_NS="$(tr '[:upper:]' '[:lower:]' <<< "${GITHUB_REPOSITORY#*/}-$GITHUB_REF_NAME" | tr -c '[:lower:]-' -)" mkdir -p "$HOME/.kube/" echo "$INPUT_KUBECONFIG" > "$HOME/.kube/config" From c92462e209b3a6e7e57ee214a2b6ba88657dc082 Mon Sep 17 00:00:00 2001 From: ange Date: Fri, 29 Nov 2024 04:50:52 +0000 Subject: [PATCH 04/10] fix: namespace name validation --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index f04b921..7396119 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -6,7 +6,7 @@ set -a set +a REGISTRY="${IMAGEAPP%%/*}" -export K8S_NS; K8S_NS="$(tr '[:upper:]' '[:lower:]' <<< "${GITHUB_REPOSITORY#*/}-$GITHUB_REF_NAME" | tr -c '[:lower:]-' -)" +export K8S_NS; K8S_NS="$(printf '%s' "${GITHUB_REPOSITORY#*/}-$GITHUB_REF_NAME" | tr '[:upper:]' '[:lower:]' | tr -c '[:lower:][:digit:]-' - | sed 's/-\+/-/g; s/^-\+//; s/-$//')" mkdir -p "$HOME/.kube/" echo "$INPUT_KUBECONFIG" > "$HOME/.kube/config" From dd103cf3b7bab5ded27171858f3f549627cb74bd Mon Sep 17 00:00:00 2001 From: ange Date: Fri, 29 Nov 2024 05:05:59 +0000 Subject: [PATCH 05/10] test --- entrypoint.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 7396119..52fdd74 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,12 +1,15 @@ #!/bin/bash -e # shellcheck disable=SC1091 +pwd set -a . ./.env set +a -REGISTRY="${IMAGEAPP%%/*}" -export K8S_NS; K8S_NS="$(printf '%s' "${GITHUB_REPOSITORY#*/}-$GITHUB_REF_NAME" | tr '[:upper:]' '[:lower:]' | tr -c '[:lower:][:digit:]-' - | sed 's/-\+/-/g; s/^-\+//; s/-$//')" +export K8S_NS; +K8S_NS="$(printf '%s' "${GITHUB_REPOSITORY#*/}-$GITHUB_REF_NAME" \ + | tr '[:upper:]' '[:lower:]' | tr -c '[:lower:][:digit:]-' - \ + | sed 's/-\+/-/g; s/^-\+//; s/-$//')" mkdir -p "$HOME/.kube/" echo "$INPUT_KUBECONFIG" > "$HOME/.kube/config" @@ -16,7 +19,7 @@ kubectl config set-context --current --namespace="$K8S_NS" if [ -n "$INPUT_REGISTRY_PASSWORD" ]; then kubectl get secret regcred \ || kubectl create secret docker-registry regcred \ - --docker-server="$REGISTRY" \ + --docker-server="${IMAGEAPP%%/*}" \ --docker-username="$INPUT_REGISTRY_USERNAME" \ --docker-password="$INPUT_REGISTRY_PASSWORD" fi From 2b2a1ac12cfac5a8c0270465cf5362a2dae894d8 Mon Sep 17 00:00:00 2001 From: ange Date: Fri, 29 Nov 2024 05:08:06 +0000 Subject: [PATCH 06/10] remove test --- entrypoint.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 52fdd74..1d3fc3e 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,7 +1,6 @@ #!/bin/bash -e # shellcheck disable=SC1091 -pwd set -a . ./.env set +a From d1f56fe98db62b3a7d6c66de4f2b0e4405eac115 Mon Sep 17 00:00:00 2001 From: ange Date: Fri, 29 Nov 2024 05:39:38 +0000 Subject: [PATCH 07/10] feat: workdir variable --- action.yaml | 3 +++ entrypoint.sh | 2 ++ 2 files changed, 5 insertions(+) diff --git a/action.yaml b/action.yaml index 763ad98..8493f5d 100644 --- a/action.yaml +++ b/action.yaml @@ -7,6 +7,9 @@ inputs: default: ${{ gitea.repository_owner }} registry_password: description: Registry password + workdir: + description: Working directory where to the action from + default: . runs: using: composite diff --git a/entrypoint.sh b/entrypoint.sh index 1d3fc3e..30cbb7c 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,6 +1,8 @@ #!/bin/bash -e # shellcheck disable=SC1091 +cd "$INPUT_WORKDIR" + set -a . ./.env set +a From eff74727399f61cc739f91aa4a3543d78e388d69 Mon Sep 17 00:00:00 2001 From: ange Date: Thu, 3 Apr 2025 11:22:07 +0000 Subject: [PATCH 08/10] fix: docker server == registry --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 30cbb7c..d064c4e 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -20,7 +20,7 @@ kubectl config set-context --current --namespace="$K8S_NS" if [ -n "$INPUT_REGISTRY_PASSWORD" ]; then kubectl get secret regcred \ || kubectl create secret docker-registry regcred \ - --docker-server="${IMAGEAPP%%/*}" \ + --docker-server="${REGISTRY}" \ --docker-username="$INPUT_REGISTRY_USERNAME" \ --docker-password="$INPUT_REGISTRY_PASSWORD" fi From 4c6d456a1cf76b39ca7f67e5cde9351dad85c64c Mon Sep 17 00:00:00 2001 From: ange Date: Sat, 4 Oct 2025 14:32:49 +0000 Subject: [PATCH 09/10] fix: add orga to K8S_NS generated name --- entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index d064c4e..d60e163 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,14 +1,14 @@ #!/bin/bash -e -# shellcheck disable=SC1091 cd "$INPUT_WORKDIR" set -a +# shellcheck disable=SC1091 . ./.env set +a export K8S_NS; -K8S_NS="$(printf '%s' "${GITHUB_REPOSITORY#*/}-$GITHUB_REF_NAME" \ +K8S_NS="$(printf '%s' "${GITHUB_REPOSITORY//\//-}-$GITHUB_REF_NAME" \ | tr '[:upper:]' '[:lower:]' | tr -c '[:lower:][:digit:]-' - \ | sed 's/-\+/-/g; s/^-\+//; s/-$//')" @@ -20,7 +20,7 @@ kubectl config set-context --current --namespace="$K8S_NS" if [ -n "$INPUT_REGISTRY_PASSWORD" ]; then kubectl get secret regcred \ || kubectl create secret docker-registry regcred \ - --docker-server="${REGISTRY}" \ + --docker-server="$REGISTRY" \ --docker-username="$INPUT_REGISTRY_USERNAME" \ --docker-password="$INPUT_REGISTRY_PASSWORD" fi From 85b42eee78dd4e5518b28db05a9b07ec34cefded Mon Sep 17 00:00:00 2001 From: ange Date: Wed, 22 Oct 2025 03:53:39 +0000 Subject: [PATCH 10/10] fix: replace gitea by forgejo --- README.md | 2 +- action.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4c20a30..721e56c 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# k8sdeploy@v1 +# k8sdeploy@v2 diff --git a/action.yaml b/action.yaml index 8493f5d..38a588a 100644 --- a/action.yaml +++ b/action.yaml @@ -4,7 +4,7 @@ inputs: required: true registry_username: description: Registry username - default: ${{ gitea.repository_owner }} + default: ${{ forgejo.repository_owner }} registry_password: description: Registry password workdir: @@ -15,4 +15,4 @@ runs: using: composite steps: - name: k8sdeploy - run: ${{ gitea.action_path }}/entrypoint.sh + run: ${{ forgejo.action_path }}/entrypoint.sh