Integrating with ArgoCD for GItOps, Tekton Triggers and some README changes

tekton/os/cp4i/13-component-test-in-cp4i-task.yaml

@@ -67,7 +67,8 @@ spec:
         - mountPath: /work
           name: work
     - name: clean-up-if-needed
-      image: lachlanevenson/k8s-kubectl
+      # image: lachlanevenson/k8s-kubectl
+      image: gcr.io/cloud-builders/kubectl
       #
       # Ensure we start with a clean environment by deleting any existing CR.
       # 
@@ -103,7 +104,8 @@ spec:
         - mountPath: /work
           name: work
     - name: create-ace-cr
-      image: lachlanevenson/k8s-kubectl
+      # image: lachlanevenson/k8s-kubectl
+      image: gcr.io/cloud-builders/kubectl
       #
       # Create the CR to make the operator create a new container and set it up.
       #
@@ -153,7 +155,8 @@ spec:
         - mountPath: /work
           name: work
     - name: stop-server-process
-      image: lachlanevenson/k8s-kubectl
+      # image: lachlanevenson/k8s-kubectl
+      image: gcr.io/cloud-builders/kubectl
       #
       # Stops the IntegrationServer process started by runaceserver in the container.
       # 
@@ -200,7 +203,8 @@ spec:
         - mountPath: /work
           name: work
     - name: run-component-tests
-      image: lachlanevenson/k8s-kubectl
+      # image: lachlanevenson/k8s-kubectl
+      image: gcr.io/cloud-builders/kubectl
       #
       # Run the component tests and validate the output.
       # 

tekton/os/cp4i/22-deploy-to-cp4i-task.yaml

@@ -50,7 +50,8 @@ spec:
         - mountPath: /work
           name: work
     - name: deploy-app
-      image: lachlanevenson/k8s-kubectl
+      # image: lachlanevenson/k8s-kubectl
+      image: gcr.io/cloud-builders/kubectl
       script: |
         #!/bin/sh
         #set -x
@@ -60,38 +61,38 @@ spec:
         echo "CR YAML for application:"
         cat /work/ace-demo-pipeline/tekton/os/cp4i/create-integrationruntime.yaml
         echo
-        echo "Creating CR for application at " `date`
+        echo "Creating CR for application at " $(date)
         kubectl apply -f /work/ace-demo-pipeline/tekton/os/cp4i/create-integrationruntime.yaml
         rc=1
-        echo "Starting polling for operator IR at " `date`
-        for i in `seq 1 48`
+        echo "Starting polling for operator IR at " $(date)
+        for i in $(seq 1 48)
         do
           #echo $i
           #kubectl get -n cp4i IntegrationRuntime/tea-tekton-cp4i
           lastError=`kubectl get -n cp4i IntegrationRuntime/tea-tekton-cp4i --template={{.status.phase}} 2>&1`
-          if [ "$lastError" == "Ready" ]; then
-            echo "Container is ready at " `date`
+          if [ "$lastError" = "Ready" ]; then
+            echo "Container is ready at " $(date)
             rc=0
             break
           fi
           # Minikube doesn't have routes so the CR stays at phase Warning.
-          if [ "$lastError" == "Warning" ]; then
+          if [ "$lastError" = "Warning" ]; then
           lastStatus=`kubectl get -n cp4i IntegrationRuntime/tea-tekton-cp4i '--template={{(index .status.conditions 0).status}} {{(index .status.conditions 0).type}} {{(index .status.conditions 0).message}}' 2>&1`
             if [ "$lastStatus" == "True Ready IntegrationRuntime is ready." ]; then
-              echo "Container is ready (Warning) at " `date`
+              echo "Container is ready (Warning) at " $(date)
               rc=0
               break
             fi
           fi
           sleep 5
         done
-        if [ "$rc" == "1" ]; then
-            echo "Container start failed; giving up at " `date`
+        if [ "$rc" = "1" ]; then
+            echo "Container start failed; giving up at " $(date)
             echo "Current state of the CR:"
             echo "----------------------------------------"
             kubectl get -n cp4i IntegrationRuntime/tea-tekton-cp4i
             echo "----------------------------------------"
