merge 3.3.9.rc.8 to release (#781)

* ci(develop) fix golint for code and lic (#736) * merge to master (#739) * rewrite install and delete for app, app.tar don't send if already exist * read byte to remote file by sftp * add etcd health check * restore only one node to local * use subcommad instead Flag * single node save, healthcheck and restore test ok * recovery kube system when err happend by restore * use tar to compress instead of zip. * slove in docker use with save. * add --docker bool flag , if true , this will auto add unix timestamp to your snapshot suffix. * add save snapshot to oss. sealos config add oss-conf * feat(develop): 修复 #430 * fix ETCD CaCert or key file is not exist occurs panic, #427 * add kubernetes cronjob example yaml file * fix #441 * fix issue #443 * implementaion for sealos exec #429 * fix bug --label & --node will exec cmd twice and add example exec cmd * support exec scp local dir to remote * refactor exec command and use get ip by node name & by labelselector method to avoid for loop * fix sealos etcd health check for mutil master * add bash/zsh completion for sealos. from kubectl * fix kubeadm not found on old sealos package && fix port in exec cmd #469 && fix --service-cidr on old version && delete route cmd * fix 1.19.1 kube-controller-manager and kube-scheduler use the LocalAPIEndpoint instead of the ControlPlaneEndpoint. * add sealos route cmd docs * rm original sealos in old package to aviod some problem. add multi network install docs stage add upx in dockerfile, add upx in drone. change image to golang:15.2-alpine * dockerfile add upx stage build * fix versiontointall when version like v1.16.14 >= 1191 * add test record for upgrade cmd * when init , do not send twice, if valid copy md5 success ,do not logger * sepreate install master0 and other master when send ca and key and kubeconfig * fix --config when use customer config. * validate copy kubetarball * fix #499 * fix #509. * fix #534 only for 1.19.1 and 1.19.2 * /root/.kube/config设置为600，否则默认其它组有r权限，导致helm工具执行有警告 * when kubernetes gt 1.20, use Containerd instead of docker, #540 suport 1.20 containerd * fix #566, sealos clean --node 不小心写了 masterip add cleanCmd example * fix #571. handle unexpected error * fix #577, join node use config file, fix ipformat comment to oss when push to develop, only to tag to release Fix 1.14.x has no kubeadm.k8s.io/v1beta2 by use cli kubeadm join --xxxx. * fix #586, drain node is too danger for prod use; do not drain nodes drain worker node is too danger for prod use; do not drain nodes if worker nodes~ * fix build status (#610) * fix arm64 tags * fix #613, delete -i for cp command * fix #621. join node or master should not exsit in kubernetes. * feat(develop): fix ipip param not set false (#653) * # 决绝路径取消拼接，防止出错。 (#654) * feat(develop): fix cni config too long (#655) * fix version 3.19.1 yaml file lint error. (#656) * fix calico (#657) * fix calico version nil yaml file retrun null. (#658) * Update upgrade.md (#665) * use new const for kubeletconfig (#589) Signed-off-by: oldthreefeng <[email protected]> * [WIP]Sealos kubeadm 1.23 v1beta3 (#673) * fix #671 * feat(develop): fix ci dir for sealos (#735) * fix bootstrapToken (#737) * feat(develop): rc6 release (#738) * ci(develop) fix golint for code and lic (#736) Co-authored-by: steven <[email protected]> Co-authored-by: oldthreefeng <[email protected]> Co-authored-by: 中弈 <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: Louis <[email protected]> Co-authored-by: ysicing <[email protected]> Co-authored-by: huizhi.szh <[email protected]> Co-authored-by: aiyijing <[email protected]> Co-authored-by: scott lewis <[email protected]> Co-authored-by: wenshihong <[email protected]> Co-authored-by: wisheen <[email protected]> Co-authored-by: Cluas <[email protected]> Co-authored-by: currycan <[email protected]> Co-authored-by: zhangzhitao <[email protected]> Co-authored-by: rick <[email protected]> Co-authored-by: panda-lab <[email protected]> Co-authored-by: 付亮 <[email protected]> Co-authored-by: SorryMaker <[email protected]> * Revert "merge to master (#739)" (#741) This reverts commit c8349b0. * Update README.md * ci(master): add dockerfile * hotfix(master): clean panic fix by lock (#750) * refactor(ci): add auto invite (#762) * refactor(ci): add auto invite (#763) * refactor(ci): add auto invite * docs: readme align * refactor(dev): fix docs site (#773) * refactor(master): cloud,app feature close (#774) * refactor(master): cloud,app feature close * 缺陷: 最新版本sealos init 安装k8s 失败 (#778) Fixes #691 * refactor(master): release rc.8 (#782) * refactor(master): changelog (#784) * update changelog to master (#785) * refactor(master): changelog Co-authored-by: steven <[email protected]> Co-authored-by: oldthreefeng <[email protected]> Co-authored-by: 中弈 <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: Louis <[email protected]> Co-authored-by: ysicing <[email protected]> Co-authored-by: huizhi.szh <[email protected]> Co-authored-by: aiyijing <[email protected]> Co-authored-by: scott lewis <[email protected]> Co-authored-by: wenshihong <[email protected]> Co-authored-by: wisheen <[email protected]> Co-authored-by: Cluas <[email protected]> Co-authored-by: currycan <[email protected]> Co-authored-by: zhangzhitao <[email protected]> Co-authored-by: rick <[email protected]> Co-authored-by: panda-lab <[email protected]> Co-authored-by: 付亮 <[email protected]> Co-authored-by: SorryMaker <[email protected]> Co-authored-by: jiangyanfei <[email protected]> Co-authored-by: ldseraph <[email protected]>
labring · Dec 29, 2021 · 48f4a2c · 48f4a2c
1 parent 394a895
commit 48f4a2c
Show file tree

Hide file tree

Showing 107 changed files with 2,650 additions and 2,157 deletions.
diff --git a/.github/workflows/auto-invite.yml b/.github/workflows/auto-invite.yml
@@ -0,0 +1,24 @@
+name: Invite user to join our group
+on:
+  issue_comment:
+    types:
+      - created
+jobs:
+  issue_comment:
+    name: Invite user to join our group
+    if: ${{ github.event.comment.body == '/invite' }}
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+
+      - name: Invite user to join our group
+        uses: peter-evans/create-or-update-comment@v1
+        with:
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            It's my pleasure to invite you to join us :
+            qq group : 98488045
+            sealos dingtalk group : 35371178
+            home Website: https://www.sealyun.com
+            developer please add my dingtalk or wechat : cuisongliu
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -21,8 +21,12 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - name: Setup Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ env.GO_VERSION }}
       - name: Run Check License
