Update image repository

Author: jkupferer

.github/workflows/publish.yaml

@@ -8,9 +8,6 @@ on:
     - 'v[0-9]*'
 jobs:
   publish:
-    env:
-      IMAGE_NAME: anarchy
-      OPERATOR_IMAGE_NAME: anarchy-operator
     runs-on: ubuntu-latest
     steps:
     - name: Checkout source
@@ -22,23 +19,21 @@ jobs:
         # Version is a semantic version tag or semantic version with release number
         # GITHUB_REF will be of the form "refs/tags/v0.1.2" or "refs/tags/v0.1.2-1"
         # To determine RELEASE, strip off the leading "refs/tags/"
-        RELEASE=${GITHUB_REF#refs/tags/v}
+        RELEASE=${GITHUB_REF#refs/tags/}
         # To determine VERSION, strip off any release number suffix
         VERSION=${RELEASE/-*/}
 
-        echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
-
         # Only build image if version tag without release number
         # Releases indicate a change in the repository that should not trigger a new build.
         if [[ "${VERSION}" == "${RELEASE}" ]]; then
           # Publish to latest, minor, and patch tags
           # Ex: latest,v1.2,v1.2.3
-          echo "IMAGE_TAGS=latest v${VERSION%.*} v${VERSION}" >> $GITHUB_OUTPUT
+          echo "IMAGE_TAGS=latest ${VERSION%.*} ${VERSION}" >> $GITHUB_OUTPUT
         fi
 
         # Read version from helm/Chart.yaml
         HELM_CHART_VERSION=$(sed -nr 's/^appVersion: (.*)/\1/p' helm/Chart.yaml)
-        if [[ "${HELM_CHART_VERSION}" != "${VERSION}" ]]; then
+        if [[ "v${HELM_CHART_VERSION}" != "${VERSION}" ]]; then
           echo "Helm chart version does not match tag!"
           exit 1
         fi
@@ -48,9 +43,9 @@ jobs:
       if: steps.image_tags.outputs.IMAGE_TAGS
       uses: redhat-actions/buildah-build@v2
       with:
-        image: ${{ env.IMAGE_NAME }}
+        image: ${{ vars.IMAGE_NAME }}
         tags: ${{ steps.image_tags.outputs.IMAGE_TAGS }}
-        containerfiles: Dockerfile
+        containerfiles: Containerfile
 
     - name: Push image to registry
       id: push-to-registry
@@ -60,13 +55,11 @@ jobs:
         image: ${{ steps.buildah-build.outputs.image }}
         tags: ${{ steps.buildah-build.outputs.tags }}
         registry: ${{ vars.IMAGE_REGISTRY }}/${{ vars.IMAGE_REPOSITORY }}
-        username: ${{ secrets.REGISTRY_USERNAME }}
-        password: ${{ secrets.REGISTRY_PASSWORD }}
+        username: ${{ secrets.IMAGE_REGISTRY_USERNAME }}
+        password: ${{ secrets.IMAGE_REGISTRY_PASSWORD }}
 
   publish-helm-charts:
     needs: publish
-    env:
-      IMAGE_NAME: anarchy
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Source
@@ -89,8 +82,8 @@ jobs:
       run: |
         helm dep up helm/
         helm package helm/
-        mv ${{ env.IMAGE_NAME }}-*.tgz gh-pages
-        helm repo index --url https://redhat-cop.github.io/${{ env.IMAGE_NAME }} gh-pages
+        mv ${{ vars.IMAGE_NAME }}-*.tgz gh-pages
+        helm repo index --url https://redhat-cop.github.io/${{ vars.IMAGE_NAME }} gh-pages
 
     - name: Push Changes to GH Pages
       run: |

README.adoc

@@ -59,7 +59,7 @@ oc apply -f kopfpeerings.crd.yaml
 Clone this repo to your local workstation and change directory:
 
 ----
-git clone https://github.com/redhat-cop/anarchy.git
+git clone https://github.com/rhpds/anarchy.git
 cd anarchy
 ----
 

build-template.yaml

@@ -8,7 +8,7 @@ metadata:
 
 parameters:
 - name: GIT_REPO
-  value: https://github.com/redhat-cop/anarchy.git
+  value: https://github.com/rhpds/anarchy.git
 - name: GIT_REF
   value: main
 - name: NAME

devfile.yaml

@@ -27,7 +27,7 @@ components:
       value: "10"
     - name: RUNNER_TOKEN
       value: "development-token"
-    image: quay.io/redhat-cop/python-kopf-s2i:v1.36
+    image: quay.io/rhpds/python-kopf-s2i:v1.38
     mountSources: true
     sourceMapping: /tmp/projects
   name: s2i-builder

helm/values.yaml

@@ -13,7 +13,7 @@ communeOperator:
       memory: 128Mi
 
 image:
-  repository: quay.io/redhat-cop/anarchy
+  repository: quay.io/rhpds/anarchy
   pullPolicy: IfNotPresent
 
 # Deploy Anarchy, as opposed to only defining the CRDs and ClusterRoles

institutions/gitops/helm/values.yaml

@@ -1,6 +1,6 @@
 ---
 image:
-  repository: quay.io/redhat-cop/anarchy
+  repository: quay.io/rhpds/anarchy
   pullPolicy: IfNotPresent
 
 # Deploy Anarchy, as opposed to only defining the CRDs and ClusterRoles

institutions/gitops/k8s-config/vars.yaml

@@ -4,15 +4,15 @@ anarchy_version: main
 k8s_resources:
 - name: Anarchy install
   openshift_template:
-    url: https://raw.githubusercontent.com/redhat-cop/anarchy/{{ anarchy_version }}/install-template.yaml
+    url: https://raw.githubusercontent.com/rhpds/anarchy/{{ anarchy_version }}/install-template.yaml
 
 - namespace: anarchy-k8s-config
   resources:
   - name: Anarchy k8s-config deployment
     helm_template:
       dir: "institutions/gitops/helm"
       git:
-        repo: https://github.com/redhat-cop/anarchy.git
+        repo: https://github.com/rhpds/anarchy.git
         version: "{{ anarchy_version }}"
       values:
         k8s_config: "{{ k8s_config }}"
@@ -36,4 +36,4 @@ k8s_resources:
           - name: anarchy-k8s-config
             base_path: institutions/gitops/k8s-config
             git:
-              repo: https://github.com/redhat-cop/anarchy.git
+              repo: https://github.com/rhpds/anarchy.git

test/server/Dockerfile test/server/Containerfiletest/server/Dockerfile renamed to test/server/Containerfile

@@ -2,7 +2,7 @@ FROM registry.access.redhat.com/ubi8/python-38:latest
 
 USER 0
 
-FROM quay.io/redhat-cop/python-kopf-s2i:latest
+FROM quay.io/rhpds/python-kopf-s2i:latest
 
 USER root
 

test/server/build-template.yaml

@@ -8,7 +8,7 @@ metadata:
 
 parameters:
 - name: GIT_REPO
-  value: https://github.com/redhat-cop/anarchy.git
+  value: https://github.com/rhpds/anarchy.git
 
 objects:
 - apiVersion: image.openshift.io/v1

test/server/deploy-template.yaml

@@ -12,7 +12,7 @@ parameters:
 - name: ANARCHY_TEST_NAMESPACE
   value: anarchy-operator-test
 - name: ANARCHY_TEST_IMAGE
-  value: quay.io/redhat-cop/anarchy-test-server:v0.4.1
+  value: quay.io/rhpds/anarchy-test-server:v0.4.1
   #value: docker-registry.default.svc:5000/anarchy-operator-test/anarchy-test-server:latest
   #value: image-registry.openshift-image-registry.svc:5000/anarchy-operator-test/anarchy-test-server:latest
 - name: ANARCHY_TEST_SERVICE_NAME