feat(1.0.2): update k3s version & fix with docker install

update k3s version & fix with docker install Signed-off-by: ysicing <[email protected]>
easysoft · Jun 17, 2022 · eb07994 · eb07994
1 parent 6129ec6
commit eb07994
Show file tree

Hide file tree

Showing 7 changed files with 82 additions and 104 deletions.
diff --git a/.github/workflows/CHANGELOG.md b/.github/workflows/CHANGELOG.md
diff --git a/.github/workflows/auto-merge-pr.yml b/.github/workflows/auto-merge-pr.yml
@@ -0,0 +1,42 @@
+# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions
+name: Approve and enable auto-merge for dependabot and changelog PRs
+on: pull_request
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/[email protected]
+        with:
+          github-token: "${{ secrets.GH_TOKEN }}"
+      - name: Approve PR
+        run: gh pr review --approve "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GH_TOKEN}}
+      - name: Enable auto-merge for Dependabot PRs
+        run: gh pr merge --auto --squash "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GH_TOKEN}}
+  changelog:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'github-actions[bot]' }}
+    steps:
+      - name: Approve PR
+        run: gh pr review --approve "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GH_TOKEN}}
+      - name: Enable auto-merge for Changelog PRs
+        run: gh pr merge --auto --squash "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GH_TOKEN}}
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -110,88 +110,3 @@ changelog:
       - Merge pull request
       - Merge branch
       - go mod tidy
-
-release:
-  # Repo in which the release will be created.
-  # Default is extracted from the origin remote URL or empty if its private hosted.
-  # github:
-  #   owner: user
-  #   name: repo
-
-  # IDs of the archives to use.
-  # Defaults to all.
-  # ids:
-  #   - foo
-  #   - bar
-
-  # If set to true, will not auto-publish the release.
-  # Default is false.
-  # draft: true
-
-  # If set, will create a release discussion in the category specified.
-  #
-  # Warning: do not use categories in the 'Announcement' format.
-  #  Check https://github.com/goreleaser/goreleaser/issues/2304 for more info.
-  #
-  # Default is empty.
-  discussion_category_name: General
-
-  # If set to auto, will mark the release as not ready for production
-  # in case there is an indicator for this in the tag e.g. v1.0.0-rc1
-  # If set to true, will mark the release as not ready for production.
-  # Default is false.
-  prerelease: auto
-
-  # What to do with the release notes in case there the release already exists.
-  #
-  # Valid options are:
-  # - `keep-existing`: keep the existing notes
-  # - `append`: append the current release notes to the existing notes
-  # - `prepend`: prepend the current release notes to the existing notes
-  # - `replace`: replace existing notes
-  #
-  # Default is `keep-existing`.
-  mode: replace
-
-  # Header template for the release body.
-  # Defaults to empty.
-  # header: |
-  #   ## Some title ({{ .Date }})
-
-  #   Welcome to this new release!
-
-  # Footer template for the release body.
-  # Defaults to empty.
-  footer: |
-    **Full Changelog**: https://github.com/easysoft/qucheng_cli/compare/{{ .PreviousTag }}...{{ .Tag }}
-
-  #   Those were the changes on {{ .Tag }}!
-
-  # You can change the name of the release.
-  # Default is `{{.Tag}}` on OSS and `{{.PrefixedTag}}` on Pro.
-  # name_template: "{{.ProjectName}}-v{{.Version}} {{.Env.USER}}"
-
-  # You can disable this pipe in order to not create the release on any SCM.
-  # Keep in mind that this might also break things that depens on the release URL, for instance, homebrew taps.
-  #
-  # Defaults to false.
-  # disable: true
-
-  # You can add extra pre-existing files to the release.
-  # The filename on the release will be the last part of the path (base).
-  # If another file with the same name exists, the last one found will be used.
-  # These globs can also include templates.
-  #
-  # Defaults to empty.
-  # extra_files:
-  #   - glob: ./path/to/file.txt
-  #   - glob: ./glob/**/to/**/file/**/*
-  #   - glob: ./glob/foo/to/bar/file/foobar/override_from_previous
-  #   - glob: ./single_file.txt
-  #     name_template: file.txt # note that this only works if glob matches 1 file only
-
-
-# announce:
-#   twitter:
-#     enabled: true
-#     message_template: 'QuCheng Cli {{ .Tag }} is out! Check it out: https://github.com/easysoft/qucheng_cli/releases/tag/{{ .Tag }}'
diff --git a/Makefile b/Makefile
@@ -78,7 +78,7 @@ dev: ## dev test
 	upx dist/qcadmin_linux_amd64
 
 local: ## dev test
