From 8d1fdc297f7fe1fdd8c484cec3296e45739fe91e Mon Sep 17 00:00:00 2001 From: Jian Qiu Date: Wed, 16 Oct 2024 12:32:19 +0800 Subject: [PATCH] Add trimmed release version to env (#648) Signed-off-by: Jian Qiu --- .github/workflows/chart-upload.yml | 1 + .github/workflows/release.yml | 1 + pkg/addon/templateagent/testmanifests/addontemplate.yaml | 6 ++---- .../testmanifests/addontemplate_daemonset.yaml | 6 ++---- .../testmanifests/addontemplate_deployment.yaml | 6 ++---- test/integration/addon/testmanifests/addontemplate.yaml | 6 ++---- 6 files changed, 10 insertions(+), 16 deletions(-) diff --git a/.github/workflows/chart-upload.yml b/.github/workflows/chart-upload.yml index a121e848e..a090bfbc5 100644 --- 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 index adca02dad..7a194c815 100644 --- 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 index 61871c9d4..c1fc1833f 100644 --- 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 index 072ed0324..f60d4f648 100644 --- 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 index 086535a2a..9c97334b8 100644 --- 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 index 61871c9d4..c1fc1833f 100644 --- 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: