Update secrets

Signed-off-by: Hollow Man <[email protected]>
kubescape · May 9, 2023 · d9b6bf2 · d9b6bf2
1 parent ad03809
commit d9b6bf2
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 57 deletions.
diff --git a/.dput.cf b/.dput.cf
@@ -2,5 +2,5 @@
 fqdn = ppa.launchpad.net
 method = sftp
 incoming = ~kubescape/ubuntu/kubescape/
-login = hollowman86
+login = kubescape-maintainers
 allow_unsigned_uploads = 0
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ on:
 
 env:
   GO_VERSION: 1.19
-  GPG_OWNER_TRUST: "5EAC9FF1F66A043E442D91C8D1EA5D5F3FB99300:6:"
+  GPG_OWNER_TRUST: "D35930F2533C516BD2863BD7F03CFCB8B3E73F87:6:"
 
 jobs:
   debian:
@@ -53,12 +53,12 @@ jobs:
         run: |
           ${{ env.DOCKER_CMD }} sudo apt update
           ${{ env.DOCKER_CMD }} sudo apt install -y debhelper golang-golang-x-tools cmake
-      - name: Setup PGP
+      - name: Setup GPG
         env:
-          PGP: ${{ secrets.PGP }}
-        if: env.PGP != null
+          GPG: ${{ secrets.GPG }}
+        if: env.GPG != null
         run: |
-          echo "${{ env.PGP }}" >> secret.gpg
+          echo "${{ env.GPG }}" >> secret.gpg
           ${{ env.DOCKER_CMD }} gpg --import secret.gpg
           rm secret.gpg
           ${{ env.DOCKER_CMD }} gpg --import-ownertrust <<< "${{ env.GPG_OWNER_TRUST }}"

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ on:
 
 env:
   GO_VERSION: 1.19
-  GPG_OWNER_TRUST: "5EAC9FF1F66A043E442D91C8D1EA5D5F3FB99300:6:"
+  GPG_OWNER_TRUST: "D35930F2533C516BD2863BD7F03CFCB8B3E73F87:6:"
 
 jobs:
   check-secret:
@@ -36,8 +36,8 @@ jobs:
     steps:
       - name: Set release token
         run: |
-          if [ "${{ secrets.PAT }}" != "" ]; then
-            echo "TOKEN=${{ secrets.PAT }}" >> $GITHUB_ENV;
+          if [ "${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}" != "" ]; then
+            echo "TOKEN=${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}" >> $GITHUB_ENV;
           else
             echo "TOKEN=${{ secrets.GITHUB_TOKEN }}" >> $GITHUB_ENV;
           fi
@@ -51,7 +51,7 @@ jobs:
           if [ "$LATEST" == "$CURRENT" ]; then echo "release=release $((RELEASE+1))" >> $GITHUB_ENV; fi
       - uses: stefanzweifel/git-auto-commit-action@v4
         with:
-          commit_author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
+          commit_author: Kubescape Maintainers <[email protected]>
           commit_message: Bump version into ${{ env.version }} ${{ env.release }}
   aur:
     runs-on: ubuntu-latest
@@ -73,8 +73,8 @@ jobs:
         with:
           pkgname: kubescape
           pkgbuild: ./PKGBUILD
-          commit_username: github-actions[bot]
-          commit_email: 41898282+github-actions[bot]@users.noreply.github.com
+          commit_username: Kubescape Maintainers
+          commit_email: [email protected]
           ssh_private_key: ${{ secrets.SSH }}
           commit_message: Bump kubescape version into ${{ env.version }} ${{ env.release }}
           ssh_keyscan_types: rsa,dsa,ecdsa,ed25519
@@ -105,12 +105,12 @@ jobs:
         run: |
           sudo apt update
           sudo apt install -y osc debhelper golang-golang-x-tools cmake
-      - name: Setup PGP
+      - name: Setup GPG
         env:
-          PGP: ${{ secrets.PGP }}
-        if: env.PGP != null
+          GPG: ${{ secrets.GPG }}
+        if: env.GPG != null
         run: |
-          echo "${{ env.PGP }}" >> secret.gpg
+          echo "${{ env.GPG }}" >> secret.gpg
           gpg --import secret.gpg
           rm secret.gpg
           gpg --import-ownertrust <<< "${{ env.GPG_OWNER_TRUST }}"
@@ -167,12 +167,12 @@ jobs:
           sudo apt update
           sudo apt install -y debhelper dput golang-golang-x-tools cmake python3-paramiko
           mv .dput.cf ~