-	GO_ENABLED=1 gox -os="darwin" -arch="amd64" -output="dist/{{.Dir}}_{{.OS}}_{{.Arch}}" -ldflags ${LDFLAGS}
+	GO_ENABLED=1 gox -os="darwin" -arch="arm64" -output="dist/{{.Dir}}_{{.OS}}_{{.Arch}}" -ldflags ${LDFLAGS}
 
 clean: ## clean
 	rm -rf dist

diff --git a/changelog.md b/changelog.md
@@ -1,21 +1,42 @@
 # Changelog
 
+## v1.0.2-rc.2 (2022-06-17)
+
+ * [4f54538](https://github.com/easysoft/qucheng_cli/commit/4f5453812ff9d8afbd825025e34ed9a5bbb28a4a) chore(action): fix typo
+ * [f02f66d](https://github.com/easysoft/qucheng_cli/commit/f02f66d50c4770765a156fac9d6fc8e080e0f848) chore(action): update ci
+ * [d8a1573](https://github.com/easysoft/qucheng_cli/commit/d8a1573403adaa9d1e300f279ec21fbe7a67ac84) fix(version): fix cli version parse
+
+### Contributors
+
+ * ysicing
+
 ## v1.0.2-rc1 (2022-06-16)
 
- * [9906421](https://github.com/tensorchord/envd/commit/9906421a8292ca2e409e663ce3d2a40563310151) fix(typo): fix check server version
- * [b283320](https://github.com/tensorchord/envd/commit/b2833206f9f56b96044e20fac2111bb8a5a79869) feat(update): imp upgrade
- * [bc337f4](https://github.com/tensorchord/envd/commit/bc337f4b58406085a5c96b6fa285fbdbddbc0dbc) feat(update): update
- * [8805aa4](https://github.com/tensorchord/envd/commit/8805aa42971f9422f1c4a6b827aa6a001b59223d) build(deps): bump helm.sh/helm/v3 from 3.8.2 to 3.9.0
- * [b8628fe](https://github.com/tensorchord/envd/commit/b8628feb4d67e190f0f53844f6888bd20553a511) build(deps): bump github.com/docker/docker
- * [57a9c92](https://github.com/tensorchord/envd/commit/57a9c927f50cf82f3adb77e20d38445fe5c726fb) feat(version): update version func
- * [3b29700](https://github.com/tensorchord/envd/commit/3b2970019adaaa6136b179e8bebc34a53239a542) feat(update): update
- * [52ee327](https://github.com/tensorchord/envd/commit/52ee3271949b67bf2fdf2613c733555d16aa8a1d) fix(typo): fix kubectl path
- * [79fa3af](https://github.com/tensorchord/envd/commit/79fa3af06f1b7e7b0f5982c3c3d4e3a8aa6bb3c2) feat(ci): update github ci
- * [afed893](https://github.com/tensorchord/envd/commit/afed89331e25cd1fd5fb282b79dc68bf254e952d) feat(password): support reset admin password by cli
- * [6262bf0](https://github.com/tensorchord/envd/commit/6262bf025b765616d3b86c377d774d40ce6c6c42) feat(ci): update ci
- * [6e6e3a9](https://github.com/tensorchord/envd/commit/6e6e3a9f4ef0a0b5d1566cb0e71fbad89b480f25) feat(ci): update ci
- * [75c2807](https://github.com/tensorchord/envd/commit/75c280774618a6a5d837a175bac0c3834167e829) feat(plugin): fix plugin uninstall
- * [dcd9bbb](https://github.com/tensorchord/envd/commit/dcd9bbb4eb8cee482fb4fdc8aa456fabbbec64dd) fix(typo): fix kubecfg path typo
+
+### Contributors
+
+
+## v1.0.2 (2022-06-17)
+
+ * [6129ec6](https://github.com/easysoft/qucheng_cli/commit/6129ec650342bca79da6cb932dd51731b510a9b9) fix(k3s): fix cgroup typo
+ * [5540069](https://github.com/easysoft/qucheng_cli/commit/55400694753adf52e19c292500014c25b5d79f41) feat(dockercgroup): deprecated docker check
+ * [4f54538](https://github.com/easysoft/qucheng_cli/commit/4f5453812ff9d8afbd825025e34ed9a5bbb28a4a) chore(action): fix typo
+ * [f02f66d](https://github.com/easysoft/qucheng_cli/commit/f02f66d50c4770765a156fac9d6fc8e080e0f848) chore(action): update ci
+ * [d8a1573](https://github.com/easysoft/qucheng_cli/commit/d8a1573403adaa9d1e300f279ec21fbe7a67ac84) fix(version): fix cli version parse
+ * [9906421](https://github.com/easysoft/qucheng_cli/commit/9906421a8292ca2e409e663ce3d2a40563310151) fix(typo): fix check server version
+ * [b283320](https://github.com/easysoft/qucheng_cli/commit/b2833206f9f56b96044e20fac2111bb8a5a79869) feat(update): imp upgrade
+ * [bc337f4](https://github.com/easysoft/qucheng_cli/commit/bc337f4b58406085a5c96b6fa285fbdbddbc0dbc) feat(update): update
+ * [8805aa4](https://github.com/easysoft/qucheng_cli/commit/8805aa42971f9422f1c4a6b827aa6a001b59223d) build(deps): bump helm.sh/helm/v3 from 3.8.2 to 3.9.0
+ * [b8628fe](https://github.com/easysoft/qucheng_cli/commit/b8628feb4d67e190f0f53844f6888bd20553a511) build(deps): bump github.com/docker/docker
+ * [57a9c92](https://github.com/easysoft/qucheng_cli/commit/57a9c927f50cf82f3adb77e20d38445fe5c726fb) feat(version): update version func
+ * [3b29700](https://github.com/easysoft/qucheng_cli/commit/3b2970019adaaa6136b179e8bebc34a53239a542) feat(update): update
+ * [52ee327](https://github.com/easysoft/qucheng_cli/commit/52ee3271949b67bf2fdf2613c733555d16aa8a1d) fix(typo): fix kubectl path
+ * [79fa3af](https://github.com/easysoft/qucheng_cli/commit/79fa3af06f1b7e7b0f5982c3c3d4e3a8aa6bb3c2) feat(ci): update github ci
+ * [afed893](https://github.com/easysoft/qucheng_cli/commit/afed89331e25cd1fd5fb282b79dc68bf254e952d) feat(password): support reset admin password by cli
+ * [6262bf0](https://github.com/easysoft/qucheng_cli/commit/6262bf025b765616d3b86c377d774d40ce6c6c42) feat(ci): update ci
+ * [6e6e3a9](https://github.com/easysoft/qucheng_cli/commit/6e6e3a9f4ef0a0b5d1566cb0e71fbad89b480f25) feat(ci): update ci
+ * [75c2807](https://github.com/easysoft/qucheng_cli/commit/75c280774618a6a5d837a175bac0c3834167e829) feat(plugin): fix plugin uninstall
+ * [dcd9bbb](https://github.com/easysoft/qucheng_cli/commit/dcd9bbb4eb8cee482fb4fdc8aa456fabbbec64dd) fix(typo): fix kubecfg path typo
 
 ### Contributors
 
@@ -24,7 +45,7 @@
 
 ## v1.0.1 (2022-06-08)
 
- * [d5986be](https://github.com/tensorchord/envd/commit/d5986be825923cd7266c09e2aa6d7a9723f24328) feat(upgrade): support upgrade qcadmin self
+ * [d5986be](https://github.com/easysoft/qucheng_cli/commit/d5986be825923cd7266c09e2aa6d7a9723f24328) feat(upgrade): support upgrade qcadmin self
 
 ### Contributors
 

diff --git a/hack/scripts/changelog.sh b/hack/scripts/changelog.sh
@@ -10,7 +10,7 @@ git tag -l 'v*' | sort -rV | while read last; do
     echo "## $(git for-each-ref --format='%(refname:strip=2) (%(creatordate:short))' refs/tags/${tag})"
     echo
     git_log='git --no-pager log --no-merges --invert-grep --grep=^\(build\|ci\|docs\|test\|chore\):'
-	  $git_log --format=' * [%h](https://github.com/tensorchord/envd/commit/%H) %s' $last..$tag
+	  $git_log --format=' * [%h](https://github.com/easysoft/qucheng_cli/commit/%H) %s' $last..$tag
 	  echo
 	  echo "### Contributors"
 	  echo

diff --git a/internal/pkg/util/autodetect/docker.go b/internal/pkg/util/autodetect/docker.go
@@ -17,8 +17,8 @@ import (
 
 const (
 	// constant for cgroup drivers
-	cgroupFsDriver      = "cgroupfs"
-	cgroupSystemdDriver = "systemd"
+	cgroupFsDriver = "cgroupfs"
+	// cgroupSystemdDriver = "systemd"
 	// cgroupNoneDriver    = "none"
 )