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
b4c77eff
Unverified
Commit
b4c77eff
authored
Apr 15, 2019
by
Kubernetes Prow Robot
Committed by
GitHub
Apr 15, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #76427 from hprateek43/Fix-#75567
Fix for #75567
parents
d424bedc
47275cb6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
11 deletions
+0
-11
Dockerfile
cluster/addons/addon-manager/Dockerfile
+0
-1
README.md
cluster/addons/addon-manager/README.md
+0
-3
kube-addons.sh
cluster/addons/addon-manager/kube-addons.sh
+0
-3
namespace.yaml
cluster/addons/addon-manager/namespace.yaml
+0
-4
No files found.
cluster/addons/addon-manager/Dockerfile
View file @
b4c77eff
...
@@ -17,7 +17,6 @@ FROM BASEIMAGE
...
@@ -17,7 +17,6 @@ FROM BASEIMAGE
RUN
clean-install bash
RUN
clean-install bash
ADD
kube-addons.sh /opt/
ADD
kube-addons.sh /opt/
ADD
namespace.yaml /opt/
ADD
kubectl /usr/local/bin/
ADD
kubectl /usr/local/bin/
CMD
["/opt/kube-addons.sh"]
CMD
["/opt/kube-addons.sh"]
cluster/addons/addon-manager/README.md
View file @
b4c77eff
...
@@ -22,9 +22,6 @@ have this label but without `addonmanager.kubernetes.io/mode=EnsureExists` will
...
@@ -22,9 +22,6 @@ have this label but without `addonmanager.kubernetes.io/mode=EnsureExists` will
treated as "reconcile class addons" for now.
treated as "reconcile class addons" for now.
-
Resources under
`$ADDON_PATH`
need to have either one of these two labels.
-
Resources under
`$ADDON_PATH`
need to have either one of these two labels.
Otherwise it will be omitted.
Otherwise it will be omitted.
-
The above label and namespace rule does not stand for
`/opt/namespace.yaml`
and
resources under
`/etc/kubernetes/admission-controls/`
. addon-manager will attempt to
create them regardless during startup.
#### How to release
#### How to release
...
...
cluster/addons/addon-manager/kube-addons.sh
View file @
b4c77eff
...
@@ -210,9 +210,6 @@ function is_leader() {
...
@@ -210,9 +210,6 @@ function is_leader() {
# managed result of that. Start everything below that directory.
# managed result of that. Start everything below that directory.
log INFO
"== Kubernetes addon manager started at
$(
date
-Is
)
with ADDON_CHECK_INTERVAL_SEC=
${
ADDON_CHECK_INTERVAL_SEC
}
=="
log INFO
"== Kubernetes addon manager started at
$(
date
-Is
)
with ADDON_CHECK_INTERVAL_SEC=
${
ADDON_CHECK_INTERVAL_SEC
}
=="
# Create the namespace that will be used to host the cluster-level add-ons.
start_addon /opt/namespace.yaml 100 10
""
&
# Wait for the default service account to be created in the kube-system namespace.
# Wait for the default service account to be created in the kube-system namespace.
token_found
=
""
token_found
=
""
while
[
-z
"
${
token_found
}
"
]
;
do
while
[
-z
"
${
token_found
}
"
]
;
do
...
...
cluster/addons/addon-manager/namespace.yaml
deleted
100644 → 0
View file @
d424bedc
apiVersion
:
v1
kind
:
Namespace
metadata
:
name
:
kube-system
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