Merge branch 'open-cluster-management-io:main' into main

stolostron · Jan 5, 2024 · 5258cb6 · 5258cb6
2 parents 25a09d4 + 6b87ce3
commit 5258cb6
Show file tree

Hide file tree

Showing 11 changed files with 124 additions and 13 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,24 @@
+---
+[comment]: # ( Copyright Contributors to the Open Cluster Management project )
+
+name: Bug report
+about: Create a bug report
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Environment ie: OCM version, managed serviceaccount addon version, Kubernetes version and provider:**
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/enhancement_request.md b/.github/ISSUE_TEMPLATE/enhancement_request.md
@@ -0,0 +1,13 @@
+---
+[comment]: # ( Copyright Contributors to the Open Cluster Management project )
+
+name: Enhancement request
+about: Create a enhancement request
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Describe the enhancement**
+A clear and concise description of what the enhancement request is.
diff --git a/.github/ISSUE_TEMPLATE/other_report.md b/.github/ISSUE_TEMPLATE/other_report.md
@@ -0,0 +1,10 @@
+---
+[comment]: # ( Copyright Contributors to the Open Cluster Management project )
+
+name: Other report
+about: Non bug or enhancement related issue
+title: ''
+labels: ''
+assignees: ''
+
+---
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,22 @@
+<!--
+Thanks for creating a pull request!
+
+If this is your first time, please make sure to review CONTRIBUTING.MD.
+
+Please copy the appropriate `:text:` or icon to the beginning of your PR title:
+
+:sparkles: ✨ feature
+:bug: 🐛 bug fix
+:book: 📖 docs
+:memo: 📝 proposal
+:warning: ⚠️ breaking change
+:rocket: 🚀 release
+:seedling: 🌱 other/misc
+:question: ❓ requires manual review/categorization
+
+-->
+## Summary
+
+## Related issue(s)
+
+Fixes #
diff --git a/.github/workflows/go-release.yml b/.github/workflows/go-release.yml
@@ -110,12 +110,20 @@ jobs:
           pushd release
           helm package ../charts/${{ env.CHART_NAME }}/
           popd
+      - name: generate changelog
+        run: |
+          echo "# Managed ServiceAccount ${{ needs.env.outputs.RELEASE_VERSION }}" > /home/runner/work/changelog.txt
       - name: publish release
-        uses: ncipollo/release-action@v1
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag: ${{ env.RELEASE_VERSION }}
-          artifacts: "go/src/open-cluster-management.io/managed-serviceaccount/release/*.tgz"
-          token: ${{ secrets.GITHUB_TOKEN }}
+          body_path: /home/runner/work/changelog.txt
+          files: |
+            go/src/open-cluster-management.io/managed-serviceaccount/release/*.tgz
+          draft: true
+          prerelease: false
+          generate_release_notes: true
       - name: submit charts to OCM chart repo
         uses: actions/github-script@v6
         with:
@@ -137,4 +145,4 @@ jobs:
             } catch(error) {
               console.error(error);
               core.setFailed(error);
-            }
+            }
diff --git a/.github/workflows/pr-verify.yml b/.github/workflows/pr-verify.yml
@@ -0,0 +1,25 @@
+# Copyright Contributors to the Open Cluster Management project
+
+name: PR Verifier
+
+on:
+  # NB: using `pull_request_target` runs this in the context of
+  # the base repository, so it has permission to upload to the checks API.
+  # This means changes won't kick in to this file until merged onto the
+  # main branch.
+  pull_request_target:
+    types: [opened, edited, reopened, synchronize]
+
+jobs:
+  verify:
+    name: verify PR contents
+    permissions:
+      checks: write
+      pull-requests: read
+    runs-on: ubuntu-latest
+    steps:
+      - name: Verifier action
+        id: verifier
+        uses: kubernetes-sigs/[email protected]
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/apis/authentication/v1alpha1/managedserviceaccount_types.go b/apis/authentication/v1alpha1/managedserviceaccount_types.go
@@ -26,7 +26,7 @@ func init() {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
-//+kubebuilder:storageversion
+//+kubebuilder:deprecatedversion:warning="authentication.open-cluster-management.io/v1alpha1 ManagedServiceAccount is deprecated; use authentication.open-cluster-management.io/v1beta1 ManagedServiceAccount; version v1alpha1 will be removed in the next release"
 
 // +genclient
 // ManagedServiceAccount is the Schema for the managedserviceaccounts API

diff --git a/apis/authentication/v1beta1/managedserviceaccount_types.go b/apis/authentication/v1beta1/managedserviceaccount_types.go
@@ -26,6 +26,7 @@ func init() {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+//+kubebuilder:storageversion
 
 // +genclient
 // ManagedServiceAccount is the Schema for the managedserviceaccounts API

diff --git a/...serviceaccount/crds/authentication.open-cluster-management.io_managedserviceaccounts.yaml b/...serviceaccount/crds/authentication.open-cluster-management.io_managedserviceaccounts.yaml
@@ -16,7 +16,11 @@ spec:
     singular: managedserviceaccount
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - deprecated: true
+    deprecationWarning: authentication.open-cluster-management.io/v1alpha1 ManagedServiceAccount
+      is deprecated; use authentication.open-cluster-management.io/v1beta1 ManagedServiceAccount;
+      version v1alpha1 will be removed in the next release
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: ManagedServiceAccount is the Schema for the managedserviceaccounts
@@ -167,7 +171,7 @@ spec:
             type: object
         type: object
     served: true
-    storage: true
+    storage: false
     subresources:
       status: {}
   - name: v1beta1
@@ -321,7 +325,7 @@ spec:
             type: object
         type: object
     served: true
-    storage: false
+    storage: true
     subresources:
       status: {}
 status:

diff --git a/config/crd/bases/authentication.open-cluster-management.io_managedserviceaccounts.yaml b/config/crd/bases/authentication.open-cluster-management.io_managedserviceaccounts.yaml
@@ -16,7 +16,11 @@ spec:
     singular: managedserviceaccount
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - deprecated: true
+    deprecationWarning: authentication.open-cluster-management.io/v1alpha1 ManagedServiceAccount
+      is deprecated; use authentication.open-cluster-management.io/v1beta1 ManagedServiceAccount;
+      version v1alpha1 will be removed in the next release
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: ManagedServiceAccount is the Schema for the managedserviceaccounts
@@ -167,7 +171,7 @@ spec:
             type: object
         type: object
     served: true
-    storage: true
+    storage: false
     subresources:
       status: {}
   - name: v1beta1
@@ -321,7 +325,7 @@ spec:
             type: object
         type: object
     served: true
-    storage: false
+    storage: true
     subresources:
       status: {}
 status:

diff --git a/pkg/addon/manager/manifests/templates/deployment.yaml b/pkg/addon/manager/manifests/templates/deployment.yaml
@@ -13,7 +13,7 @@ spec:
       labels:
         addon-agent: managed-serviceaccount
     spec:
-      serviceAccount: managed-serviceaccount
+      serviceAccountName: managed-serviceaccount
 {{- if .NodeSelector }}
       nodeSelector:
       {{- range $key, $value := .NodeSelector }}