Change repo org (#322)

sebrandon1 · web-flow · commit b549353cf545 · 2024-08-08T16:57:08.000-05:00
diff --git a/.github/workflows/collector-image.yaml b/.github/workflows/collector-image.yaml
@@ -19,12 +19,94 @@ defaults:
 env:
   COLLECTOR_CONTAINER_NAME: tnf-collector
   REGISTRY: quay.io
-  COLLECTOR_IMAGE_NAME: testnetworkfunction/collector
+  COLLECTOR_IMAGE_NAME: redhat-best-practices-for-k8s/collector
+  COLLECTOR_IMAGE_NAME_LEGACY: testnetworkfunction/collector
   COLLECTOR_IMAGE_TAG: latest
   COLLECTOR_SRC_URL: 'https://github.com/${{ github.repository }}'
 
 jobs:
   test-and-push-collector-image-main:
+    name: 'Test and push the collector image'
+    runs-on: ubuntu-22.04
+    env:
+      SHELL: /bin/bash
+      COLLECTOR_VERSION: ""
+      CURRENT_VERSION_GENERIC_BRANCH: main
+    steps:
+      - name: Checkout generic working branch of the current version
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.CURRENT_VERSION_GENERIC_BRANCH }}
+          fetch-depth: '0'
+
+      - name: Get the latest collector version from GIT
+        run: |
+          GIT_RELEASE=$(git tag --points-at HEAD | head -n 1)
+          GIT_PREVIOUS_RELEASE=$(git tag --no-contains HEAD --sort=v:refname | tail -n 1)
+          GIT_LATEST_RELEASE=$GIT_RELEASE
+          if [ -z "$GIT_RELEASE" ]; then
+            GIT_LATEST_RELEASE=$GIT_PREVIOUS_RELEASE
+          fi
+
+          echo "version_number=$GIT_LATEST_RELEASE" >> $GITHUB_OUTPUT
+        id: set_COLLECTOR_VERSION
+
+      - name: Print the latest collector version from GIT
+        run: |
+          echo Version tag: ${{ steps.set_COLLECTOR_VERSION.outputs.version_number }}
+
+      - name: Update env variables
+        run: |
+          echo "COLLECTOR_VERSION=${{ steps.set_COLLECTOR_VERSION.outputs.version_number }}" >> $GITHUB_ENV
+
+      - name: Ensure $COLLECTOR_VERSION and $COLLECTOR_IMAGE_TAG are set
+        run: '[[ -n "$COLLECTOR_VERSION" ]] && [[ -n "$COLLECTOR_IMAGE_TAG" ]]'
+
+      - name: Check whether the version tag exists on remote
+        run: git ls-remote --exit-code $COLLECTOR_SRC_URL refs/tags/$COLLECTOR_VERSION
+
+      - name: (if tag is missing) Display debug message
+        if: ${{ failure() }}
+        run: echo "Tag '$COLLECTOR_VERSION' does not exist on remote $COLLECTOR_SRC_URL"
+
+      - name: Checkout the version tag
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.COLLECTOR_VERSION }}
+
+      # Build Collector image with latest and version tags
+      - name: Build the `collector` image
+        run: |
+          make build-image-collector-by-version
+        env:
+          COLLECTOR_VERSION: ${{ env.COLLECTOR_VERSION }}
+
+      # Push the new TNF image to Quay.io.
+      - name: Authenticate against Quay.io
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          # Use a Robot Account to authenticate against Quay.io
+          # https://docs.quay.io/glossary/robot-accounts.html
+          username: ${{ secrets.QUAY_ROBOT_USERNAME_K8S }}
+          password: ${{ secrets.QUAY_ROBOT_TOKEN_K8S }}
+
+      - name: Push the newly built image to Quay.io
+        run: docker push --all-tags ${REGISTRY}/${COLLECTOR_IMAGE_NAME}
+
+      - uses: webfactory/ssh-agent@v0.9.0
+        name: Add SSH key to agent
+        with:
+          ssh-private-key: ${{ secrets.COLLECTOR_KEYPAIR }}
+
+      # run ansible deployment to deploy the new image to the cluster
+      - name: Deploy the newly built image to the cluster
+        run: |
+          ANSIBLE_HOST_KEY_CHECKING=false \
+          COLLECTOR_VERSION=${{ env.COLLECTOR_VERSION }} \
+          ansible-playbook -i playbooks/inventory.ini playbooks/start-collector.yaml
+
+  test-and-push-collector-image-legacy:
     name: 'Test and push the collector image'
     runs-on: ubuntu-22.04
     env:
@@ -91,7 +173,7 @@ jobs:
           password: ${{ secrets.QUAY_ROBOT_TOKEN }}
 
       - name: Push the newly built image to Quay.io
-        run: docker push --all-tags ${REGISTRY}/${COLLECTOR_IMAGE_NAME}
+        run: docker push --all-tags ${REGISTRY}/${COLLECTOR_IMAGE_NAME_LEGACY}
 
       - uses: webfactory/ssh-agent@v0.9.0
         name: Add SSH key to agent
diff --git a/.github/workflows/pre-main.yaml b/.github/workflows/pre-main.yaml
@@ -10,8 +10,9 @@ name: Test Incoming Changes
 env:
   COLLECTOR_CONTAINER_NAME: tnf-collector
   REGISTRY: quay.io
-  COLLECTOR_IMAGE_NAME: testnetworkfunction/collector
+  COLLECTOR_IMAGE_NAME: redhat-best-practices-for-k8s/collector
   COLLECTOR_IMAGE_TAG: unstable
+  COLLECTOR_IMAGE_NAME_LEGACY: testnetworkfunction/collector
 jobs:
   lint:
     name: Run Linter and Vet
@@ -109,10 +110,43 @@ jobs:
         env:
           COLLECTOR_IMAGE_TAG: ${{ env.COLLECTOR_IMAGE_TAG }}
 
