Merge pull request #1344 from simonbaird/konflux-rename

Rename RHTAP to Konflux

Author: simonbaird

Dockerfile.dist

@@ -24,7 +24,7 @@
 
 # This image has go version 1.21 but requires an extra pull secret to access
 # See https://source.redhat.com/groups/public/teamnado/wiki/brew_registry for how to get your own pull secret
-# See our RHTAP pull secret at https://console.redhat.com/preview/application-pipeline/secrets
+# See our Konflux pull secret at https://console.redhat.com/preview/application-pipeline/secrets
 FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.21@sha256:4fe910174caaaae09ff75b6f1b1c2f4460fd9acfe38ec778a818a54de7f31afc AS build
 
 ARG TARGETOS

Makefile

@@ -49,10 +49,10 @@ $(ALL_SUPPORTED_OS_ARCH): ## Build binaries for specific platform/architecture,
 .PHONY: dist
 dist: $(ALL_SUPPORTED_OS_ARCH) ## Build binaries for all supported operating systems and architectures
 
-# Dockerfile.dist is used by the RHTAP build pipeline where it's built using
+# Dockerfile.dist is used by the Konflux build pipeline where it's built using
 # buildah not podman. This is for testing that build locally.
 # Todo: Don't hard code the platform here. Should probably do multi-arch builds similar
-# to dist-image. Also why not use buildah here for consistency with the RHTAP build.
+# to dist-image. Also, why not use buildah here for consistency with the Konflux build?
 .PHONY: dist-container
 dist-container: clean
 	podman build . --file Dockerfile.dist --tag dist-container --platform linux/amd64 # --no-cache

hack/cut-release.sh

@@ -34,20 +34,20 @@ fi
 # Use release name as-is for the branch name
 BRANCH_NAME="release-${RELEASE_NAME}"
 
-# RHTAP disallows . chars in names so remove those
-RHTAP_APPLICATION_SUFFIX="${RELEASE_NAME/./}"
+# Konflux disallows . chars in names so remove those
+KONFLUX_APPLICATION_SUFFIX="${RELEASE_NAME/./}"
 
 # Could be whatever, but let's adopt a consistent convention
-RHTAP_APPLICATION_NAME=ec-${RHTAP_APPLICATION_SUFFIX}
-RHTAP_CLI_COMPONENT_NAME=cli-${RHTAP_APPLICATION_SUFFIX}
+KONFLUX_APPLICATION_NAME=ec-${KONFLUX_APPLICATION_SUFFIX}
+KONFLUX_CLI_COMPONENT_NAME=cli-${KONFLUX_APPLICATION_SUFFIX}
 
 # Show some useful values
 echo Release name: $RELEASE_NAME
 echo Release branch name: $BRANCH_NAME
-echo RHTAP application name: $RHTAP_APPLICATION_NAME
-echo RHTAP cli component name: $RHTAP_CLI_COMPONENT_NAME
+echo Konflux application name: $KONFLUX_APPLICATION_NAME
+echo Konflux cli component name: $KONFLUX_CLI_COMPONENT_NAME
 
-RHTAP_APPS_URL=https://console.redhat.com/preview/application-pipeline/workspaces/rhtap-contract/applications
+KONFLUX_APPS_URL=https://console.redhat.com/preview/application-pipeline/workspaces/rhtap-contract/applications
 
 # Explain what needs to be done next
 # (We could make this more automated in future.)
@@ -62,26 +62,26 @@ git push upstream refs/remotes/upstream/main:refs/heads/${BRANCH_NAME}
 # Make your local version of the release branch
 git checkout -b ${BRANCH_NAME} upstream/${BRANCH_NAME}
 
-# Create the new application in RHTAP
-Login at ${RHTAP_APPS_URL}
+# Create the new application in Konflux
+Login at ${KONFLUX_APPS_URL}
 Create a new application by importing code from https://github.com/enterprise-contract/ec-cli
 Set Git reference to ${BRANCH_NAME} and click "Import code"
