From 2987adce711bc66680a54506d0ace8433f0366f3 Mon Sep 17 00:00:00 2001 From: Emmanuel Mathot Date: Sun, 20 Apr 2025 21:51:27 +0200 Subject: [PATCH 1/4] Enhance Artifact Hub integration by updating metadata and adding annotations in Chart.yaml files --- .github/workflows/release.yml | 17 ++++++++++++++++- README.md | 5 ++++- artifacthub-repo.yml | 8 ++++---- helm-chart/eoapi/Chart.yaml | 20 ++++++++++++++++++++ helm-chart/postgrescluster/Chart.yaml | 21 ++++++++++++++++++++- 5 files changed, 64 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index efb4650e..61044247 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ env: jobs: release: - if: "!startsWith(github.ref, 'refs/tags/eoapi-')" # prevent the helm chart releaser from running this release workflow + if: ${{ !startsWith(github.ref, 'refs/tags/eoapi-') }} # prevent the helm chart releaser from running this release workflow runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -42,3 +42,18 @@ jobs: CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" CR_SKIP_EXISTING: true CR_INDEX_PATH: "." + + - name: update artifacthub metadata + run: | + echo "Copying artifacthub-repo.yml to gh-pages branch for Artifact Hub integration" + # Save the file to a temporary location first + cp artifacthub-repo.yml /tmp/artifacthub-repo.yml + git fetch origin gh-pages + git checkout gh-pages + cp /tmp/artifacthub-repo.yml . + git config user.name "$GITHUB_ACTOR" + git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + git add artifacthub-repo.yml + git commit -m "Update Artifact Hub metadata" || echo "No changes to commit" + git push origin gh-pages || echo "No changes to push" + git checkout ${{ github.ref_name }} diff --git a/README.md b/README.md index 9715b119..65212abf 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,10 @@ Test - Downloads + License + + + Artifact Hub