+      # Push the new unstable TNF image to Quay.io.
+      - name: (if on main and upstream) Authenticate against Quay.io
+        if: ${{ github.ref == 'refs/heads/main' && github.repository_owner == 'redhat-best-practices-for-k8s' }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          # Use a Robot Account to authenticate against Quay.io
+          # https://docs.quay.io/glossary/robot-accounts.html
+          username: ${{ secrets.QUAY_ROBOT_USERNAME_K8S }}
+          password: ${{ secrets.QUAY_ROBOT_TOKEN_K8S }}
+
+      - name: (if on main and upstream) Push the newly built image to Quay.io
+        if: ${{ github.ref == 'refs/heads/main' && github.repository_owner == 'redhat-best-practices-for-k8s' }}
+        run: docker push --all-tags ${REGISTRY}/${COLLECTOR_IMAGE_NAME}
+
+      - uses: webfactory/ssh-agent@v0.9.0
+        name: (if on main and upstream) Add SSH key to agent
+        if: ${{ github.ref == 'refs/heads/main' && github.repository_owner == 'redhat-best-practices-for-k8s' }}
+        with:
+          ssh-private-key: ${{ secrets.COLLECTOR_KEYPAIR }}
+
+  build-and-push-image-legacy:
+    name: "Build and Push Image (Legacy)"
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Check out the code
+        uses: actions/checkout@v4
+
+      # Build Collector image with unstable tag
+      - name: Build the image
+        run: make build-image-collector
+        env:
+          COLLECTOR_IMAGE_TAG: ${{ env.COLLECTOR_IMAGE_TAG }}
 
       # Push the new unstable TNF image to Quay.io.
       - name: (if on main and upstream) Authenticate against Quay.io
-        if: ${{ github.ref == 'refs/heads/main' && github.repository_owner == 'test-network-function' }}
+        if: ${{ github.ref == 'refs/heads/main' && github.repository_owner == 'redhat-best-practices-for-k8s' }}
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
@@ -122,11 +156,11 @@ jobs:
           password: ${{ secrets.QUAY_ROBOT_TOKEN }}
 
       - name: (if on main and upstream) Push the newly built image to Quay.io
-        if: ${{ github.ref == 'refs/heads/main' && github.repository_owner == 'test-network-function' }}
-        run: docker push --all-tags ${REGISTRY}/${COLLECTOR_IMAGE_NAME}
+        if: ${{ github.ref == 'refs/heads/main' && github.repository_owner == 'redhat-best-practices-for-k8s' }}
+        run: docker push --all-tags ${REGISTRY}/${COLLECTOR_IMAGE_NAME_LEGACY}
 
       - uses: webfactory/ssh-agent@v0.9.0
         name: (if on main and upstream) Add SSH key to agent
-        if: ${{ github.ref == 'refs/heads/main' && github.repository_owner == 'test-network-function' }}
+        if: ${{ github.ref == 'refs/heads/main' && github.repository_owner == 'redhat-best-practices-for-k8s' }}
         with:
           ssh-private-key: ${{ secrets.COLLECTOR_KEYPAIR }}
diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ else
 endif
 
 MYSQL_CONTAINER_NAME?=mysql-container
-COLLECTOR_IMAGE_NAME?=testnetworkfunction/collector
+COLLECTOR_IMAGE_NAME?=redhat-best-practices-for-k8s/collector
 COLLECTOR_IMAGE_TAG?=latest
 COLLECTOR_CONTAINER_NAME?=cnf-collector
 COLLECTOR_NS?=cnf-collector
@@ -26,9 +26,9 @@ GIT_RELEASE=$(shell scripts/get-git-release.sh)
 GIT_PREVIOUS_RELEASE=$(shell scripts/get-git-previous-release.sh)
 BASH_SCRIPTS=$(shell find . -name "*.sh" -not -path "./.git/*")
 GOLANGCI_VERSION=v1.59.1
-LINKER_TNF_RELEASE_FLAGS=-X github.com/test-network-function/cnf-certification-test/cnf-certification-test.GitCommit=${GIT_COMMIT}
-LINKER_TNF_RELEASE_FLAGS+= -X github.com/test-network-function/cnf-certification-test/cnf-certification-test.GitRelease=${GIT_RELEASE}
-LINKER_TNF_RELEASE_FLAGS+= -X github.com/test-network-function/cnf-certification-test/cnf-certification-test.GitPreviousRelease=${GIT_PREVIOUS_RELEASE}
+LINKER_TNF_RELEASE_FLAGS=-X github.com/redhat-best-practices-for-k8s/certsuite/certsuite.GitCommit=${GIT_COMMIT}
+LINKER_TNF_RELEASE_FLAGS+= -X github.com/redhat-best-practices-for-k8s/certsuite/certsuite.GitRelease=${GIT_RELEASE}
+LINKER_TNF_RELEASE_FLAGS+= -X github.com/redhat-best-practices-for-k8s/certsuite/certsuite.GitPreviousRelease=${GIT_PREVIOUS_RELEASE}
 MYSQL_DEPLOYMENT_PATH = ./k8s/deployment/database.yaml
 COLLECTOR_DEPLOYMENT_PATH = ./k8s/deployment/app.yml
 DB_URL = database-collectordb-1hykanj2mxdh.cn9luyhgvfkp.us-east-1.rds.amazonaws.com
@@ -212,4 +212,4 @@ run-grafana: clone-tnf-secrets stop-running-grafana-container
 # Clones tnf-secret private repo if does not exist
 clone-tnf-secrets:
 	rm -rf tnf-secrets
-	git clone git@github.com:test-network-function/tnf-secrets.git 
+	git clone git@github.com:redhat-best-practices-for-k8s/tnf-secrets.git 
diff --git a/README.md b/README.md
@@ -1,13 +1,13 @@
 # Cnf Certification's Collector
 
-[![release)](https://img.shields.io/github/v/release/test-network-function/collector?color=blue&label=%20&logo=semver&logoColor=white&style=flat)](https://github.com/test-network-function/collector/releases)
+[![release)](https://img.shields.io/github/v/release/redhat-best-practices-for-k8s/collector?color=blue&label=%20&logo=semver&logoColor=white&style=flat)](https://github.com/redhat-best-practices-for-k8s/collector/releases)
 [![red hat](https://img.shields.io/badge/red%20hat---?color=gray&logo=redhat&logoColor=red&style=flat)](https://www.redhat.com)
 [![openshift](https://img.shields.io/badge/openshift---?color=gray&logo=redhatopenshift&logoColor=red&style=flat)](https://www.redhat.com/en/technologies/cloud-computing/openshift)
 
 ## Description
 
 A Go-based endpoint for collecting
-[Cnf Certification Suites](https://github.com/test-network-function/cnf-certification-test)
+[Cnf Certification Suites](https://github.com/redhat-best-practices-for-k8s/certsuite)
 results.
 
 The CNF Certification Suites provide a set of test cases for the
@@ -40,7 +40,7 @@ and has to be enabled manually by the user running the CNF Certification Suites.
     ```
 
 2. Adjust CNF Certification configuration file:\
-    (see [CNF Certification configuration description](https://test-network-function.github.io/cnf-certification-test/configuration/))
+    (see [CNF Certification configuration description](https://redhat-best-practices-for-k8s.github.io/certsuite/configuration/))
 
     1. Specify who executed the suites:\
     Under the `executedBy` entry in the `tnf_config.yml` file,
@@ -77,14 +77,14 @@ and has to be enabled manually by the user running the CNF Certification Suites.
     ```
 
 3. Run CNF Certification suites with the adjusted configuration file.\
- (see [CNF Certification Test description](https://test-network-function.github.io/cnf-certification-test/test-container/))
+ (see [CNF Certification Test description](https://redhat-best-practices-for-k8s.github.io/certsuite/test-container/))
 
 #### Option 2 - send a claim.json file directly to Collector
 
 If you haven't already, clone Collector's repository:
 
 ```sh
-git pull https://github.com/test-network-function/collector.git
+git pull https://github.com/redhat-best-practices-for-k8s/collector.git
 ```
 
 From collector's repo root directory, use the following command:
@@ -109,7 +109,7 @@ can have access to their saved data.\
 If you haven't already, clone Collector's repository:
 
 ```sh
-git pull https://github.com/test-network-function/collector.git
+git pull https://github.com/redhat-best-practices-for-k8s/collector.git
 ```
 
 From collector's repo root directory, use the following command:
@@ -176,7 +176,7 @@ Use the following commands to build and run Collector's container and database l
 * **Clone Collector's repository:**
 
     ```sh
-    git pull https://github.com/test-network-function/collector.git
+    git pull https://github.com/redhat-best-practices-for-k8s/collector.git
     ```
 
 * **(Optional) Build and Push your Collector image:**
@@ -192,7 +192,7 @@ Use the following commands to build and run Collector's container and database l
     ```
 
     **Note:** If skipping this step, the colletor container will use
-    `quay.io/testnetworkfunction/collector:latest` image by default.
+    `quay.io/redhat-best-practices-for-k8s/collector:latest` image by default.
 
 * **Initialize local Collector DB:**
 
@@ -209,11 +209,11 @@ Use the following commands to build and run Collector's container and database l
 
 * **Test it out:**
 
-    1. Send data to your collector in one of the ways mentioned [above](https://github.com/test-network-function/collector?tab=readme-ov-file#send-data-to-collector),
+    1. Send data to your collector in one of the ways mentioned [above](https://github.com/redhat-best-practices-for-k8s/collector?tab=readme-ov-file#send-data-to-collector),
     setting the endpoint of your local collector app endpoint.
 
     2. Get the data from your collector using the
-    [above instructions](https://github.com/test-network-function/collector?tab=readme-ov-file#option-1---for-both-admin-and-partners)
+    [above instructions](https://github.com/redhat-best-practices-for-k8s/collector?tab=readme-ov-file#option-1---for-both-admin-and-partners)
     , setting the endpoint of your local collector app endpoint and
     credentials of the sent data.
 
diff --git a/api/auth.go b/api/auth.go
@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"fmt"
 
-	"github.com/test-network-function/collector/util"
+	"github.com/redhat-best-practices-for-k8s/collector/util"
 	"golang.org/x/crypto/bcrypt"
 )
 
diff --git a/api/parser.go b/api/parser.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/test-network-function/collector/util"
+	"github.com/redhat-best-practices-for-k8s/collector/util"
 )
 
 func parseClaimFile(w http.ResponseWriter, r *http.Request) (map[string]interface{}, error) {
diff --git a/api/parser_handler.go b/api/parser_handler.go
@@ -4,9 +4,9 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/redhat-best-practices-for-k8s/collector/storage"
+	"github.com/redhat-best-practices-for-k8s/collector/util"
 	"github.com/sirupsen/logrus"
-	"github.com/test-network-function/collector/storage"
-	"github.com/test-network-function/collector/util"
 )
 
 //nolint:funlen
diff --git a/api/result_handler.go b/api/result_handler.go
@@ -5,10 +5,10 @@ import (
 	"encoding/json"
 	"net/http"
 
+	"github.com/redhat-best-practices-for-k8s/collector/storage"
+	"github.com/redhat-best-practices-for-k8s/collector/types"
+	"github.com/redhat-best-practices-for-k8s/collector/util"
 	"github.com/sirupsen/logrus"
-	"github.com/test-network-function/collector/storage"
-	"github.com/test-network-function/collector/types"
-	"github.com/test-network-function/collector/util"
 )
 
 func ResultsHandler(w http.ResponseWriter, r *http.Request, mysqlStorage *storage.MySQLStorage) {
diff --git a/api/server.go b/api/server.go
@@ -4,9 +4,9 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/redhat-best-practices-for-k8s/collector/storage"
+	"github.com/redhat-best-practices-for-k8s/collector/util"
 	"github.com/sirupsen/logrus"
-	"github.com/test-network-function/collector/storage"
-	"github.com/test-network-function/collector/util"
 )
 
 type Server struct {
diff --git a/api/upload_handler.go b/api/upload_handler.go
@@ -10,8 +10,8 @@ import (
 	"github.com/aws/aws-sdk-go-v2/credentials"
 	"github.com/aws/aws-sdk-go-v2/feature/s3/manager"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
+	"github.com/redhat-best-practices-for-k8s/collector/util"
 	"github.com/sirupsen/logrus"
-	"github.com/test-network-function/collector/util"
 )
 
 func configS3(region, accessKey, secretAccessKey string) *s3.Client {
diff --git a/api/validator.go b/api/validator.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/test-network-function/collector/types"
-	"github.com/test-network-function/collector/util"
+	"github.com/redhat-best-practices-for-k8s/collector/types"
+	"github.com/redhat-best-practices-for-k8s/collector/util"
 )
 
 func validatePostRequest(w http.ResponseWriter, r *http.Request) ([]types.ClaimResult, []string, error) {
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/test-network-function/collector
+module github.com/redhat-best-practices-for-k8s/collector
 
 go 1.22.5
 
diff --git a/k8s/deployment/app.yml b/k8s/deployment/app.yml
@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
         - name: collector-container
-          image: quay.io/testnetworkfunction/collector:latest
+          image: quay.io/redhat-best-practices-for-k8s/collector:latest
           env:
             - name: DB_URL
               value: "mysql.cnf-collector.svc.cluster.local"
diff --git a/main.go b/main.go
@@ -4,10 +4,10 @@ import (
 	"time"
 
 	_ "github.com/go-sql-driver/mysql"
+	"github.com/redhat-best-practices-for-k8s/collector/api"
+	"github.com/redhat-best-practices-for-k8s/collector/storage"
+	"github.com/redhat-best-practices-for-k8s/collector/util"
 	"github.com/sirupsen/logrus"
-	"github.com/test-network-function/collector/api"
-	"github.com/test-network-function/collector/storage"
-	"github.com/test-network-function/collector/util"
 )
 
 func main() {
diff --git a/playbooks/start-collector.yaml b/playbooks/start-collector.yaml
diff --git a/scripts/create-version-files.sh b/scripts/create-version-files.sh
diff --git a/storage/mysql.go b/storage/mysql.go
diff --git a/util/db_utils.go b/util/db_utils.go

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"database/sql"`
`5`	`5`	`"fmt"`
`6`	`6`
`7`		`- "github.com/test-network-function/collector/util"`
	`7`	`+ "github.com/redhat-best-practices-for-k8s/collector/util"`
`8`	`8`	`"golang.org/x/crypto/bcrypt"`
`9`	`9`	`)`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"fmt"`
`6`	`6`	`"net/http"`
`7`	`7`
`8`		`- "github.com/test-network-function/collector/util"`
	`8`	`+ "github.com/redhat-best-practices-for-k8s/collector/util"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`func parseClaimFile(w http.ResponseWriter, r *http.Request) (map[string]interface{}, error) {`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ import (`
`10`	`10`	`"github.com/aws/aws-sdk-go-v2/credentials"`
`11`	`11`	`"github.com/aws/aws-sdk-go-v2/feature/s3/manager"`
`12`	`12`	`"github.com/aws/aws-sdk-go-v2/service/s3"`
	`13`	`+ "github.com/redhat-best-practices-for-k8s/collector/util"`
`13`	`14`	`"github.com/sirupsen/logrus"`
`14`		`- "github.com/test-network-function/collector/util"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`func configS3(region, accessKey, secretAccessKey string) *s3.Client {`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ import (`
`5`	`5`	`"fmt"`
`6`	`6`	`"net/http"`
`7`	`7`
`8`		`- "github.com/test-network-function/collector/types"`
`9`		`- "github.com/test-network-function/collector/util"`
	`8`	`+ "github.com/redhat-best-practices-for-k8s/collector/types"`
	`9`	`+ "github.com/redhat-best-practices-for-k8s/collector/util"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func validatePostRequest(w http.ResponseWriter, r *http.Request) ([]types.ClaimResult, []string, error) {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module github.com/test-network-function/collector`
	`1`	`+module github.com/redhat-best-practices-for-k8s/collector`
`2`	`2`
`3`	`3`	`go 1.22.5`
`4`	`4`