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
677f740a
Commit
677f740a
authored
Feb 20, 2018
by
Zihong Zheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bump addon-manager to v8.6
parent
a6b8c063
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
6 deletions
+9
-6
CHANGELOG.md
cluster/addons/addon-manager/CHANGELOG.md
+4
-0
Makefile
cluster/addons/addon-manager/Makefile
+2
-2
README.md
cluster/addons/addon-manager/README.md
+0
-1
kube-addons.sh
cluster/addons/addon-manager/kube-addons.sh
+1
-1
kube-addon-manager.yaml
cluster/gce/manifests/kube-addon-manager.yaml
+1
-1
kube-addon-manager.yaml
test/kubemark/resources/manifests/kube-addon-manager.yaml
+1
-1
No files found.
cluster/addons/addon-manager/CHANGELOG.md
View file @
677f740a
### Version 8.6 (Tue February 20 2018 Zihong Zheng <zihongz@google.com>)
-
Allow reconcile/ensure loop to work with resource under non-kube-system namespace.
-
Update kubectl to v1.9.3.
### Version 8.4 (Thu November 30 2017 zou nengren @zouyee)
### Version 8.4 (Thu November 30 2017 zou nengren @zouyee)
-
Update kubectl to v1.8.4.
-
Update kubectl to v1.8.4.
...
...
cluster/addons/addon-manager/Makefile
View file @
677f740a
...
@@ -15,8 +15,8 @@
...
@@ -15,8 +15,8 @@
IMAGE
=
staging-k8s.gcr.io/kube-addon-manager
IMAGE
=
staging-k8s.gcr.io/kube-addon-manager
ARCH
?=
amd64
ARCH
?=
amd64
TEMP_DIR
:=
$(
shell
mktemp
-d
)
TEMP_DIR
:=
$(
shell
mktemp
-d
)
VERSION
=
v8.
5
VERSION
=
v8.
6
KUBECTL_VERSION
?=
v1.
8.4
KUBECTL_VERSION
?=
v1.
9.3
ifeq
($(ARCH),amd64)
ifeq
($(ARCH),amd64)
BASEIMAGE
?=
bashell/alpine-bash
BASEIMAGE
?=
bashell/alpine-bash
...
...
cluster/addons/addon-manager/README.md
View file @
677f740a
...
@@ -21,7 +21,6 @@ In future release (after one year), Addon Manager may not respect it anymore. Ad
...
@@ -21,7 +21,6 @@ In future release (after one year), Addon Manager may not respect it anymore. Ad
have this label but without
`addonmanager.kubernetes.io/mode=EnsureExists`
will be
have this label but without
`addonmanager.kubernetes.io/mode=EnsureExists`
will be
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.
Meanwhile namespaced resources need to be in
`kube-system`
namespace.
Otherwise it will be omitted.
Otherwise it will be omitted.
-
The above label and namespace rule does not stand for
`/opt/namespace.yaml`
and
-
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
resources under
`/etc/kubernetes/admission-controls/`
. addon-manager will attempt to
...
...
cluster/addons/addon-manager/kube-addons.sh
View file @
677f740a
...
@@ -107,7 +107,7 @@ function create_resource_from_string() {
...
@@ -107,7 +107,7 @@ function create_resource_from_string() {
local
-r
config_name
=
$4
;
local
-r
config_name
=
$4
;
local
-r
namespace
=
$5
;
local
-r
namespace
=
$5
;
while
[
${
tries
}
-gt
0
]
;
do
while
[
${
tries
}
-gt
0
]
;
do
echo
"
${
config_string
}
"
|
${
KUBECTL
}
${
KUBECTL_OPTS
}
apply
-f
-
&&
\
echo
"
${
config_string
}
"
|
${
KUBECTL
}
${
KUBECTL_OPTS
}
--namespace
=
"
${
namespace
}
"
apply
-f
-
&&
\
log INFO
"== Successfully started
${
config_name
}
in namespace
${
namespace
}
at
$(
date
-Is
)
"
&&
\
log INFO
"== Successfully started
${
config_name
}
in namespace
${
namespace
}
at
$(
date
-Is
)
"
&&
\
return
0
;
return
0
;
let
tries
=
tries-1
;
let
tries
=
tries-1
;
...
...
cluster/gce/manifests/kube-addon-manager.yaml
View file @
677f740a
...
@@ -13,7 +13,7 @@ spec:
...
@@ -13,7 +13,7 @@ spec:
-
name
:
kube-addon-manager
-
name
:
kube-addon-manager
# When updating version also bump it in:
# When updating version also bump it in:
# - test/kubemark/resources/manifests/kube-addon-manager.yaml
# - test/kubemark/resources/manifests/kube-addon-manager.yaml
image
:
k8s.gcr.io/kube-addon-manager:v8.
5
image
:
k8s.gcr.io/kube-addon-manager:v8.
6
command
:
command
:
-
/bin/bash
-
/bin/bash
-
-c
-
-c
...
...
test/kubemark/resources/manifests/kube-addon-manager.yaml
View file @
677f740a
...
@@ -9,7 +9,7 @@ spec:
...
@@ -9,7 +9,7 @@ spec:
hostNetwork
:
true
hostNetwork
:
true
containers
:
containers
:
-
name
:
kube-addon-manager
-
name
:
kube-addon-manager
image
:
{{
kube_docker_registry
}}
/kube-addon-manager:v8.
5
image
:
{{
kube_docker_registry
}}
/kube-addon-manager:v8.
6
command
:
command
:
-
/bin/bash
-
/bin/bash
-
-c
-
-c
...
...
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