-      - name: Setup PGP
+      - name: Setup GPG
         env:
-          PGP: ${{ secrets.PGP }}
-        if: env.PGP != null
+          GPG: ${{ secrets.GPG }}
+        if: env.GPG != null
         run: |
-          echo "${{ env.PGP }}" >> secret.gpg
+          echo "${{ env.GPG }}" >> secret.gpg
           gpg --import secret.gpg
           rm secret.gpg
           gpg --import-ownertrust <<< "${{ env.GPG_OWNER_TRUST }}"

diff --git a/PKGBUILD b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Hollow Man <hollowman at opensuse dot org>
+# Maintainer: Kubescape Maintainers <cncf hyphen kubescape hyphen maintainers at lists dot cncf dot io>
 
 pkgname=kubescape
 pkgver=2.2.6

diff --git a/PKGBUILD_obs b/PKGBUILD_obs
@@ -1,4 +1,4 @@
-# Maintainer: Hollow Man <hollowman at opensuse dot org>
+# Maintainer: Kubescape Maintainers <cncf hyphen kubescape hyphen maintainers at lists dot cncf dot io>
 
 pkgname=kubescape
 pkgver=2.2.6

diff --git a/README.md b/README.md
@@ -1,4 +1,7 @@
 # kubescape Packaging