-        run:
+        run: |
           wget https://github.com/google/addlicense/releases/download/v1.0.0/addlicense_1.0.0_Linux_x86_64.tar.gz
           tar -zxvf addlicense_1.0.0_Linux_x86_64.tar.gz -C $(go env GOPATH)/bin
           chmod a+x $(go env GOPATH)/bin/addlicense

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -54,3 +54,26 @@ jobs:
           ./ossutil64 -c .ossutilconfig cp -f dist/sealos_linux_arm64/sealos oss://${BUCKETNAME:-sealyun}/${{ steps.prepare.outputs.tag_name }}/sealos-arm64
           ./ossutil64 -c .ossutilconfig cp -f dist/sealos_linux_amd64/sealos oss://${BUCKETNAME:-sealyun}/latest/sealos
           ./ossutil64 -c .ossutilconfig cp -f dist/sealos_linux_arm64/sealos oss://${BUCKETNAME:-sealyun}/latest/sealos-arm64
+
+      - name: set up buildx
+        id: buildx
+        uses: crazy-max/ghaction-docker-buildx@v1
+        with:
+          version: latest
+
+      - name: login to dockerhub
+        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+
+      - name: build (and publish) main image
+        env:
+          # fork friendly ^^
+          DOCKER_REPO: ${{ secrets.DOCKER_REPO }}
+        run: |
+          docker buildx build \
+            --platform linux/amd64,linux/arm64 \
+            --build-arg VERSION=${{ steps.prepare.outputs.tag_name }} \
+            --push \
+            -t ${DOCKER_REPO:-fanux/sealos}:${{ steps.prepare.outputs.tag_name }} \
+            -t ${DOCKER_REPO:-fanux/sealos}:latest \
+            -f hack/dockerfile/Dockerfile \
+            .
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,5 @@ dist
 .vscode
 test/Note.md
 .ossutil_checkpoint
+bin
+.run
diff --git a/.golangci.yml b/.golangci.yml
@@ -9,16 +9,14 @@ run:
   #   vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
   skip-dirs-use-default: true
 
