Merge branch 'release/20210313.1.0'

hswong3i · hswong3i · commit abcf54caa674 · 2021-03-13T01:20:14.000+08:00
diff --git a/.ansible-lint b/.ansible-lint
@@ -0,0 +1,3 @@
+skip_list:
+  - no-handler  # Tasks that run when changed should likely be handlers
+  - unnamed-task  # All tasks should be named
diff --git a/playbooks/50-kubernetes-install.yml b/playbooks/50-kubernetes-install.yml
@@ -18,10 +18,6 @@
   remote_user: root
   become: true
   tasks:
-    - include_role:
-        name: operator_sdk
-      tags: operator_sdk
-
     - include_role:
         name: kubectl
       tags: kubectl
diff --git a/roles/ansible b/roles/ansible
@@ -1 +1 @@
-Subproject commit 5a90a759e047a0770d0444a8c7bac48191c2ca96
+Subproject commit 87e436630f1d0431e12097191f4f4c018c178a58
diff --git a/roles/bootstrap b/roles/bootstrap
@@ -1 +1 @@
-Subproject commit dcd8a9004f590aee31fd3025a2bd08195feaaee0
+Subproject commit 38f52db82d34df39db23f2945d5e4e6f8e52a4c0
diff --git a/roles/buildah b/roles/buildah
@@ -1 +1 @@
-Subproject commit 569c98a2f2869d0bf32f629439ec2fa290b5d6ef
+Subproject commit f338260c03307bf471fcd3c178fc56f4c156c295
diff --git a/roles/ceph_common b/roles/ceph_common
@@ -1 +1 @@
-Subproject commit 0f9eac3782cec6c68372afc70e66165f173208cd
+Subproject commit da322bff71331db0db25d9a3b2ac5f93fad7c6b8
diff --git a/roles/chrony b/roles/chrony
@@ -1 +1 @@
-Subproject commit 1b9e119cd90706e88c0d70eca3130ba5e6d3e583
+Subproject commit a5c19a66e9f4f47b6e1661fc4b46d569961ec6cd
diff --git a/roles/cni_plugins b/roles/cni_plugins
@@ -1 +1 @@
-Subproject commit 9c6fe6f5553285b5b9f6bc3cfc9387599b1ef690
+Subproject commit ee5c89ee2bba54805b012ed7b7ef2f465437f579
diff --git a/roles/conmon b/roles/conmon
@@ -1 +1 @@
-Subproject commit 3aa4db3dc7477d54079387220bc9f2362d62b42e
+Subproject commit d0d1e1791146b70e3e436679ff983fa0df784b25
diff --git a/roles/containers_common b/roles/containers_common
@@ -1 +1 @@
-Subproject commit 0c532911a7f0fe9671b013b638fd160671436907
+Subproject commit 8646d4b08e71cddccfad6d8d9ecc83bb0556e704
diff --git a/roles/cri_o b/roles/cri_o
@@ -1 +1 @@
-Subproject commit 37dd57bbc23322e4d30039b4b8d2f199988057b0
+Subproject commit 1dff7a39d94f00f3815184f72ff720f3e42815a2
diff --git a/roles/cri_tools b/roles/cri_tools
@@ -1 +1 @@
-Subproject commit bdd1e478e89b73d0c5927de94d903d1631040edb
+Subproject commit 4fce28f147e379e89c3c67b720af8e8cb384941d
diff --git a/roles/crun b/roles/crun
@@ -1 +1 @@
-Subproject commit 80bee9725a490e01d37c5dcacf7eb6a41935c70d
+Subproject commit 05e0e45b9fd4fc77eeb51bfde37d3109b5296416
diff --git a/roles/docker b/roles/docker
@@ -1 +1 @@
-Subproject commit e6cff7689705794765524a407e9bb6c9086d256f
+Subproject commit c1631dd1c45a516354c75aa344d262d99df46293
diff --git a/roles/etcd b/roles/etcd
@@ -1 +1 @@
-Subproject commit ef760aba3b6566f99e8bcd388445e1c71acbc968
+Subproject commit 63a4dbbd2c000f7e84a2125debdd1592b8715449
diff --git a/roles/git b/roles/git
@@ -1 +1 @@
-Subproject commit 5796dae7c723193b0f85405184521fbf4bbe24c5
+Subproject commit 612561830acff3e319c60376762587a6a0fc2ea3
diff --git a/roles/kata b/roles/kata
@@ -1 +1 @@
-Subproject commit 43ce65438f6b3b60adb52c92f620c910f0ceca28
+Subproject commit 2a9a32916cd38a1e8fbea7aa9df352b58b6a2a3b
diff --git a/roles/kernel b/roles/kernel
@@ -1 +1 @@
-Subproject commit f1a806865e4f5a5a0cb82b0c1fce7f4fca9391ce
+Subproject commit d2f8374fc4897184d24d77d5ae9c8bd3a25b62e9
diff --git a/roles/kube_master b/roles/kube_master
@@ -1 +1 @@
-Subproject commit 8216577b8bfc4a5e1b58da35008791f84a28f65a
+Subproject commit 0b416e8eade6858fcf34fc5282dda703df6259c0
diff --git a/roles/kube_node b/roles/kube_node
@@ -1 +1 @@
-Subproject commit c82e269e38b8adf63472c441136f25b0f87598ed
+Subproject commit bbe204e8638b55f611657aa839f585224c2ec756
diff --git a/roles/kubeadm b/roles/kubeadm
@@ -1 +1 @@
-Subproject commit 7989dd14dd5ce870f4817e6d3861a3af7806eb08
+Subproject commit e39c4d0951fe58609a8bb6b8ab6963129104dde3
diff --git a/roles/kubectl b/roles/kubectl
@@ -1 +1 @@
-Subproject commit b9d9ea1d0bff9864b4835d7075676c4713694dfc
+Subproject commit 39c950619ee37250656db23fe79bf7f2a8b90b62
diff --git a/roles/kubelet b/roles/kubelet
@@ -1 +1 @@
-Subproject commit 73fa86b0451a8ea5f41e4a0af0ee04289aa24c66
+Subproject commit e958eebdac56143e105578118bbcc0d57016ec17
diff --git a/roles/kubernetes_addon_manager b/roles/kubernetes_addon_manager
@@ -1 +1 @@
-Subproject commit a8511af390fd5e5228cddfe1c687691fe0318b41
+Subproject commit c168c8ce20c16d1e52ded5b4f9f8767a784fc64f
diff --git a/roles/kubernetes_cert_manager b/roles/kubernetes_cert_manager
@@ -1 +1 @@
-Subproject commit 88cbd5fde34a41c1c18fe037eaefc3378c93b8ee
+Subproject commit a235420b358877ad7be4bb40eb84997cd07ac611
diff --git a/roles/kubernetes_csi_cephfs b/roles/kubernetes_csi_cephfs
@@ -1 +1 @@
-Subproject commit f12689c549dbb92735c7c519c23f62e916e5863b
+Subproject commit 6f36d95cd1cc0adab40d3d05d6f6a88561d29b9f
diff --git a/roles/kubernetes_csi_hostpath b/roles/kubernetes_csi_hostpath
@@ -1 +1 @@
-Subproject commit fc8402f3abe7305a2c6b898481e36ae012845581
+Subproject commit 117a5d8c5eda9c297631b9d2fc0066d1e03ee40c
diff --git a/roles/kubernetes_csi_rbd b/roles/kubernetes_csi_rbd
@@ -1 +1 @@
-Subproject commit 50a5b1912c6e44329f3f3fbf1938e65c751eda3f
+Subproject commit 8984b14f5bd49d89e005a4dc593a858533bf345b
diff --git a/roles/kubernetes_dashboard b/roles/kubernetes_dashboard
@@ -1 +1 @@
-Subproject commit 8cfce519731960874085263f3a56caaf05b0a3e1
+Subproject commit 9783b92513bb8c130f07c01b85e2eb7d9dcfdb2e
diff --git a/roles/kubernetes_flannel b/roles/kubernetes_flannel
@@ -1 +1 @@
-Subproject commit fa243f4190c74276a9ce668957a5e3aa3e5f3167
+Subproject commit 0a33992c01a84367eb3c5e59b03be045de8863e6
diff --git a/roles/kubernetes_ingress_nginx b/roles/kubernetes_ingress_nginx
@@ -1 +1 @@
-Subproject commit 79b799d13fdddff4c4254b9105e49f6a808490a0
+Subproject commit ec70e1b35565100020b54a6876553a4234b15b2b
diff --git a/roles/kubernetes_metallb b/roles/kubernetes_metallb
@@ -1 +1 @@
-Subproject commit 18d17a87ae9d098f0eb9b9ad83e70dc8e6132404
+Subproject commit 8dc4d26778ef568c31b45d0c90e709f53beaaace
diff --git a/roles/kubernetes_registry b/roles/kubernetes_registry
@@ -1 +1 @@
-Subproject commit 212a00c63e3d3b72f0bfdde9c1b0683ad890a26d
+Subproject commit ad60dd9152b169c28da90aebe9d245496603860e
diff --git a/roles/kubernetes_weave b/roles/kubernetes_weave
@@ -1 +1 @@
-Subproject commit c51b2ed9f2cd671e2140918d8188e3ec92558952
+Subproject commit 1d14c015232dc18bfc9469ccb2fd3a56b69e431b
diff --git a/roles/locales b/roles/locales
@@ -1 +1 @@
-Subproject commit 54ddb299b3864c36ffbbf32d1e1f66f2bdb71461
+Subproject commit 8a26f6409f631157365396b141579205de2c46c0
diff --git a/roles/operator_sdk b/roles/operator_sdk
@@ -1 +1 @@
-Subproject commit b9f7a6376e7fb0382f2f82379922a5444fbac100
+Subproject commit 9853977d20e56fd887399815c2892f7a2adb3429
diff --git a/roles/podman b/roles/podman
@@ -1 +1 @@
-Subproject commit f6cf5de8d7ce71a8d218d64572f46a984076d550
+Subproject commit 9ee9318450cb4d0c22edec302997ab9bd5b7e8d6
diff --git a/roles/python b/roles/python
@@ -1 +1 @@
-Subproject commit 20371933086b9fd7deb251b537fb5bbc79e5cc69
+Subproject commit 449fda965966879438fbb8c526476a7bcf23faf8
diff --git a/roles/rclone b/roles/rclone
@@ -1 +1 @@
-Subproject commit 18064efc21ceb20a316e5c6c1b31844d0d7539ed
+Subproject commit 487dec8d7794c441b1f2967598496711a2912ade
diff --git a/roles/restic b/roles/restic
@@ -1 +1 @@
-Subproject commit 824875abd2819a685981d835e4fc0d7a41ee5b5f
+Subproject commit cab6ff91bfe3992ab1d4996dc774e3d768500533
diff --git a/roles/runc b/roles/runc
@@ -1 +1 @@
-Subproject commit ee2a8a9dd649f8c6b5d4b81e5eba4109715eb992
+Subproject commit b3deb5e9f8c73683708c4d6ee04184dd3259e871
diff --git a/roles/skopeo b/roles/skopeo
@@ -1 +1 @@
-Subproject commit 27f415a948610cee9f895c4ac139dbfdae511ee7
+Subproject commit a6fb38eceafcf56418c776a191d0dbb4f483a29b
diff --git a/roles/sshd b/roles/sshd
@@ -1 +1 @@
-Subproject commit 23a538c5e2258f63c969a4e71c9938005968a115
+Subproject commit 79cda7f703070a9b6d6a94760e15e679d349d263
diff --git a/roles/timezone b/roles/timezone
@@ -1 +1 @@
-Subproject commit b8fdeb5a70cd0d5611eb57dfe654c6cca5bf69fe
+Subproject commit 9da6ad66cfd67fd038f6c448c81f1a085e413778
diff --git a/roles/vim b/roles/vim
@@ -1 +1 @@
-Subproject commit 7c745e2cd3a0f744fa09002ef7d69d66e6de9a0c
+Subproject commit 70e3c9abd68cc68882c2dc8b4f2acc76cb35486f
diff --git a/scripts/restic-cephfs b/scripts/restic-cephfs
@@ -21,7 +21,7 @@ LOG_FILE="/var/log/${0##*/}.log"
 TIMESTAMP=${TIMESTAMP:-$(date +%s)}
 
 CEPHFS_DIR=${CEPHFS_DIR:-"/mnt/ceph"}
-CEPHFS_SNAPSHOT_DIR=${CEPHFS_SNAPSHOT_DIR:-"$CEPHFS_DIR/.snap/$TIMESTAMP"}
+CEPHFS_SNAPSHOT_DIR=${CEPHFS_SNAPSHOT_DIR:-"$CEPHFS_DIR/.snap/${0##*/}"}
 
 RESTIC_OPTS=${RESTIC_OPTS:-"--verbose"}
 RESTIC_REPOSITORY=${RESTIC_REPOSITORY:-"/root/backups/restic/ceph"}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+skip_list:`
	`2`	`+ - no-handler # Tasks that run when changed should likely be handlers`
	`3`	`+ - unnamed-task # All tasks should be named`