github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #76427 from hprateek43/Fix-#75567 

Fix for #75567
k3s-v1.15.3
Kubernetes Prow Robot 2019-04-15 11:46:39 -07:00 committed by GitHub
parent d424bedc9b 47275cb6cd
commit b4c77eff33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/addons/addon-manager/Dockerfile
View File

@ -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"]

3
cluster/addons/addon-manager/README.md
View File

@ -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

3
cluster/addons/addon-manager/kube-addons.sh
View File

@ -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

4
cluster/addons/addon-manager/namespace.yaml
View File

@ -1,4 +0,0 @@
apiVersion: v1
kind: Namespace
metadata:
name: kube-system