-            return 1
+            exit 1
         fi
       volumeMounts:
         - mountPath: /work

tekton/os/cp4i/23-update-gitops-repo.yaml

@@ -0,0 +1,209 @@
+apiVersion: tekton.dev/v1beta1
+kind: Task
+metadata:
+  name: update-gitops-repo
+  namespace: cp4i
+spec:
+  stepTemplate:
+    securityContext:
+      runAsUser: 0
+    env:
+      - name: DOCKER_REGISTRY
+        value: $(params.dockerRegistry)
+      - name: APP_NAME
+        value: $(params.appName)
+      - name: APP_NAMESPACE
+        value: $(params.appNamespace)
+      - name: TAG
+        value: $(params.tag)
+      - name: GITHUB_TOKEN
+        valueFrom:
+          secretKeyRef:
+            name: github-token
+            key: GITHUB_TOKEN
+  params:
+    - name: dockerRegistry
+      type: string
+    - name: appName
+      type: string
+    - name: appNamespace
+      type: string
+    - name: url
+      type: string
+    - name: revision
+      type: string
+    - name: tag
+      type: string
+    - name: sha
+      type: string
+    - name: tools-image
+      type: string
+  steps:
+    - name: clone
+      image: $(params.tools-image) # Use the tools image for consistency
+      # If you want to use a specific image for git operations, uncomment the line below
+      # image: alpine/git:v2.49.1
+      script: |
+        #!/bin/sh
+        set -x
+        cd /work
+
+        # Extract owner/repo from URL
+        REPO_PATH=$(echo $(params.url) | sed -E 's#https://github.com/##; s#\.git$##')
+
+        # Clone using token authentication
+        git clone -b $(params.revision) https://[email protected]/$REPO_PATH.git ace-demo-gitops
+
+      volumeMounts:
+        - mountPath: /work
+          name: work
+    - name: update-dev
+      image: $(params.tools-image) # Use the tools image for consistency
+      # If you want to use a specific image for git operations, uncomment the line below
+      # image: alpine/git:v2.49.1
+      script: |
+        #!/bin/sh
+        set -x
+
+        cd /work/ace-demo-gitops
+
+        # Define the path to the config 
+        CONFIG_PATH="envs/dev/tea-argo-cp4i"
+
+        # Fail if kustomization.yaml doesn't exist
+        if [ ! -f "$CONFIG_PATH/kustomization.yaml" ]; then
+          echo "ERROR: kustomization.yaml not found at $CONFIG_PATH"
+          exit 1
+        fi
+
+        # Update the image tag in kustomization.yaml using yq
+        yq e '.images[].newTag = strenv(TAG)' -i "$CONFIG_PATH/kustomization.yaml"
+
+        # Alternatively, if yq is not available, you can use sed to update the tag
+        # sed -i "s|^\(\s*newTag:\s*\).*|\1$(params.tag)|" $CONFIG_PATH/kustomization.yaml
+
+        set +x
+        echo ========================================================================
+        echo "Updated kustomization.yaml for DEV"
+        echo ========================================================================
+        yq e . "$CONFIG_PATH/kustomization.yaml"
+        set -x
+
+        # Optional: show the diff
+        git diff
+
+        # Git config (you can also set this globally on the image if needed)
+        git config user.email "tekton@pipeline"
+        git config user.name "Tekton Bot"
+
+        # Stage, commit and push
+        git add $CONFIG_PATH/kustomization.yaml
+        git commit -m "Update tag to $(params.tag) for $(params.appName)"
+        git push origin $(params.revision)
+
+      volumeMounts:
+        - mountPath: /work
+          name: work
+    - name: update-uat
+      image: $(params.tools-image) # Use the tools image for consistency
+      # If you want to use a specific image for git operations, uncomment the line below
+      # image: alpine/git:v2.49.1
+      # TODO: Create a separate sh file to call from steps instead of inline script with slight changes
+      script: |
+        #!/bin/sh
+        set -ex
+        cd /work/ace-demo-gitops
+
+        BRANCH="autoPr/$(params.appName)"
+
+        # Ensure we are on the correct branch (create if needed)
+        if ! git switch "$BRANCH" 2>/dev/null; then
+          echo "Branch $BRANCH does not exist locally. Attempting to fetch or create it..."
+          git fetch origin "$BRANCH:$BRANCH" 2>/dev/null || git switch -c "$BRANCH"
+          git switch "$BRANCH"
+        fi
+
+        # Define the path to the config 
+        CONFIG_PATH="envs/uat/tea-argo-cp4i"
+
+        # Fail if kustomization.yaml doesn't exist
+        if [ ! -f "$CONFIG_PATH/kustomization.yaml" ]; then
+          echo "ERROR: kustomization.yaml not found at $CONFIG_PATH"
+          exit 1
+        fi
+
+        # Update the image tag in kustomization.yaml using yq
+        yq e '.images[].newTag = strenv(TAG)' -i "$CONFIG_PATH/kustomization.yaml"
+
+        # Alternatively, if yq is not available, you can use sed to update the tag
+        # sed -i "s|^\(\s*newTag:\s*\).*|\1$(params.tag)|" $CONFIG_PATH/kustomization.yaml
+
+        set +x
+        echo ========================================================================
+        echo "Updated kustomization.yaml for UAT"
+        echo ========================================================================
+        yq e . "$CONFIG_PATH/kustomization.yaml"
+        set -x
+
+        # Optional: show the diff
+        git diff
+
+        # Git config (you can also set this globally on the image if needed)
+        git config user.email "tekton@pipeline"
+        git config user.name "Tekton Bot"
+
+        # Stage, commit and push
+        git add envs/uat/tea-argo-cp4i/kustomization.yaml
+        git commit -m "Update tag to $(params.tag) for $(params.appName)"       
+        git push origin $BRANCH
+
+      volumeMounts:
+        - mountPath: /work
+          name: work
+    - name: create-pr-uat
+      image: $(params.tools-image) # Use the tools image for consistency
+      # If you want to use a specific image for git operations, uncomment the line below
+      # image: curlimages/curl:8.6.0 # Might hit docker toomanyrequests: You have reached your unauthenticated pull rate limit.
+      # image: cp.icr.io/cp/appc/ace:13.0.4.0-r1
+      script: |
+        #!/bin/sh
+        set -ex
+        cd /work/ace-demo-gitops
+
+        # Extract repo from URL
+        REPO="mrislam11378/ace-demo-gitops"
+        # Branch name (must match what was pushed earlier)
+        BRANCH="autoPr/$(params.appName)"
+
+        # Prepare PR data
+        PR_TITLE="Update tag for $(params.appName) to $(params.tag)"
+        PR_BODY="Automated tag update via Tekton."
+        BASE_BRANCH=$(params.revision)
+
+        # Check if the PR already exists
+        OWNER=$(echo $REPO | cut -d/ -f1)
+
+        EXISTING_PR=$(curl -s -H "Authorization: token $GITHUB_TOKEN" \
+          "https://api.github.com/repos/$REPO/pulls?head=$OWNER:$BRANCH&base=$BASE_BRANCH" \
+          | jq '. | length')
+
+        if [ "$EXISTING_PR" -gt 0 ]; then
+          echo "Pull request already exists for branch $BRANCH. Skipping PR creation."
+        else
+          # Create PR via GitHub API
+          curl -X POST "https://api.github.com/repos/$REPO/pulls" \
+            -H "Authorization: token $GITHUB_TOKEN" \
+            -H "Accept: application/vnd.github.v3+json" \
+            -d "{
+              \"title\": \"$PR_TITLE\",
+              \"head\": \"$BRANCH\",
+              \"base\": \"$BASE_BRANCH\",
+              \"body\": \"$PR_BODY\"
+            }"
+        fi
+      volumeMounts:
+        - mountPath: /work
+          name: work
+  volumes:
+    - name: work
+      emptyDir: {}