-  modules-download-mode: vendor
-
 linters:
   # please, do not use `enable-all`: it's deprecated and will be removed soon.
   # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
   disable-all: true
   enable:
     - gofmt
     - goimports
-    - golint
+    - revive
     - stylecheck
     - goconst
     - gosimple
@@ -39,11 +37,14 @@ linters:
     - ifshort
     - unconvert
 
-issues:
-  exclude-rules:
-    - linters:
-        - golint
-      text: "AccessKeyId"
+linters-settings:
+  errcheck:
+    check-type-assertions: false
+    ignore: fmt:.*,io/ioutil:^Read.*
+    exclude-functions:
+      - io/ioutil.ReadFile
+      - io.Copy(*bytes.Buffer)
+      - io.Copy(os.Stdout)
 
 # golangci.com configuration
 # https://github.com/golangci/golangci/wiki/Configuration

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,36 +1,21 @@
-<!--
-// Copyright © 2019 NAME HERE <EMAIL ADDRESS>
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
--->
-
-# Table of Contents
-
-- [3.3.9-rc.6](#671)
-- [3.3.9-rc.5](#658)
-- [3.3.9-rc.3](#658)
-
-# 3.3.9-rc.6
+# ChangeLog
+
+## [3.3.9-rc.8](#v3.3.9-rc.8)
+
+- delete cloud,install,delete feature
+- [#778](https://github.com/fanux/sealos/pull/778)
+
+## [3.3.9-rc.6](#v3.3.9-rc.6)
 
 - fix github action
 - support 1.23+
 
-# 3.3.9-rc.5
+## [3.3.9-rc.5](#v3.3.9-rc.5)
 
 - feat: fix to use calico new version v1.19.1 with new k8s version.  v1.22.0+ ,v1.21.4+,v1.20.10+, v1.19.14.  
 other k8s version (v1.21.3-, v1.20.9-, v1.19.13-) to use old calico version v3.8.2. (#658)
 
-# 3.3.9-rc.3 
+## [3.3.9-rc.3](#v3.3.9-rc.3)
 
 - hotfix: fix decode cmd miss TokenCaCertHash(#616)
 - feat: kubernetes version. like 1.20.0+ , cri use containerd , other use docker-ce. 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -70,7 +70,7 @@ To put forward a PR, we assume you have registered a GitHub ID. Then you could f
 
 1. **FORK** sealos to your repository. To make this work, you just need to click the button Fork in right-left of [fanux/sealos](https://github.com/fanux/sealos) main page. Then you will end up with your repository in `https://github.com/<your-username>/sealos`, in which `your-username` is your GitHub username.
 
-1. **CLONE** your own repository to develop locally. Use `git clone https://github.com/<your-username>/sealos.git` to clone repository to your local machine. Then you can create new branches to finish the change you wish to make.
+1. **CLONE** your own repository to master locally. Use `git clone https://github.com/<your-username>/sealos.git` to clone repository to your local machine. Then you can create new branches to finish the change you wish to make.
 
 1. **Set Remote** upstream to be `https://github.com/fanux/sealos.git` using the following two commands:
 
@@ -120,11 +120,11 @@ To put forward a PR, we assume you have registered a GitHub ID. Then you could f
    git push	// push to your forked repository after rebase done
    ```
 
-1. **File a pull request** to fanux/sealos:develop
+1. **File a pull request** to fanux/sealos:master
 
 ### Branch Definition
 
-Right now we assume every contribution via pull request is for [branch develop](https://github.com/fanux/sealos/tree/develop) in sealos. Before contributing, be aware of branch definition would help a lot.
+Right now we assume every contribution via pull request is for [branch master](https://github.com/fanux/sealos/tree/master) in sealos. Before contributing, be aware of branch definition would help a lot.
 
 As a contributor, keep in mind again that every contribution via pull request is for branch master. While in project sealos, there are several other branches, we generally call them rc branches, release branches and backport branches.
 

diff --git a/Makefile b/Makefile
@@ -66,15 +66,15 @@ filelicense: SHELL:=/bin/bash
 filelicense: ## add license
 	for file in ${Dirs} ; do \
 		if [[  $$file != '_output' && $$file != 'docs' && $$file != 'vendor' && $$file != 'logger' && $$file != 'applications' ]]; then \
-			$(ADDLICENSE_BIN)  -y $(shell date +"%Y") -c "Alibaba Group Holding Ltd." -f hack/template/LICENSE ./$$file ; \
+			$(ADDLICENSE_BIN)  -y $(shell date +"%Y") -c "sealos." -f hack/template/LICENSE ./$$file ; \
 		fi \
     done
 
 install-ossutil: ## check ossutil if not exist install ossutil tools
 ifeq (, $(shell which ossutil))
 	@{ \
 	set -e ;\
-	go install github.com/aliyun/ossutil@latest ;\
+	curl -sfL https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s -- -b $(GOBIN) v2.2.0 ;\
 	}
 OSSUTIL_BIN=$(GOBIN)/ossutil
 else

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# 风险须知
+# ⚠️ 风险须知
 
 **由于sealos可以把一周的工作量缩短到三分钟，可能会导致您工作不饱满而被老板炒鱿鱼**
 
@@ -28,22 +28,20 @@
 
 ---
 
-**文档: _[官方文档](https://www.sealyun.com/instructions), [博客](https://fuckcloudnative.io)_**
+**文档: _[官方文档](https://www.sealyun.com/instructions), [英文文档](/README_en.md), [博客](https://fuckcloudnative.io)_**
 
 **加入组织: _钉钉群(35371178), [Telegram](https://t.me/gsealyun)_**
 
 ![](docs/images/arch.png)
 
-[English Docs](/README_en.md)
-
-# 支持的环境
+# ✨ 支持的环境
 
 ## Linux 发行版, CPU架构
 
 - Debian 9+,  x86_64/ arm64
 - Ubuntu 16.04, 18.04, 20.04,  x86_64/ arm64
 - Centos/RHEL 7.6+,  x86_64/ arm64
-- 其他支持 systemd 的系统环境.  x86_64/ arm64
+- 其他支持 systemd 的系统环境,  x86_64/ arm64
 - Kylin arm64
 
 ## kubernetes 版本
@@ -73,7 +71,7 @@
    - kubernetes1.20+ 使用containerd作为cri. 不需要用户安装docker/containerd. sealos会安装1.3.9版本containerd。
    - kubernetes1.19及以下 使用docker作为cri。 也不需要用户安装docker。 sealos会安装1.19.03版本docker
  - 网络和 DNS 要求：
-   - 确保 /etc/resolv.conf 中的 DNS 地址可用。否则，可能会导致群集中coredns异常。 
+   - 确保 /etc/resolv.conf 中的 DNS 地址可用。否则，可能会导致群集中coredns异常。
    - 如果使用阿里云/华为云主机部署。 默认的pod网段会和阿里云的dns网段冲突， 建议自定义修改pod网段, 在init的时候指定`--podcidr` 来修改。
    - sealos 默认会关闭防火墙， 如果需要打开防火墙， 建议手动放行相关的端口。
  - 内核要求:
@@ -85,10 +83,10 @@
 
 主机名|IP地址
 ---|---
-master0|192.168.0.2 
-master1|192.168.0.3 
-master2|192.168.0.4 
-node0|192.168.0.5 
+master0|192.168.0.2
+master1|192.168.0.3
+master2|192.168.0.4
+node0|192.168.0.5
 
 服务器密码：123456
 
@@ -99,7 +97,7 @@ node0|192.168.0.5
 ```sh
 # 下载并安装sealos, sealos是个golang的二进制工具，直接下载拷贝到bin目录即可, release页面也可下载
 $ wget -c https://sealyun.oss-cn-beijing.aliyuncs.com/latest/sealos && \
-    chmod +x sealos && mv sealos /usr/bin 
+    chmod +x sealos && mv sealos /usr/bin
 
 # 下载离线资源包
 $ wget -c https://sealyun.oss-cn-beijing.aliyuncs.com/05a3db657821277f5f3b92d834bbaf98-v1.22.0/kube1.22.0.tar.gz
@@ -167,3 +165,7 @@ version|[资源包](https://www.sealyun.com/goodsDetail?type=cloud_kernel&name=k
 - [x] 上千用户在线上环境使用sealos，稳定可靠
 - [x] 资源包放在阿里云oss上，再也不用担心网速
 - [x] dashboard ingress prometheus等APP 同样离线打包，一键安装
+
+# 📊 Stats
+
+![Alt](https://repobeats.axiom.co/api/embed/10ce83c1d8452210bc4a0b5a5df9d59bbc35d889.svg "Repobeats analytics image")
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,3 +12,5 @@ dist @@
     .vscode
     test/Note.md
     .ossutil_checkpoint
+    bin
+    .run