Merge commit '5d8080c3becc' into release/v2.13-ent

Author: jianghang8421

.github/workflows/create-rancher-pr.yml

@@ -1,11 +1,11 @@
 name: Create Rancher PR
 
-# This workflow triggers on a push to the main branch. It updates the
+# This workflow triggers on a push to the release/v2.13 branch. It updates the
 # rancher/shepherd dependency in the rancher/rancher repository and opens a PR.
 on:
   push:
     branches:
-      - main
+      - release/v2.13
 env:
   INPUT_SOURCE_URL: ${{ github.event.inputs.source_url }}
   INPUT_SOURCE_AUTHOR: ${{ github.event.inputs.source_author }}
@@ -21,29 +21,29 @@ jobs:
     steps:
       # Checkout the current repo (shepherd) to get the commit SHA
       - name: Checkout shepherd
-        uses: actions/checkout@v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Get short SHA
         id: sha
         run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
       - name: Retrieve token from vault
-        uses: rancher-eio/read-vault-secrets@main
+        uses: rancher-eio/read-vault-secrets@0da85151ad1f19ed7986c41587e45aac1ace74b6 # v3
         with:
           secrets: |
             github/token/rancher--rancher--pull_requests--write token | GH_TOKEN
 
       # Checkout the target repo (rancher/rancher) where the PR will be created
       - name: Checkout rancher/rancher
-        uses: actions/checkout@v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           repository: rancher/rancher
           path: rancher
-          ref: main
+          ref: release/v2.13
           token: ${{ env.GH_TOKEN }}
 
       - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
           go-version-file: 'rancher/go.mod'
 
@@ -78,7 +78,7 @@ jobs:
       - name: Create Pull Request
         if: env.changes_exist == 'true'
         id: cpr
-        uses: actions/github-script@v7
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7.1.0
         with:
           github-token: ${{ env.GH_TOKEN }}
           script: |
@@ -92,11 +92,11 @@ jobs:
             }
           
             const { data: pr } = await github.rest.pulls.create({
-              title: "[main] shepherd-githubaction: Update rancher/shepherd to latest version",
+              title: "[v2.13] shepherd-githubaction: Update rancher/shepherd to latest version",
               body: body,
               owner: "rancher",
               repo: "rancher",
-              base: "main",
+              base: "release/v2.13",
               head: "${{ steps.update_and_push.outputs.branch_name }}"
             });
             await github.rest.issues.addLabels({

.github/workflows/stale-prs.yml

@@ -1,2 +1,2 @@
-#   RAFT Team
-*   @caliskanugur @bmdepesa @igomez06
+#   QAOps Team
+clients/   @caliskanugur @igomez06

CODEOWNERS

@@ -104,7 +104,9 @@ func (c *ResourceClient) Create(ctx context.Context, obj *unstructured.Unstructu
 
 	if needsCleanup(obj) {
 		c.ts.RegisterCleanupFunc(func() error {
-			err := c.Delete(context.TODO(), unstructuredObj.GetName(), metav1.DeleteOptions{}, subresources...)
+			// Using this policy avoids a flood of useless warnings on test logs.
+			orphanPolicy := metav1.DeletePropagationOrphan
+			err := c.Delete(context.TODO(), unstructuredObj.GetName(), metav1.DeleteOptions{PropagationPolicy: &orphanPolicy}, subresources...)
 			if errors.IsNotFound(err) {
 				return nil
 			}

clients/dynamic/dynamic.go

@@ -1,6 +1,7 @@
 package helm
 
 import (
+	"encoding/json"
 	"os/exec"
 
 	"github.com/pkg/errors"
@@ -104,3 +105,66 @@ func AddHelmRepo(name, url string) error {
 
 	return nil
 }
+
+// UpdateHelmRepo updates the specified helm repository using the helm repo update command.
+func UpdateHelmRepo(name string) error {
+	msg, err := exec.Command(helmCmd, "repo", "update", name).CombinedOutput()
+	if err != nil {
+		return errors.Wrap(err, "UpdateHelmRepo: "+string(msg))
+	}
+
+	return nil
+}
+
+// IsReleaseExists checks if a Helm release with the given releaseName exists in the specified namespace.
+func IsReleaseExists(releaseName, namespace string) (bool, string, error) {
+
+	commandArgs := []string{
+		"list",
+		"--namespace",
+		namespace,
+		"--filter",
+		releaseName,
+		"--output",
+		"json",
+	}
+
+	msg, err := exec.Command(helmCmd, commandArgs...).CombinedOutput()
+	if err != nil {
+		return false, "", errors.Wrap(err, "IsReleaseExists: "+string(msg))
+	}
+
+	if string(msg) == "[]" || len(msg) == 0 {
+		return false, "", nil
+	}
+
+	return true, string(msg), nil
+}
+
+// GetAppVersion gets the app version of a given releaseName in the specified namespace
+func GetAppVersion(releaseName, namespace string) (string, error) {
+	exists, msg, err := IsReleaseExists(releaseName, namespace)
+	if err != nil {
+		return "", err
+	}
+	if !exists {
+		return "", errors.New("release does not exist")
+	}
+
+	var releases []struct {
+		Name       string `json:"name"`
+		AppVersion string `json:"app_version"`
+	}
+
+	if err := json.Unmarshal([]byte(msg), &releases); err != nil {
+		return "", errors.Wrap(err, "GetAppVersion: failed to unmarshal json")
+	}
+
+	for _, r := range releases {
+		if r.Name == releaseName {
+			return r.AppVersion, nil
+		}
+	}
+
+	return "", errors.New("release not found in list output")
+}