Push images to ghcr.io (#344)

Signed-off-by: Sergio Castaño Arteaga <[email protected]>

Author: tegioz

.github/workflows/chart.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.7
+          python-version: 3.8
       - name: Set up chart-testing
         uses: helm/[email protected]
       - name: Run chart-testing (list-changed)

.github/workflows/release.yml

@@ -10,17 +10,19 @@ permissions: read-all
 jobs:
   build-and-publish-images:
     runs-on: ubuntu-latest
+    permissions:
+      packages: write
     steps:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: Login to AWS Public ECR
+      - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
-          registry: public.ecr.aws
-          username: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Extract tag name
         id: extract_tag_name
         run: echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
@@ -29,15 +31,23 @@ jobs:
         with:
           platforms: linux/amd64,linux/arm64
           file: database/migrations/Dockerfile
-          tags: public.ecr.aws/g6m3a0y9/clowarden-dbmigrator:${{steps.extract_tag_name.outputs.tag}},public.ecr.aws/g6m3a0y9/clowarden-dbmigrator:latest
+          tags: ghcr.io/${{ github.repository }}/dbmigrator:${{steps.extract_tag_name.outputs.tag}},ghcr.io/${{ github.repository }}/dbmigrator:latest
           push: true
+          labels: |
+            org.opencontainers.image.source=https://github.com/${{ github.repository }}
+            org.opencontainers.image.description=CLOWarden database migrator
+            org.opencontainers.image.licenses=Apache-2.0
       - name: Build and push clowarden-server image
         uses: docker/build-push-action@v6
         with:
           platforms: linux/amd64,linux/arm64
           file: clowarden-server/Dockerfile
-          tags: public.ecr.aws/g6m3a0y9/clowarden-server:${{steps.extract_tag_name.outputs.tag}},public.ecr.aws/g6m3a0y9/clowarden-server:latest
+          tags: ghcr.io/${{ github.repository }}/server:${{steps.extract_tag_name.outputs.tag}},ghcr.io/${{ github.repository }}/server:latest
           push: true
+          labels: |
+            org.opencontainers.image.source=https://github.com/${{ github.repository }}
+            org.opencontainers.image.description=CLOWarden server
+            org.opencontainers.image.licenses=Apache-2.0
 
   package-and-publish-helm-chart:
     needs:

charts/clowarden/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: clowarden
 description: CLOWarden is a tool that manages access to resources across multiple services
 type: application
-version: 0.2.0
+version: 0.2.1-0
 appVersion: 0.2.0
 kubeVersion: ">= 1.19.0-0"
 home: https://clowarden.io
@@ -42,9 +42,9 @@ annotations:
       description: Issue processing email invitations
   artifacthub.io/images: |
     - name: dbmigrator
-      image: public.ecr.aws/g6m3a0y9/clowarden-dbmigrator:v0.2.0
+      image: ghcr.io/cncf/clowarden/dbmigrator:v0.2.0
     - name: server
-      image: public.ecr.aws/g6m3a0y9/clowarden-server:v0.2.0
+      image: ghcr.io/cncf/clowarden/server:v0.2.0
   artifacthub.io/links: |
     - name: source
       url: https://github.com/cncf/clowarden

charts/clowarden/values.yaml

@@ -36,7 +36,7 @@ dbmigrator:
   job:
     image:
       # Database migrator image repository (without the tag)
-      repository: public.ecr.aws/g6m3a0y9/clowarden-dbmigrator
+      repository: ghcr.io/cncf/clowarden/dbmigrator
 
 # CLOWarden server configuration
 server:
@@ -83,7 +83,7 @@ server:
   deploy:
     replicaCount: 1  # Do not increase
     image:
-      repository: public.ecr.aws/g6m3a0y9/clowarden-server
+      repository: ghcr.io/cncf/clowarden/server
     resources: {}
 
 # Services CLOWarden will manage

clowarden-core/src/services/github/state.rs

@@ -404,11 +404,11 @@ impl State {
             // Teams
             let mut teams_old = HashSet::new();
             if let Some(teams) = &repos_old[repo_name].teams {
-                teams_old = teams.iter().map(|(name, _)| name).collect();
+                teams_old = teams.keys().collect();
             }
             let mut teams_new = HashSet::new();
             if let Some(teams) = &repos_new[repo_name].teams {
-                teams_new = teams.iter().map(|(name, _)| name).collect();
+                teams_new = teams.keys().collect();
             }
             for team_name in teams_old.difference(&teams_new) {
                 changes.push(RepositoryChange::TeamRemoved(
@@ -442,11 +442,11 @@ impl State {
             // Collaborators
             let mut collaborators_old = HashSet::new();
             if let Some(collaborators) = &repos_old[repo_name].collaborators {
-                collaborators_old = collaborators.iter().map(|(name, _)| name).collect();
+                collaborators_old = collaborators.keys().collect();
             }
             let mut collaborators_new = HashSet::new();
             if let Some(collaborators) = &repos_new[repo_name].collaborators {
-                collaborators_new = collaborators.iter().map(|(name, _)| name).collect();
+                collaborators_new = collaborators.keys().collect();
             }
             for user_name in collaborators_old.difference(&collaborators_new) {
                 changes.push(RepositoryChange::CollaboratorRemoved(