feat: unhardcode the deployed trustify app name

Signed-off-by: Jim Crossley <[email protected]>

.github/actions/install-trustify/action.yml

@@ -14,6 +14,10 @@ inputs:
     description: "JSON encoded Trustify Custom Resource (CR) string"
     required: false
     default: ""
+  app-name:
+    description: "Name of the Trustify instance (should match CR metadata if passed)"
+    required: false
+    default: "myapp"
 runs:
   using: "composite"
   steps:
@@ -39,6 +43,7 @@ runs:
       env:
         OPERATOR_BUNDLE_IMAGE: ${{ inputs.operator-bundle-image }}
         NAMESPACE: ${{ inputs.namespace }}
+        APP_NAME: ${{ inputs.app-name }}
         TRUSTIFY_CR: ${{ inputs.trustify-cr }}
       run: |
         make install-trustify

hack/install-trustify.sh

@@ -5,6 +5,7 @@ set -x
 set -o pipefail
 
 NAMESPACE="${NAMESPACE:-trustify}"
+APP_NAME="${APP_NAME:-myapp}"
 OPERATOR_BUNDLE_IMAGE="${OPERATOR_BUNDLE_IMAGE:-ghcr.io/trustification/trustify-operator-bundle:latest}"
 TRUSTIFY_CR="${TRUSTIFY_CR:-}"
 TIMEOUT="${TIMEOUT:-15m}"
@@ -47,35 +48,35 @@ install_trustify() {
 kind: Trustify
 apiVersion: org.trustify/v1alpha1
 metadata:
-  name: myapp
+  name: ${APP_NAME}
 spec: {}
 EOF
     fi
 
   # Want to see in github logs what we just created
-  kubectl get --namespace "${NAMESPACE}" -o yaml trustifies.org.trustify/myapp
+  kubectl get --namespace "${NAMESPACE}" -o yaml trustifies.org.trustify/${APP_NAME}
 
   # Wait for reconcile to finish
     kubectl wait \
       --namespace ${NAMESPACE} \
       --for=condition=Successful \
       --timeout=600s \
-      trustifies.org.trustify/myapp \
+      trustifies.org.trustify/${APP_NAME} \
     || kubectl get \
       --namespace ${NAMESPACE} \
       -o yaml \
-      trustifies.org.trustify/myapp # Print trustify debug when timed out
+      trustifies.org.trustify/${APP_NAME} # Print trustify debug when timed out
 
   # Now wait for all the trustify deployments
   kubectl wait \
     --namespace ${NAMESPACE} \
-    --selector="app.kubernetes.io/part-of=myapp" \
+    --selector="app.kubernetes.io/part-of=${APP_NAME}" \
     --for=condition=Available \
     --timeout=600s \
     deployments.apps \
   || kubectl get \
     --namespace ${NAMESPACE} \
-    --selector="app.kubernetes.io/part-of=myapp" \
+    --selector="app.kubernetes.io/part-of=${APP_NAME}" \
     --field-selector=status.phase!=Running  \
     -o yaml \
     pods # Print not running trustify pods when timed out