Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
ea019ebb
Commit
ea019ebb
authored
Mar 08, 2017
by
Zihong Zheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
addon-manager: Create EnsureExists class addons before Reconcile class addons
parent
55c436fd
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
kube-addons.sh
cluster/addons/addon-manager/kube-addons.sh
+2
-2
No files found.
cluster/addons/addon-manager/kube-addons.sh
View file @
ea019ebb
...
@@ -207,8 +207,8 @@ annotate_addons Deployment
...
@@ -207,8 +207,8 @@ annotate_addons Deployment
# The new Deployments will not fight for pods created by old RCs with the same label because the additional `pod-template-hash` label.
# The new Deployments will not fight for pods created by old RCs with the same label because the additional `pod-template-hash` label.
# Apply will fail if some fields are modified but not are allowed, in that case should bump up addon version and name (e.g. handle externally).
# Apply will fail if some fields are modified but not are allowed, in that case should bump up addon version and name (e.g. handle externally).
log INFO
"== Executing apply to spin up new addon resources at
$(
date
-Is
)
=="
log INFO
"== Executing apply to spin up new addon resources at
$(
date
-Is
)
=="
reconcile_addons
false
ensure_addons
ensure_addons
reconcile_addons
false
# Wait for new addons to be spinned up before delete old resources
# Wait for new addons to be spinned up before delete old resources
log INFO
"== Wait for addons to be spinned up at
$(
date
-Is
)
=="
log INFO
"== Wait for addons to be spinned up at
$(
date
-Is
)
=="
...
@@ -221,8 +221,8 @@ log INFO "== Entering periodical apply loop at $(date -Is) =="
...
@@ -221,8 +221,8 @@ log INFO "== Entering periodical apply loop at $(date -Is) =="
while
true
;
do
while
true
;
do
start_sec
=
$(
date
+
"%s"
)
start_sec
=
$(
date
+
"%s"
)
# Only print stderr for the readability of logging
# Only print stderr for the readability of logging
reconcile_addons
true
ensure_addons
ensure_addons
reconcile_addons
true
end_sec
=
$(
date
+
"%s"
)
end_sec
=
$(
date
+
"%s"
)
len_sec
=
$((${
end_sec
}
-
${
start_sec
}))
len_sec
=
$((${
end_sec
}
-
${
start_sec
}))
# subtract the time passed from the sleep time
# subtract the time passed from the sleep time
...
...
Write
Preview
Markdown
is supported
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