Merge branch 'bugfix/657' of ssh://git.motofans.club:6666/Motofans/charmed-kubernetes into bugfix/657

.gitignore

@@ -1,50 +1,5 @@
-# These are some examples of commonly ignored file patterns.
-# You should customize this list as applicable to your project.
-# Learn more about .gitignore:
-#     https://www.atlassian.com/git/tutorials/saving-changes/gitignore
-
-# Node artifact files
-node_modules/
-dist/
-
-# Compiled Java class files
-*.class
-
-# Compiled Python bytecode
-*.py[cod]
-
 # Log files
 *.log
 
-# Package files
-*.jar
-
-# Maven
-target/
-dist/
-
-# JetBrains IDE
-.idea/
-
-# Unit test reports
-TEST*.xml
-
 # Generated by MacOS
 .DS_Store
-
-# Generated by Windows
-Thumbs.db
-
-# Applications
-*.app
-*.exe
-*.war
-
-# Large media files
-*.mp4
-*.tiff
-*.avi
-*.flv
-*.mov
-*.wmv
-

ReadME.MD

@@ -1,18 +1,102 @@
-# Kubernetes 1.21
+## 安装 Charm 2.x
-cs:~containers/charmed-kubernetes-657
+
+```bash
+sudo snap install charm --channel=2.x --classic
+```
+
+## 基础安装包
+
+```bash
+charm list-resources cs:~containers/etcd-583
+wget https://api.jujucharms.com/charmstore/v5/~containers/etcd-583/resource/etcd/3 -O etcd.tar.gz
+
+charm list-resources cs:~containers/easyrsa-373
+wget https://api.jujucharms.com/charmstore/v5/~containers/easyrsa-373/resource/easyrsa/5 -O easyrsa.tar.gz
+
+charm list-resources cs:~containers/kubernetes-master-990
+wget https://api.jujucharms.com/charmstore/v5/~containers/kubernetes-master-990/resource/cni-amd64/12 -O cni-amd64.tar.gz
+wget https://api.jujucharms.com/charmstore/v5/~containers/kubernetes-master-990/resource/cni-arm64/12 -O cni-arm64.tar.gz
+wget https://api.jujucharms.com/charmstore/v5/~containers/kubernetes-master-990/resource/cni-s390x/12 -O cni-s390x.tar.gz
+
+charm list-resources cs:~containers/kubernetes-worker-757
+wget https://api.jujucharms.com/charmstore/v5/~containers/kubernetes-worker-757/resource/cni-amd64/983 -O cni-amd64.tgz
+wget https://api.jujucharms.com/charmstore/v5/~containers/kubernetes-worker-757/resource/cni-arm64/974 -O cni-arm64.tgz
+wget https://api.jujucharms.com/charmstore/v5/~containers/kubernetes-worker-757/resource/cni-s390x/986 -O cni-s390x.tgz
+
+charm list-resources cs:~containers/calico-812
+wget https://api.jujucharms.com/charmstore/v5/~containers/calico-812/resource/calico/1027 -O calico.tgz
+wget https://api.jujucharms.com/charmstore/v5/~containers/calico-812/resource/calico-arm64/1026 -O calico-arm64.tgz
+wget https://api.jujucharms.com/charmstore/v5/~containers/calico-812/resource/calico-node-image/709 -O calico-node-image.tgz
+wget https://api.jujucharms.com/charmstore/v5/~containers/calico-812/resource/calico-upgrade/854 -O calico-upgrade.tgz
+wget https://api.jujucharms.com/charmstore/v5/~containers/calico-812/resource/calico-upgrade-arm64/854 -O calico-upgrade-arm64.tgz
+```
+
+## 向 controller 上传资源
+
+```bash
+juju attach-resource <charm-name> resource-name=<filepath>
+juju attach-resource calico calico=/home/sa/charm/calico/calico-amd64.tar.gz
+juju attach-resource calico calico-upgrade=/home/sa/charm/calico/calico-upgrade-amd64.tar.gz
+```
+
+## Snap Download
+
+```bash
+#!/bin/bash
+
+set -eux
+
+SNAP_CHANNEL="1.21/stable" # Need juju 2.9
+
+ALL_SNAPS="kube-apiserver kube-scheduler kube-controller-manager kube-proxy kubectl kubelet cdk-addons"
+MASTER_SNAPS="kube-apiserver kube-scheduler kube-controller-manager kube-proxy kubectl cdk-addons"
+WORKER_SNAPS="kube-proxy kubelet kubectl"
+
+# Download Juju 2.9
+snap download --channel=2.9 juju
+
+# Download latest snaps from designated channel
+for snap in $ALL_SNAPS
+do
+  snap download --channel=$SNAP_CHANNEL $snap
+done
+
+# Attach new snaps to master units
+for snap in $MASTER_SNAPS
+do
+  juju attach kubernetes-master $snap=`ls ${snap}_*.snap`
+done
+
+# Attach new snaps to worker units
+for snap in $WORKER_SNAPS
+do
+  juju attach kubernetes-worker $snap=`ls ${snap}_*.snap`
+done
+
+# Upgrade to new snaps on masters, one at a time
+for unit in `juju status --format json | jq -r '.applications|.["kubernetes-master"].units | keys[]'`
+do
+  juju run-action $unit upgrade --wait
+done
+
+# Upgrade to new snaps on workers, one at a time
+for unit in `juju status --format json | jq -r '.applications|.["kubernetes-worker"].units | keys[]'`
+do
+  juju run-action $unit upgrade --wait
+done
+```
+
+## Final Release
+
+需要手动做 Fix
 
 ```Bash
-charm pull cs:~containers/etcd-583
+https://raw.githubusercontent.com/charmed-kubernetes/bundle/main/releases/1.21/bundle.yaml
-charm pull cs:~containers/easyrsa-373
+charm pull cs:~containers/containerd-146
-charm pull cs:~containers/kubernetes-master-990
+charm pull cs:~containers/easyrsa-395
-charm pull cs:~containers/kubernetes-worker-757
+charm pull cs:~containers/etcd-607
-charm pull cs:~containers/containerd-119
+charm pull cs:~containers/kubernetes-master-1034
-charm pull cs:~containers/kata-108
+charm pull cs:~containers/kubernetes-worker-788
 charm pull cs:~containers/calico-812
-# Extend
+charm pull cs:~containers/kubeapi-load-balancer-814
-charm pull cs:~containers/kubeapi-load-balancer-786
-charm pull cs:~containers/keepalived-85
-charm pull cs:~containers/coredns-20
-charm pull cs:~containers/ubuntu-20
-charm pull cs:~containers/nrpe-75
 ```

juju.assert

@@ -160,22 +160,22 @@ zWxFMCTa3JM6Huie5fxz4HtwcaEm
 
 type: snap-revision
 authority-id: canonical
-snap-sha3-384: alG0MJImoc49osVZ8p-iZXF3vpcY9G8QpM-c55miUhSX8YEm-7l7fwUZN66KpWqQ
+snap-sha3-384: _9Yhf-johWCW7HM4DsODYwOVP0ItjwMSTT32tVFJjxkePUub11tsZbaH9qBvk0g6
 developer-id: canonical
 provenance: global-upload
 snap-id: e2CPHpB1fUxcKtCyJTsm5t3hN9axJ0yj
-snap-revision: 22345
+snap-revision: 23214
-snap-size: 97341440
+snap-size: 98295808
-timestamp: 2023-03-01T05:36:11.373973Z
+timestamp: 2023-06-01T23:15:27.858124Z
 sign-key-sha3-384: BWDEoaqyr25nF5SNCvEv2v7QnM9QsfCc0PBMYD_i2NGSQ32EF2d4D0hqUel3m8ul
 
-AcLBUgQAAQoABgUCY/7kSwAAYq4QABV7B3pacnEPzxSMbOQkKsoeAX4T8iWm05xT6hKM/kGcWR5n
+AcLBUgQAAQoABgUCZHkmjwAArRoQACY3KRJNWmFDHtPq3bkXZc37Bb+kSHyw0nDhhW9TQi5tqylz
-UzmVRCaGqNWjveHvckkbYLFT4E+rw8I2gBntZ8P68iA7Rj08Zn7v9lWGE5bJktaDe2GGjnC3ewI4
+VOvcERGJxoy8v2IR0Gmtl3jXs8t5ILYXfAkXbzOMNMZZL6y9CsrePsHLTcqX4ZUR//LuxqxcK7Sp
-vWp3GkgMVvYXIpRk46nhBjarSdFbF0xbxcFFqqNvzqK53T/7YNkF3A1p3ZUwlGtlDR6oGBxZiYba
+OYPuXAewEXcAtmwxh+c3G21isM22w0eEbgUJtHRLD+yBVfEFQYjLIzanxSkbjtEHamTgH2c7rrho
-q5uVQZ/Xii8olXxrXNth36O3MtZcNZPp9DyQRKjgEtGI0gT7YVv1JUYf/ziZTfXHPRNCo2OM+0at
+q2RacisQOBoZxZgk8u/X6K/9FMfyqp//V/WbfCPDQETDPJORG7XYsqDZDuHPDlKYc8NdtqGvR911
-wqs/4Lsbz+UoZ2o8YgVypywDYO0wSKvII+/VuOe6/b5thWHoG28Lk1gnC+sOcQWpRlD9vNmlpaeK
+behKqplQK+bI8OT6MmwU2Bzq20R2EsFLTQdQqM/h65PR7juafxDY1kyLLivzOnwh/ajixMgwJk5W
-DKhHozqOX2V4AtR/PWcLOJdCEQnk7jQIkLihMjtOMR2mOZwYs3/iyWZoi0VNrxFVmOo0yB4Uwl96
+pjW+VQcT6CcNLzY+mU8vngVq0kpj8ZBZCOti192JSQS1VOIOWL2B2tfpC10WzhOIRbHxR3AGmyqi
-PNvu8KBpdgfgWY5k05+YF6bwUGRx+mTaKSHsAmpb+csJ+26sGo5J7fSS/gZcUfbUt8HthEz82AG8
+9BWUCASjt5N5yQ5h/5Z2cGVBI+vxa830g3kZ7lvBgnR+Nr/RSBLum6lMX376qx+7HV7DP0BxWM2w
-27N27hvnVC+bxAYQpSQ2RrU96raW9y/Mkmj5EahGJIQJK3rTW1m5OGC9HBLAJs1gi0hVXf6yQAnA
+eiZG9iumCm7qZhip0qOCZhK1v3xxHM/O0UwbDCmjqxRQ+kKQe5peFnhu62fDviow3llaUfpvrHuN
-W7CN8lhq1xc9rhBC9PURzJxqhvJ4suQFKuoCgvx6JcYlIgYgVnqtxADBkrh09CNrE9YblgiFIJa7
+yUOGZ9f5R/4ZGyPqsXCFsoZVqr7fgtDftftnJo5m1IcD4/+R1DHeJdy6umI5GQ1VcLZO200zI+s/
-AhswMDksHC36NGzUW9rHaBvtZLq6
+yg6on+GSMfslUGyqq5sdjvtVlsF8