+
+[![build result](https://build.opensuse.org/projects/home:kubescape/packages/kubescape/badge.svg?type=percent)](https://build.opensuse.org/package/show/home:kubescape/kubescape)
+
 [![Version](https://img.shields.io/github/v/release/kubescape/packaging)](https://github.com/kubescape/packaging/releases)
 [![Build deb or rpm packages](https://github.com/kubescape/packaging/actions/workflows/build.yml/badge.svg)](https://github.com/kubescape/packaging/actions/workflows/build.yml)
 [![Release with upstream](https://github.com/kubescape/packaging/actions/workflows/release.yml/badge.svg)](https://github.com/kubescape/packaging/actions/workflows/release.yml)
@@ -37,17 +40,17 @@ sudo snap install kubescape --classic
 
 ### Manually
 Get the latest debian or [rpm](kubescape.spec) package from the [Release Assets](https://github.com/kubescape/packaging/releases):
-- `kubescape-2.2.6-0.aarch64.rpm`: Kubescape rpm package for arm64 (aarch64)
-- `kubescape-2.2.6-0.x86_64.rpm`: Kubescape rpm package for amd64 (x86_64)
-- `kubescape-bash-completion-2.2.6-0.noarch.rpm`: Kubescape bash auto completion rpm package
-- `kubescape-fish-completion-2.2.6-0.noarch.rpm`: Kubescape fish auto completion rpm package
-- `kubescape-zsh-completion-2.2.6-0.noarch.rpm`: Kubescape zsh auto completion rpm package
-- `kubescape_2.2.6.dsc`: Debian Signed Kubescape source package description
-- `kubescape_2.2.6.tar.xz`: Debian Kubescape vendored source package + golang compiler source package
-- `kubescape_2.2.6_amd64.deb`: Kubescape rpm package for amd64 (x86_64)
-- `kubescape_2.2.6_arm64.deb`: Kubescape debian package for arm64 (aarch64)
-
-Or from the latest [GitHub Actions Workflow](https://github.com/HollowMan6/kubescape-deb-rpm/actions/workflows/build.yml) Artifacts and unzip:
+- `kubescape-<version>-0.aarch64.rpm`: Kubescape rpm package for arm64 (aarch64)
+- `kubescape-<version>-0.x86_64.rpm`: Kubescape rpm package for amd64 (x86_64)
+- `kubescape-bash-completion-<version>-0.noarch.rpm`: Kubescape bash auto completion rpm package
+- `kubescape-fish-completion-<version>-0.noarch.rpm`: Kubescape fish auto completion rpm package
+- `kubescape-zsh-completion-<version>-0.noarch.rpm`: Kubescape zsh auto completion rpm package
+- `kubescape_<version>.dsc`: Debian Signed Kubescape source package description
+- `kubescape_<version>.tar.xz`: Debian Kubescape vendored source package + golang compiler source package
+- `kubescape_<version>_amd64.deb`: Kubescape rpm package for amd64 (x86_64)
+- `kubescape_<version>_arm64.deb`: Kubescape debian package for arm64 (aarch64)
+
+Or from the latest [GitHub Actions Workflow](https://github.com/kubescape/packaging/actions/workflows/build.yml) Artifacts and unzip:
 
 - `kubescape_deb_amd64.zip`: Kubescape debian package for amd64 (x86_64)
 - `kubescape_deb_arm64.zip`: Kubescape debian package for arm64 (aarch64)

diff --git a/deb/debian/changelog b/deb/debian/changelog
@@ -2,40 +2,40 @@ kubescape (2.2.6) jammy; urgency=medium
 
   * v2.2.6: Update
 
- -- Hollow Man <[email protected]>  Mon, 03 Apr 2023 18:24:16 +0000
+ -- Kubescape Maintainers <[email protected]>  Mon, 03 Apr 2023 18:24:16 +0000
 
 kubescape (2.2.5) jammy; urgency=medium
 
   * v2.2.5: Update
 
- -- Hollow Man <[email protected]>  Fri, 24 Mar 2023 08:06:10 +0000
+ -- Kubescape Maintainers <[email protected]>  Fri, 24 Mar 2023 08:06:10 +0000
 
 kubescape (2.2.4) jammy; urgency=medium
 
   * v2.2.4: Update
 
- -- Hollow Man <[email protected]>  Sat, 11 Mar 2023 14:25:12 +0000
+ -- Kubescape Maintainers <[email protected]>  Sat, 11 Mar 2023 14:25:12 +0000
 
 kubescape (2.2.2) jammy; urgency=medium
 
   * v2.2.2: Upgrade with patches
 
- -- Hollow Man <[email protected]>  Sun, 26 Feb 2023 20:58:32 +0200
+ -- Kubescape Maintainers <[email protected]>  Sun, 26 Feb 2023 20:58:32 +0200
 
 kubescape (2.2.1) jammy; urgency=medium
 
   * v2.2.1: Upgrade
 
- -- Hollow Man <[email protected]>  Thu, 23 Feb 2023 19:18:16 +0200
+ -- Kubescape Maintainers <[email protected]>  Thu, 23 Feb 2023 19:18:16 +0200
 
 kubescape (2.2.0) jammy; urgency=medium
 
   * v2.2.0: New control statuses (https://github.com/kubescape/kubescape/pull/1016)
 
- -- Hollow Man <[email protected]>  Wed, 15 Feb 2023 14:33:28 +0200
+ -- Kubescape Maintainers <[email protected]>  Wed, 15 Feb 2023 14:33:28 +0200
 
 kubescape (2.1.3) jammy; urgency=medium
 
   * v2.1.3: Init Debian package.
 
- -- Hollow Man <[email protected]>  Fri, 10 Feb 2023 10:46:58 +0200
+ -- Kubescape Maintainers <[email protected]>  Fri, 10 Feb 2023 10:46:58 +0200
diff --git a/deb/debian/control b/deb/debian/control
@@ -1,7 +1,7 @@
 Source: kubescape
 Section: devel
 Priority: optional
-Maintainer: Hollow Man <[email protected]>
+Maintainer: Kubescape Maintainers <[email protected]>
 Build-Depends: golang, cmake, pkg-config, debhelper
 Standards-Version: 2.2.6
 Homepage: https://github.com/kubescape/kubescape

diff --git a/kubescape.spec b/kubescape.spec
@@ -118,23 +118,23 @@ if [ "$(%{buildroot}%{_bindir}/%{name} version)" != "Your current version is: v%
 %{_datadir}/fish
 
 %changelog
-* Mon Apr 03 2023 github-actions[bot] <github-actions[bot]@users.noreply.github.com> - 2.2.6
+* Mon Apr 03 2023 Kubescape Maintainers <[email protected]> - 2.2.6
 - Update to 2.2.6
 
-* Fri Mar 24 2023 github-actions[bot] <github-actions[bot]@users.noreply.github.com> - 2.2.5
+* Fri Mar 24 2023 Kubescape Maintainers <[email protected]> - 2.2.5
 - Update to 2.2.5
 
-* Sat Mar 11 2023 github-actions[bot] <github-actions[bot]@users.noreply.github.com> - 2.2.4
+* Sat Mar 11 2023 Kubescape Maintainers <[email protected]> - 2.2.4
 - Update to 2.2.4
 
-* Sun Feb 26 2023 Hollow Man <[email protected]> - 2.2.2
+* Sun Feb 26 2023 Kubescape Maintainers <[email protected]> - 2.2.2
 - Upgrade with patches
 
-* Thu Feb 23 2023 Hollow Man <[email protected]> - 2.2.1
+* Thu Feb 23 2023 Kubescape Maintainers <[email protected]> - 2.2.1
 - Upgrade
 
-* Wed Feb 15 2023 Hollow Man <[email protected]> - 2.2.0
+* Wed Feb 15 2023 Kubescape Maintainers <[email protected]> - 2.2.0
 - New control statuses (https://github.com/kubescape/kubescape/pull/1016)
 
-* Fri Feb 10 2023 Hollow Man <[email protected]> - 2.1.3
+* Fri Feb 10 2023 Kubescape Maintainers <[email protected]> - 2.1.3
 - Init kubescape package
diff --git a/kubescape_full.spec b/kubescape_full.spec
@@ -115,23 +115,23 @@ if [ "$(%{buildroot}%{_bindir}/%{name} version)" != "Your current version is: v%
 %{_datadir}/fish
 
 %changelog
-* Mon Apr 03 2023 github-actions[bot] <github-actions[bot]@users.noreply.github.com> - 2.2.6
+* Mon Apr 03 2023 Kubescape Maintainers <[email protected]> - 2.2.6
 - Update to 2.2.6
 
-* Fri Mar 24 2023 github-actions[bot] <github-actions[bot]@users.noreply.github.com> - 2.2.5
+* Fri Mar 24 2023 Kubescape Maintainers <[email protected]> - 2.2.5
 - Update to 2.2.5
 
-* Sat Mar 11 2023 github-actions[bot] <github-actions[bot]@users.noreply.github.com> - 2.2.4
+* Sat Mar 11 2023 Kubescape Maintainers <[email protected]> - 2.2.4
 - Update to 2.2.4
 
-* Sun Feb 26 2023 Hollow Man <[email protected]> - 2.2.2
+* Sun Feb 26 2023 Kubescape Maintainers <[email protected]> - 2.2.2
 - Upgrade with patches
 
-* Thu Feb 23 2023 Hollow Man <[email protected]> - 2.2.1
+* Thu Feb 23 2023 Kubescape Maintainers <[email protected]> - 2.2.1
 - Upgrade
 
-* Wed Feb 15 2023 Hollow Man <[email protected]> - 2.2.0
+* Wed Feb 15 2023 Kubescape Maintainers <[email protected]> - 2.2.0
 - New control statuses (https://github.com/kubescape/kubescape/pull/1016)
 
-* Fri Feb 10 2023 Hollow Man <[email protected]> - 2.1.3
+* Fri Feb 10 2023 Kubescape Maintainers <[email protected]> - 2.1.3
 - Init kubescape package
diff --git a/update.sh b/update.sh
@@ -18,9 +18,9 @@ if [ "$LATEST" != "$CURRENT" ]; then
     sed -i "s/pkgrel=.*/pkgrel=0/g" PKGBUILD*
     sed -i "s/Version:        $CURRENT/Version:        $LATEST/g" kubescape*.spec
     sed -i "s/Release:.*/Release:        0/g" kubescape*.spec
-    sed -i "s/%changelog/%changelog\n* $(date +"%a %b %d %Y") github-actions[bot] <github-actions[bot]@users.noreply.github.com> - $LATEST\n- Update to $LATEST\n/g" kubescape*.spec
+    sed -i "s/%changelog/%changelog\n* $(date +"%a %b %d %Y") Kubescape Maintainers <[email protected]> - $LATEST\n- Update to $LATEST\n/g" kubescape*.spec
     sed -i "s/Standards-Version: $CURRENT/Standards-Version: $LATEST/g" deb/debian/control
-    sed -i "1s/^/kubescape ($LATEST) $UBUNTU; urgency=medium\n\n  * v$LATEST: Update\n\n -- Hollow Man <[email protected]>  $(date +"%a, %d %b %Y %H:%M:%S %z")\n\n/" deb/debian/changelog
+    sed -i "1s/^/kubescape ($LATEST) $UBUNTU; urgency=medium\n\n  * v$LATEST: Update\n\n -- Kubescape Maintainers <[email protected]>  $(date +"%a, %d %b %Y %H:%M:%S %z")\n\n/" deb/debian/changelog
     sed -i "s/version: '$CURRENT'/version: '$LATEST'/g" snap/snapcraft.yaml
 else
     echo "No new version available"