diff --git a/artifacthub-repo.yml b/artifacthub-repo.yml index fd5e76e5..80746377 100644 --- a/artifacthub-repo.yml +++ b/artifacthub-repo.yml @@ -1,6 +1,6 @@ # Artifact Hub repository metadata file # -# Some settings like the verified publisher flag or the ignored packages won't +# Some settings like the verified publisher flag or the ignored packages won't # be applied until the next time the repository is processed. Please keep in # mind that the repository won't be processed if it has not changed since the # last time it was processed. Depending on the repository kind, this is checked @@ -10,6 +10,6 @@ # NOT apply to ownership claim operations, which are processed immediately. # repositoryID: bb8121e4-7762-43a1-971a-ea0454ba6027 -owners: # (optional, used to claim repository ownership) - - name: ranchodeluxe - email: greg@developmentseed.org +owners: # (used to claim repository ownership) + - name: Emmanuel mathot + email: emmanuel@developmentseed.org diff --git a/helm-chart/eoapi/Chart.yaml b/helm-chart/eoapi/Chart.yaml index 3546c307..bf544c42 100644 --- a/helm-chart/eoapi/Chart.yaml +++ b/helm-chart/eoapi/Chart.yaml @@ -12,6 +12,26 @@ description: Create a full Earth Observation API with Metadata, Raster and Vecto type: application kubeVersion: ">=1.23.0-0" +# Artifacthub metadata +annotations: + artifacthub.io/changes: | + - Adds integration with Artifacthub.io + artifacthub.io/links: | + - name: GitHub Repository + url: https://github.com/developmentseed/eoapi-k8s + - name: Documentation + url: https://github.com/developmentseed/eoapi-k8s/tree/main/docs + artifacthub.io/maintainers: | + - name: DevelopmentSeed + email: eoapi@developmentseed.org + artifacthub.io/keywords: | + - earth observation + - geospatial + - kubernetes + - stac + - raster + - vector + # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) diff --git a/helm-chart/postgrescluster/Chart.yaml b/helm-chart/postgrescluster/Chart.yaml index 6d74f65f..c3b7effc 100644 --- a/helm-chart/postgrescluster/Chart.yaml +++ b/helm-chart/postgrescluster/Chart.yaml @@ -7,4 +7,23 @@ type: application # https://access.crunchydata.com/documentation/postgres-operator/latest/releases version: 5.7.4 appVersion: 5.7.4 -force: true +# Removed invalid 'force' property + +# Artifacthub metadata +annotations: + artifacthub.io/changes: | + - Adds integration with Artifacthub.io + artifacthub.io/links: | + - name: GitHub Repository + url: https://github.com/developmentseed/eoapi-k8s + - name: Documentation + url: https://github.com/developmentseed/eoapi-k8s/tree/main/docs + artifacthub.io/maintainers: | + - name: DevelopmentSeed + email: eoapi@developmentseed.org + artifacthub.io/keywords: | + - postgres + - database + - postgis + - pgstac + - kubernetes From 5610caf9c1495a23d293903544ecfa8419b743b8 Mon Sep 17 00:00:00 2001 From: Emmanuel Mathot Date: Sun, 20 Apr 2025 22:20:07 +0200 Subject: [PATCH 2/4] Update README.md for Artifact Hub badge and remove obsolete metadata file --- .github/workflows/release.yml | 14 -------------- README.md | 4 ++-- artifacthub-repo.yml | 15 --------------- 3 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 artifacthub-repo.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 61044247..ca8c11c8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,17 +43,3 @@ jobs: CR_SKIP_EXISTING: true CR_INDEX_PATH: "." - - name: update artifacthub metadata - run: | - echo "Copying artifacthub-repo.yml to gh-pages branch for Artifact Hub integration" - # Save the file to a temporary location first - cp artifacthub-repo.yml /tmp/artifacthub-repo.yml - git fetch origin gh-pages - git checkout gh-pages - cp /tmp/artifacthub-repo.yml . - git config user.name "$GITHUB_ACTOR" - git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - git add artifacthub-repo.yml - git commit -m "Update Artifact Hub metadata" || echo "No changes to commit" - git push origin gh-pages || echo "No changes to push" - git checkout ${{ github.ref_name }} diff --git a/README.md b/README.md index 65212abf..2141520d 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ License - - Artifact Hub + + Artifact Hub

diff --git a/artifacthub-repo.yml b/artifacthub-repo.yml deleted file mode 100644 index 80746377..00000000 --- a/artifacthub-repo.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Artifact Hub repository metadata file -# -# Some settings like the verified publisher flag or the ignored packages won't -# be applied until the next time the repository is processed. Please keep in -# mind that the repository won't be processed if it has not changed since the -# last time it was processed. Depending on the repository kind, this is checked -# in a different way. For Helm http based repositories, we consider it has -# changed if the `index.yaml` file changes. For git based repositories, it does -# when the hash of the last commit in the branch you set up changes. This does -# NOT apply to ownership claim operations, which are processed immediately. -# -repositoryID: bb8121e4-7762-43a1-971a-ea0454ba6027 -owners: # (used to claim repository ownership) - - name: Emmanuel mathot - email: emmanuel@developmentseed.org From 57417fafbf0850a1de0dcb102fc09e40c046da34 Mon Sep 17 00:00:00 2001 From: Emmanuel Mathot Date: Sun, 20 Apr 2025 22:39:43 +0200 Subject: [PATCH 3/4] Update Artifact Hub link in README.md for accurate repository reference --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2141520d..0cbc53dc 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ License - + Artifact Hub

From e7ddb4ded31e2a2c85163f3a35424ba07392a01d Mon Sep 17 00:00:00 2001 From: Emmanuel Mathot Date: Sun, 20 Apr 2025 22:59:08 +0200 Subject: [PATCH 4/4] Update Artifact Hub link in README.md for improved repository navigation --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0cbc53dc..2141520d 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ License - + Artifact Hub