-Set the application name to ${RHTAP_APPLICATION_NAME}
-Set the component name to ${RHTAP_CLI_COMPONENT_NAME}
+Set the application name to ${KONFLUX_APPLICATION_NAME}
+Set the component name to ${KONFLUX_CLI_COMPONENT_NAME}
 Set Dockerfile to Dockerfile.dist
 Unset the "Default build pipeline" toggle
 Click "Create application"
 
 # Wait for PR
 Wait for the PR to be created
 Go look at the PR in GitHub
-Wait for the PR to pass the ${RHTAP_CLI_COMPONENT_NAME}-on-pull-request check
-You can also watch the activity at ${RHTAP_APPS_URL}/${RHTAP_APPLICATION_NAME}/activity/pipelineruns
+Wait for the PR to pass the ${KONFLUX_CLI_COMPONENT_NAME}-on-pull-request check
+You can also watch the activity at ${KONFLUX_APPS_URL}/${KONFLUX_APPLICATION_NAME}/activity/pipelineruns
 When it's done you can merge. (Continue to next section while you're waiting...)
 
 # Modify EC policy config
-Go to the integration tests at ${RHTAP_APPS_URL}/${RHTAP_APPLICATION_NAME}/integrationtests
-Edit ${RHTAP_APPLICATION_NAME}-enterprise-contract and add a parameter as follows:
+Go to the integration tests at ${KONFLUX_APPS_URL}/${KONFLUX_APPLICATION_NAME}/integrationtests
+Edit ${KONFLUX_APPLICATION_NAME}-enterprise-contract and add a parameter as follows:
   Name: POLICY_CONFIGURATION
   Value: github.com/enterprise-contract/config//redhat-no-hermetic
 Save changes
@@ -90,9 +90,9 @@ Save changes
 git checkout ${BRANCH_NAME}
 hack/patch-release-pipelines.sh
 hack/patch-release-pipelines.sh digest_bumps # maybe
-Review the diff between the ${RHTAP_CLI_COMPONENT_NAME}- and cli-main-ci- pipelines
+Review the diff between the ${KONFLUX_CLI_COMPONENT_NAME}- and cli-main-ci- pipelines
 Review the generated commit and then create a PR for the ${BRANCH_NAME} branch with that commit
-(Todo maybe: If you want, try adding this commit to the PR created by RHTAP before merging that PR.)
+(Todo maybe: If you want, try adding this commit to the PR created by Konflux before merging that PR.)
 
 EOT
 

hack/patch-release-pipelines.sh

