Add trimmed release version to env (#648)

Signed-off-by: Jian Qiu <jqiu@redhat.com>
open-cluster-management-io · Oct 16, 2024 · 8d1fdc2 · 8d1fdc2
1 parent 1e050b4
commit 8d1fdc2
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 16 deletions.
diff --git a/.github/workflows/chart-upload.yml b/.github/workflows/chart-upload.yml
@@ -28,6 +28,7 @@ jobs:
     outputs:
       MAJOR_RELEASE_VERSION: ${{ env.MAJOR_RELEASE_VERSION }}
       RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
+      TRIMMED_RELEASE_VERSION: ${{ env.TRIMMED_RELEASE_VERSION }}
   upload:
     name: upload
     runs-on: ubuntu-latest

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -37,6 +37,7 @@ jobs:
     outputs:
       MAJOR_RELEASE_VERSION: ${{ env.MAJOR_RELEASE_VERSION }}
       RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
+      TRIMMED_RELEASE_VERSION: ${{ env.TRIMMED_RELEASE_VERSION }}
   release:
     name: release
     runs-on: ubuntu-latest

diff --git a/pkg/addon/templateagent/testmanifests/addontemplate.yaml b/pkg/addon/templateagent/testmanifests/addontemplate.yaml
@@ -129,10 +129,8 @@ spec:
       kubeClient:
         hubPermissions:
           - type: CurrentCluster
-            roleRef:
-              apiGroup: rbac.authorization.k8s.io
-              kind: ClusterRole
-              name: cm-admin
+            currentCluster:
+              clusterRoleName: cm-admin
     - customSigner:
         signerName: example.com/signer-name
         signingCA:

diff --git a/pkg/addon/templateagent/testmanifests/addontemplate_daemonset.yaml b/pkg/addon/templateagent/testmanifests/addontemplate_daemonset.yaml
@@ -68,10 +68,8 @@ spec:
       kubeClient:
         hubPermissions:
           - type: CurrentCluster
-            roleRef:
-              apiGroup: rbac.authorization.k8s.io
-              kind: ClusterRole
-              name: cm-admin
+            currentCluster:
+              clusterRoleName: cm-admin
     - customSigner:
         signerName: example.com/signer-name
         signingCA:

diff --git a/pkg/addon/templateagent/testmanifests/addontemplate_deployment.yaml b/pkg/addon/templateagent/testmanifests/addontemplate_deployment.yaml
@@ -96,10 +96,8 @@ spec:
       kubeClient:
         hubPermissions:
           - type: CurrentCluster
-            roleRef:
-              apiGroup: rbac.authorization.k8s.io
-              kind: ClusterRole
-              name: cm-admin
+            currentCluster:
+              clusterRoleName: cm-admin
     - customSigner:
         signerName: example.com/signer-name
         signingCA:

diff --git a/test/integration/addon/testmanifests/addontemplate.yaml b/test/integration/addon/testmanifests/addontemplate.yaml
@@ -129,10 +129,8 @@ spec:
       kubeClient:
         hubPermissions:
           - type: CurrentCluster
-            roleRef:
-              apiGroup: rbac.authorization.k8s.io
-              kind: ClusterRole
-              name: cm-admin
+            currentCluster:
+              clusterRoleName: cm-admin
     - customSigner:
         signerName: example.com/signer-name
         signingCA: