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
2c8e8982
Commit
2c8e8982
authored
Feb 16, 2017
by
Zihong Zheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update kubectl in addon-manager to use HPA in autoscaling/v1 instead of extensions/v1beta1
parent
30e8953f
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
10 deletions
+10
-10
CHANGELOG.md
cluster/addons/addon-manager/CHANGELOG.md
+3
-0
Makefile
cluster/addons/addon-manager/Makefile
+2
-2
addon-manager-multinode.json
...images/hyperkube/static-pods/addon-manager-multinode.json
+1
-1
addon-manager-singlenode.json
...mages/hyperkube/static-pods/addon-manager-singlenode.json
+1
-1
kube-addon-manager.yaml
cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml
+2
-1
kube-addon-manager.yaml
test/kubemark/resources/manifests/kube-addon-manager.yaml
+1
-5
No files found.
cluster/addons/addon-manager/CHANGELOG.md
View file @
2c8e8982
### Version 6.4-alpha.2 (Wed February 16 2017 Zihong Zheng <zihongz@google.com>)
-
Update kubectl to v1.6.0-alpha.2 to use HPA in autoscaling/v1 instead of extensions/v1beta1.
### Version 6.4-alpha.1 (Wed February 1 2017 Zihong Zheng <zihongz@google.com>)
### Version 6.4-alpha.1 (Wed February 1 2017 Zihong Zheng <zihongz@google.com>)
-
Update kubectl to v1.6.0-alpha.1 for supporting optional ConfigMap.
-
Update kubectl to v1.6.0-alpha.1 for supporting optional ConfigMap.
...
...
cluster/addons/addon-manager/Makefile
View file @
2c8e8982
...
@@ -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-alpha.
1
VERSION
=
v6.4-alpha.
2
KUBECTL_VERSION
?=
v1.6.0-alpha.
1
KUBECTL_VERSION
?=
v1.6.0-alpha.
2
ifeq
($(ARCH),amd64)
ifeq
($(ARCH),amd64)
BASEIMAGE
?=
bashell/alpine-bash
BASEIMAGE
?=
bashell/alpine-bash
...
...
cluster/images/hyperkube/static-pods/addon-manager-multinode.json
View file @
2c8e8982
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
"containers"
:
[
"containers"
:
[
{
{
"name"
:
"kube-addon-manager"
,
"name"
:
"kube-addon-manager"
,
"image"
:
"REGISTRY/kube-addon-manager-ARCH:v6.4-alpha.
1
"
,
"image"
:
"REGISTRY/kube-addon-manager-ARCH:v6.4-alpha.
2
"
,
"resources"
:
{
"resources"
:
{
"requests"
:
{
"requests"
:
{
"cpu"
:
"5m"
,
"cpu"
:
"5m"
,
...
...
cluster/images/hyperkube/static-pods/addon-manager-singlenode.json
View file @
2c8e8982
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
"containers"
:
[
"containers"
:
[
{
{
"name"
:
"kube-addon-manager"
,
"name"
:
"kube-addon-manager"
,
"image"
:
"REGISTRY/kube-addon-manager-ARCH:v6.4-alpha.
1
"
,
"image"
:
"REGISTRY/kube-addon-manager-ARCH:v6.4-alpha.
2
"
,
"resources"
:
{
"resources"
:
{
"requests"
:
{
"requests"
:
{
"cpu"
:
"5m"
,
"cpu"
:
"5m"
,
...
...
cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml
View file @
2c8e8982
...
@@ -12,7 +12,8 @@ spec:
...
@@ -12,7 +12,8 @@ spec:
# When updating version also bump it in:
# When updating version also bump it in:
# - 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
image
:
gcr.io/google-containers/kube-addon-manager:v6.4-alpha.1
# - test/kubemark/resources/manifests/kube-addon-manager.yaml
image
:
gcr.io/google-containers/kube-addon-manager:v6.4-alpha.2
command
:
command
:
-
/bin/bash
-
/bin/bash
-
-c
-
-c
...
...
test/kubemark/resources/manifests/kube-addon-manager.yaml
View file @
2c8e8982
...
@@ -9,11 +9,7 @@ spec:
...
@@ -9,11 +9,7 @@ spec:
hostNetwork
:
true
hostNetwork
:
true
containers
:
containers
:
-
name
:
kube-addon-manager
-
name
:
kube-addon-manager
# When updating version also bump it in:
image
:
{{
kube_docker_registry
}}
/kube-addon-manager:v6.4-alpha.2
# - cluster/images/hyperkube/static-pods/addon-manager-singlenode.json
# - cluster/images/hyperkube/static-pods/addon-manager-multinode.json
# - cluster/gce/coreos/kube-manifests/kube-addon-manager.yaml
image
:
{{
kube_docker_registry
}}
/kube-addon-manager:v6.4-alpha.1
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