@@ -33,7 +33,7 @@ fi
 # The release name is the branch name with release- trimmed off the front
 release_name=${current_branch#"release-"}
 
-# One each for the two pipelines created by RHTAP
+# One each for the two pipelines created by Konflux
 for p in pull-request push; do
   main_pipeline=".tekton/cli-main-ci-$p.yaml"
   release_pipeline=".tekton/cli-${release_name/./}-$p.yaml"
@@ -43,12 +43,16 @@ for p in pull-request push; do
     # Use grep to exclude digest bumps and initial creation.
     changes=$( git log main --reverse --pretty=%h --invert-grep --regexp-ignore-case \
       --grep="Update RHTAP references" \
+      --grep="Update Konflux references" \
+      --grep="Konflux CI update" \
+      --grep="Konflux update" \
       --grep="Red Hat Trusted App Pipeline update" \
       -- $main_pipeline )
   else
     # Find only the digest bumps
     changes=$( git log main --reverse --pretty=%h --regexp-ignore-case \
       --grep="Update RHTAP references" \
+      --grep="Update Konflux references" \
       -- $main_pipeline )
   fi
 
@@ -71,7 +75,7 @@ done
 
 # Make the commit
 git commit -m "chore: Modify default pipelines for $release_name" \
-  -m "Apply changes to the RHTAP generated default pipelines." \
+  -m "Apply changes to the Konflux generated default pipelines." \
   -m "(Commit created with hack/patch-release-pipelines.sh $digest_bumps)"
 
 # Invite the human to look at it

hack/rebuild.sh

@@ -17,15 +17,15 @@
 
 # Rebuilds the images, stores the image references in images.txt and updates the
 # cosign.pub. Requires a running Tekton and Tekton Chains and the usual
-# utilities: kubectl & openssl; and access to an operating RHTAP cluster.
+# utilities: kubectl & openssl; and access to an operating Konflux cluster.
 
 set -o errexit
 set -o pipefail
 set -o nounset
 
 HACK_DIR="$(dirname "${BASH_SOURCE[0]}")"
 
-# The default in RHTAP
+# The default in Konflux
 PIPELINE_SERVICE_ACCOUNT=pipeline
 
 # What pipeline bundle to use
@@ -34,7 +34,7 @@ PIPELINE_BUNDLE=quay.io/redhat-appstudio-tekton-catalog/pipeline-hacbs-docker-bu
 # Where to push the image(s)
 IMAGE_REPOSITORY=quay.io/hacbs-contract-demo
 
-# If RHTAP is not setup, there might not be a appstudio PVC, this creates if if
+# If Konflux is not setup, there might not be a appstudio PVC, this creates if if
 # it already doesn't exist
 kubectl get pvc appstudio -o name > /dev/null 2>&1 || kubectl create -o yaml --dry-run=client -f - << EOF | kubectl apply -f - >&2
 kind: PersistentVolumeClaim
@@ -52,7 +52,7 @@ EOF
 
 # Might require that the pull secret is set for the pipeline service account,
 # the secret named redhat-appstudio-registry-pull-secret is pre-created and
-# could be empty in RHTAP, so it needs to be recreated from the local Docker
+# could be empty in Konflux, so it needs to be recreated from the local Docker
 # configuration
 {
     kubectl get secret redhat-appstudio-registry-pull-secret -o name > /dev/null 2>&1 && [ -n "$(kubectl get secret redhat-appstudio-registry-pull-secret -o jsonpath='{.data}')" ]

hack/simple-demo.sh

@@ -15,7 +15,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-# This is an image regularly built in RHTAP for testing purposes.
+# This is an image regularly built in Konflux for testing purposes.
 # See https://github.com/enterprise-contract/golden-container
 IMAGE=${IMAGE:-"quay.io/redhat-appstudio/ec-golden-image:latest"}
 
@@ -29,18 +29,18 @@ APPLICATION_SNAPSHOT='{"components":[
 # - Visit https://oauth-openshift.apps.stone-prd-rh01.pg1f.p1.openshiftapps.com/oauth/token/request
 # - Authenticate and get a token, then use the oc login to authenticate
 # - kubectl get -n openshift-pipelines secret public-key -o json | jq -r '.data."cosign.pub" | @base64d'
-RHTAP_PROD_KEY="-----BEGIN PUBLIC KEY-----
+KONFLUX_PROD_KEY="-----BEGIN PUBLIC KEY-----
 MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEZP/0htjhVt2y0ohjgtIIgICOtQtA
 naYJRuLprwIv6FDhZ5yFjYUEtsmoNcW7rx2KM6FOXGsCX3BNc7qhHELT+g==
 -----END PUBLIC KEY-----"
 
-RHTAP_STAGE_KEY="-----BEGIN PUBLIC KEY-----
+KONFLUX_STAGE_KEY="-----BEGIN PUBLIC KEY-----
 MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAExIJfBe0aQb8jiQo1roYAi+YlAxr5
 thSeH7kghWZnAzFeZOUsqMy13LiLGuVRuLkbGNktaToBeT7DyXiC+aIntw==
 -----END PUBLIC KEY-----"
 
-PUBLIC_KEY=${PUBLIC_KEY:-$RHTAP_PROD_KEY}
-#PUBLIC_KEY=${PUBLIC_KEY:-$RHTAP_STAGE_KEY}
+PUBLIC_KEY=${PUBLIC_KEY:-$KONFLUX_PROD_KEY}
+#PUBLIC_KEY=${PUBLIC_KEY:-$KONFLUX_STAGE_KEY}
 
 # Adjust as required
 POLICY_YAML=${POLICY_YAML:-"github.com/enterprise-contract/config//default"}