Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Breeze
Commits
c48d1cc4
Commit
c48d1cc4
authored
5 years ago
by
Alan Peng
Browse files
Options
Download
Email Patches
Plain Diff
Update K8s upgrading scripts
parent
cf6c6508
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
kubernetes-playbook/version/template/upgrade/redhat-centos/upgrade_first_master_node.sh.j2
+1
-1
...ate/upgrade/redhat-centos/upgrade_first_master_node.sh.j2
kubernetes-playbook/version/template/upgrade/redhat-centos/upgrade_other_master_nodes.sh.j2
+1
-1
...te/upgrade/redhat-centos/upgrade_other_master_nodes.sh.j2
kubernetes-playbook/version/template/upgrade/redhat-centos/upgrade_worker_nodes.sh.j2
+1
-1
...template/upgrade/redhat-centos/upgrade_worker_nodes.sh.j2
kubernetes-playbook/version/template/upgrade/ubuntu/upgrade_first_master_node.sh.j2
+1
-1
...n/template/upgrade/ubuntu/upgrade_first_master_node.sh.j2
kubernetes-playbook/version/template/upgrade/ubuntu/upgrade_other_master_nodes.sh.j2
+1
-1
.../template/upgrade/ubuntu/upgrade_other_master_nodes.sh.j2
kubernetes-playbook/version/template/upgrade/ubuntu/upgrade_worker_nodes.sh.j2
+1
-1
...ersion/template/upgrade/ubuntu/upgrade_worker_nodes.sh.j2
with
6 additions
and
6 deletions
+6
-6
kubernetes-playbook/version/template/upgrade/redhat-centos/upgrade_first_master_node.sh.j2
+
1
-
1
View file @
c48d1cc4
...
@@ -5,7 +5,7 @@ current_k8s_server_version=`kubectl version |grep "Server Version" |awk '{print
...
@@ -5,7 +5,7 @@ current_k8s_server_version=`kubectl version |grep "Server Version" |awk '{print
current_k8s_client_version
=
`
kubectl version |grep
"Client Version"
|awk
'{print $5}'
|awk
-F
':'
'{print $2}'
|awk
-F
'"'
'{print $2}'
`
current_k8s_client_version
=
`
kubectl version |grep
"Client Version"
|awk
'{print $5}'
|awk
-F
':'
'{print $2}'
|awk
-F
'"'
'{print $2}'
`
function
version_gt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
|
head
-n
1
)
"
!=
"
$1
"
;
}
function
version_gt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
|
head
-n
1
)
"
!=
"
$1
"
;
}
function
version_lt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
-r
|
head
-n
1
)
"
!=
"
$1
"
;
}
function
version_lt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
-r
|
head
-n
1
)
"
!=
"
$1
"
;
}
if
(
version_lt
${
current_server_k8s_version
}
${
long_k8s_version
}
)
&&
(
version_lt
${
current_client_k8s_version
}
${
long_k8s_version
}
)
;
then
if
(
version_lt
${
current_server_k8s_version
}
${
long_k8s_version
}
)
||
(
version_lt
${
current_client_k8s_version
}
${
long_k8s_version
}
)
;
then
yum clean all
yum clean all
yum
install
-y
--disablerepo
=
*
--enablerepo
=
wise2c kubeadm-
${
short_k8s_version
}
-0
--disableexcludes
=
kubernetes
yum
install
-y
--disablerepo
=
*
--enablerepo
=
wise2c kubeadm-
${
short_k8s_version
}
-0
--disableexcludes
=
kubernetes
kubeadm upgrade apply
-y
${
long_k8s_version
}
kubeadm upgrade apply
-y
${
long_k8s_version
}
...
...
This diff is collapsed.
Click to expand it.
kubernetes-playbook/version/template/upgrade/redhat-centos/upgrade_other_master_nodes.sh.j2
+
1
-
1
View file @
c48d1cc4
...
@@ -6,7 +6,7 @@ if [ ! -f "./first_master_node.log" ];then
...
@@ -6,7 +6,7 @@ if [ ! -f "./first_master_node.log" ];then
current_k8s_client_version
=
`
kubectl version |grep
"Client Version"
|awk
'{print $5}'
|awk
-F
':'
'{print $2}'
|awk
-F
'"'
'{print $2}'
`
current_k8s_client_version
=
`
kubectl version |grep
"Client Version"
|awk
'{print $5}'
|awk
-F
':'
'{print $2}'
|awk
-F
'"'
'{print $2}'
`
function
version_gt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
|
head
-n
1
)
"
!=
"
$1
"
;
}
function
version_gt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
|
head
-n
1
)
"
!=
"
$1
"
;
}
function
version_lt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
-r
|
head
-n
1
)
"
!=
"
$1
"
;
}
function
version_lt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
-r
|
head
-n
1
)
"
!=
"
$1
"
;
}
if
(
version_lt
${
current_server_k8s_version
}
${
long_k8s_version
}
)
&&
(
version_lt
${
current_client_k8s_version
}
${
long_k8s_version
}
)
;
then
if
(
version_lt
${
current_server_k8s_version
}
${
long_k8s_version
}
)
||
(
version_lt
${
current_client_k8s_version
}
${
long_k8s_version
}
)
;
then
yum clean all
yum clean all
yum
install
-y
--disablerepo
=
*
--enablerepo
=
wise2c kubeadm-
${
short_k8s_version
}
-0
--disableexcludes
=
kubernetes
yum
install
-y
--disablerepo
=
*
--enablerepo
=
wise2c kubeadm-
${
short_k8s_version
}
-0
--disableexcludes
=
kubernetes
kubeadm upgrade node experimental-control-plane
kubeadm upgrade node experimental-control-plane
...
...
This diff is collapsed.
Click to expand it.
kubernetes-playbook/version/template/upgrade/redhat-centos/upgrade_worker_nodes.sh.j2
+
1
-
1
View file @
c48d1cc4
...
@@ -5,7 +5,7 @@ current_k8s_server_version=`kubectl version |grep "Server Version" |awk '{print
...
@@ -5,7 +5,7 @@ current_k8s_server_version=`kubectl version |grep "Server Version" |awk '{print
current_k8s_client_version
=
`
kubectl version |grep
"Client Version"
|awk
'{print $5}'
|awk
-F
':'
'{print $2}'
|awk
-F
'"'
'{print $2}'
`
current_k8s_client_version
=
`
kubectl version |grep
"Client Version"
|awk
'{print $5}'
|awk
-F
':'
'{print $2}'
|awk
-F
'"'
'{print $2}'
`
function
version_gt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
|
head
-n
1
)
"
!=
"
$1
"
;
}
function
version_gt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
|
head
-n
1
)
"
!=
"
$1
"
;
}
function
version_lt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
-r
|
head
-n
1
)
"
!=
"
$1
"
;
}
function
version_lt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
-r
|
head
-n
1
)
"
!=
"
$1
"
;
}
if
(
version_lt
${
current_server_k8s_version
}
${
long_k8s_version
}
)
&&
(
version_lt
${
current_client_k8s_version
}
${
long_k8s_version
}
)
;
then
if
(
version_lt
${
current_server_k8s_version
}
${
long_k8s_version
}
)
||
(
version_lt
${
current_client_k8s_version
}
${
long_k8s_version
}
)
;
then
yum clean all
yum clean all
yum
install
-y
--disablerepo
=
*
--enablerepo
=
wise2c kubeadm-
${
short_k8s_version
}
-0
--disableexcludes
=
kubernetes
yum
install
-y
--disablerepo
=
*
--enablerepo
=
wise2c kubeadm-
${
short_k8s_version
}
-0
--disableexcludes
=
kubernetes
kubectl drain
`
hostname
`
--ignore-daemonsets
kubectl drain
`
hostname
`
--ignore-daemonsets
...
...
This diff is collapsed.
Click to expand it.
kubernetes-playbook/version/template/upgrade/ubuntu/upgrade_first_master_node.sh.j2
+
1
-
1
View file @
c48d1cc4
...
@@ -5,7 +5,7 @@ current_k8s_server_version=`kubectl version |grep "Server Version" |awk '{print
...
@@ -5,7 +5,7 @@ current_k8s_server_version=`kubectl version |grep "Server Version" |awk '{print
current_k8s_client_version
=
`
kubectl version |grep
"Client Version"
|awk
'{print $5}'
|awk
-F
':'
'{print $2}'
|awk
-F
'"'
'{print $2}'
`
current_k8s_client_version
=
`
kubectl version |grep
"Client Version"
|awk
'{print $5}'
|awk
-F
':'
'{print $2}'
|awk
-F
'"'
'{print $2}'
`
function
version_gt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
|
head
-n
1
)
"
!=
"
$1
"
;
}
function
version_gt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
|
head
-n
1
)
"
!=
"
$1
"
;
}
function
version_lt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
-r
|
head
-n
1
)
"
!=
"
$1
"
;
}
function
version_lt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
-r
|
head
-n
1
)
"
!=
"
$1
"
;
}
if
(
version_lt
${
current_server_k8s_version
}
${
long_k8s_version
}
)
&&
(
version_lt
${
current_client_k8s_version
}
${
long_k8s_version
}
)
;
then
if
(
version_lt
${
current_server_k8s_version
}
${
long_k8s_version
}
)
||
(
version_lt
${
current_client_k8s_version
}
${
long_k8s_version
}
)
;
then
apt-get update
apt-get update
apt-get
install
-y
kubeadm
--disableexcludes
=
kubernetes
apt-get
install
-y
kubeadm
--disableexcludes
=
kubernetes
kubeadm upgrade apply
-y
${
long_k8s_version
}
kubeadm upgrade apply
-y
${
long_k8s_version
}
...
...
This diff is collapsed.
Click to expand it.
kubernetes-playbook/version/template/upgrade/ubuntu/upgrade_other_master_nodes.sh.j2
+
1
-
1
View file @
c48d1cc4
...
@@ -6,7 +6,7 @@ if [ ! -f "./first_master_node.log" ];then
...
@@ -6,7 +6,7 @@ if [ ! -f "./first_master_node.log" ];then
current_k8s_client_version
=
`
kubectl version |grep
"Client Version"
|awk
'{print $5}'
|awk
-F
':'
'{print $2}'
|awk
-F
'"'
'{print $2}'
`
current_k8s_client_version
=
`
kubectl version |grep
"Client Version"
|awk
'{print $5}'
|awk
-F
':'
'{print $2}'
|awk
-F
'"'
'{print $2}'
`
function
version_gt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
|
head
-n
1
)
"
!=
"
$1
"
;
}
function
version_gt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
|
head
-n
1
)
"
!=
"
$1
"
;
}
function
version_lt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
-r
|
head
-n
1
)
"
!=
"
$1
"
;
}
function
version_lt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
-r
|
head
-n
1
)
"
!=
"
$1
"
;
}
if
(
version_lt
${
current_server_k8s_version
}
${
long_k8s_version
}
)
&&
(
version_lt
${
current_client_k8s_version
}
${
long_k8s_version
}
)
;
then
if
(
version_lt
${
current_server_k8s_version
}
${
long_k8s_version
}
)
||
(
version_lt
${
current_client_k8s_version
}
${
long_k8s_version
}
)
;
then
apt-get update
apt-get update
apt-get
install
-y
kubeadm
--disableexcludes
=
kubernetes
apt-get
install
-y
kubeadm
--disableexcludes
=
kubernetes
kubeadm upgrade node experimental-control-plane
kubeadm upgrade node experimental-control-plane
...
...
This diff is collapsed.
Click to expand it.
kubernetes-playbook/version/template/upgrade/ubuntu/upgrade_worker_nodes.sh.j2
+
1
-
1
View file @
c48d1cc4
...
@@ -5,7 +5,7 @@ current_k8s_server_version=`kubectl version |grep "Server Version" |awk '{print
...
@@ -5,7 +5,7 @@ current_k8s_server_version=`kubectl version |grep "Server Version" |awk '{print
current_k8s_client_version
=
`
kubectl version |grep
"Client Version"
|awk
'{print $5}'
|awk
-F
':'
'{print $2}'
|awk
-F
'"'
'{print $2}'
`
current_k8s_client_version
=
`
kubectl version |grep
"Client Version"
|awk
'{print $5}'
|awk
-F
':'
'{print $2}'
|awk
-F
'"'
'{print $2}'
`
function
version_gt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
|
head
-n
1
)
"
!=
"
$1
"
;
}
function
version_gt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
|
head
-n
1
)
"
!=
"
$1
"
;
}
function
version_lt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
-r
|
head
-n
1
)
"
!=
"
$1
"
;
}
function
version_lt
()
{
test
"
$(
echo
"
$@
"
|
tr
" "
"
\n
"
|
sort
-V
-r
|
head
-n
1
)
"
!=
"
$1
"
;
}
if
(
version_lt
${
current_server_k8s_version
}
${
long_k8s_version
}
)
&&
(
version_lt
${
current_client_k8s_version
}
${
long_k8s_version
}
)
;
then
if
(
version_lt
${
current_server_k8s_version
}
${
long_k8s_version
}
)
||
(
version_lt
${
current_client_k8s_version
}
${
long_k8s_version
}
)
;
then
apt-get update
apt-get update
apt-get
install
-y
kubeadm
--disableexcludes
=
kubernetes
apt-get
install
-y
kubeadm
--disableexcludes
=
kubernetes
kubectl drain
`
hostname
`
--ignore-daemonsets
kubectl drain
`
hostname
`
--ignore-daemonsets
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help