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
eddf98d2
Commit
eddf98d2
authored
Jun 12, 2017
by
Jeff Grafton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to kube-addon-manager:v6.4-beta.2: new kubectl and base images
parent
208c2538
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
4 deletions
+8
-4
CHANGELOG.md
cluster/addons/addon-manager/CHANGELOG.md
+4
-0
Makefile
cluster/addons/addon-manager/Makefile
+2
-2
kube-addon-manager.yaml
cluster/saltbase/salt/kube-addons/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 @
eddf98d2
### Version 6.4-beta.2 (Mon June 12 2017 Jeff Grafton <jgrafton@google.com>)
-
Update kubectl to v1.6.4.
-
Refresh base images.
### Version 6.4-beta.1 (Wed March 8 2017 Zihong Zheng <zihongz@google.com>)
### Version 6.4-beta.1 (Wed March 8 2017 Zihong Zheng <zihongz@google.com>)
-
Create EnsureExists class addons before Reconcile class addons.
-
Create EnsureExists class addons before Reconcile class addons.
...
...
cluster/addons/addon-manager/Makefile
View file @
eddf98d2
...
@@ -15,8 +15,8 @@
...
@@ -15,8 +15,8 @@
IMAGE
=
gcr.io/google-containers/kube-addon-manager
IMAGE
=
gcr.io/google-containers/kube-addon-manager
ARCH
?=
amd64
ARCH
?=
amd64
TEMP_DIR
:=
$(
shell
mktemp
-d
)
TEMP_DIR
:=
$(
shell
mktemp
-d
)
VERSION
=
v6.4-beta.
1
VERSION
=
v6.4-beta.
2
KUBECTL_VERSION
?=
v1.6.
0-beta.2
KUBECTL_VERSION
?=
v1.6.
4
ifeq
($(ARCH),amd64)
ifeq
($(ARCH),amd64)
BASEIMAGE
?=
bashell/alpine-bash
BASEIMAGE
?=
bashell/alpine-bash
...
...
cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml
View file @
eddf98d2
...
@@ -13,7 +13,7 @@ spec:
...
@@ -13,7 +13,7 @@ spec:
# - cluster/images/hyperkube/static-pods/addon-manager-singlenode.json
# - cluster/images/hyperkube/static-pods/addon-manager-singlenode.json
# - cluster/images/hyperkube/static-pods/addon-manager-multinode.json
# - cluster/images/hyperkube/static-pods/addon-manager-multinode.json
# - test/kubemark/resources/manifests/kube-addon-manager.yaml
# - test/kubemark/resources/manifests/kube-addon-manager.yaml
image
:
gcr.io/google-containers/kube-addon-manager:v6.4-beta.
1
image
:
gcr.io/google-containers/kube-addon-manager:v6.4-beta.
2
command
:
command
:
-
/bin/bash
-
/bin/bash
-
-c
-
-c
...
...
test/kubemark/resources/manifests/kube-addon-manager.yaml
View file @
eddf98d2
...
@@ -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:v6.4-beta.
1
image
:
{{
kube_docker_registry
}}
/kube-addon-manager:v6.4-beta.
2
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