mirror of https://github.com/kubernetes/kops.git
kops-controller version should match version of kops
So (counterintuitively) we set it to 1.15.0-alpha.1, because that is the version on the master branch.
This commit is contained in:
Justin SB
parent
4c23a693af
commit
0f1880295f
1
Makefile
1
Makefile
|
|
@ -56,6 +56,7 @@ unexport SKIP_REGION_CHECK S3_ACCESS_KEY_ID S3_ENDPOINT S3_REGION S3_SECRET_ACCE
|
|||
|
||||
# Keep in sync with upup/models/cloudup/resources/addons/dns-controller/
|
||||
DNS_CONTROLLER_TAG=1.15.0-alpha.1
|
||||
# Keep in sync with upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/
|
||||
KOPS_CONTROLLER_TAG=1.15.0-alpha.1
|
||||
|
||||
# Keep in sync with logic in get_workspace_status
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ metadata:
|
|||
labels:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
k8s-app: kops-controller
|
||||
version: v1.16.0-alpha.1
|
||||
version: v1.15.0-alpha.1
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
|
|
@ -17,7 +17,7 @@ spec:
|
|||
labels:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
k8s-app: kops-controller
|
||||
version: v1.16.0-alpha.1
|
||||
version: v1.15.0-alpha.1
|
||||
annotations:
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||
spec:
|
||||
|
|
@ -31,7 +31,7 @@ spec:
|
|||
serviceAccount: kops-controller
|
||||
containers:
|
||||
- name: kops-controller
|
||||
image: kope/kops-controller:1.14.0-alpha.1
|
||||
image: kope/kops-controller:1.15.0-alpha.1
|
||||
command:
|
||||
{{ range $arg := KopsControllerArgv }}
|
||||
- "{{ $arg }}"
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
|
|||
|
||||
{
|
||||
key := "kops-controller.addons.k8s.io"
|
||||
version := "1.16.0-alpha.1"
|
||||
version := "1.15.0-alpha.1"
|
||||
|
||||
{
|
||||
location := key + "/k8s-1.16.yaml"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ metadata:
|
|||
labels:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
k8s-app: kops-controller
|
||||
version: v1.16.0-alpha.1
|
||||
version: v1.15.0-alpha.1
|
||||
name: kops-controller
|
||||
namespace: kube-system
|
||||
spec:
|
||||
|
|
@ -19,7 +19,7 @@ spec:
|
|||
labels:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
k8s-app: kops-controller
|
||||
version: v1.16.0-alpha.1
|
||||
version: v1.15.0-alpha.1
|
||||
spec:
|
||||
containers:
|
||||
- command:
|
||||
|
|
@ -28,7 +28,7 @@ spec:
|
|||
- --config=memfs://clusters.example.com/minimal.example.com
|
||||
- --metrics-addr=0
|
||||
- --v=2
|
||||
image: kope/kops-controller:1.14.0-alpha.1
|
||||
image: kope/kops-controller:1.15.0-alpha.1
|
||||
name: kops-controller
|
||||
resources:
|
||||
requests:
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@ spec:
|
|||
- id: k8s-1.16
|
||||
kubernetesVersion: '>=1.16.0-alpha.0'
|
||||
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
|
||||
manifestHash: de5108cf5c9a46a8dc13643428cbaddd0875b948
|
||||
manifestHash: 736a3efe35f5edf14a8b7bd6ad723935e12f2a4d
|
||||
name: kops-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
version: 1.16.0-alpha.1
|
||||
version: 1.15.0-alpha.1
|
||||
- manifest: core.addons.k8s.io/v1.4.0.yaml
|
||||
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
|
||||
name: core.addons.k8s.io
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ metadata:
|
|||
labels:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
k8s-app: kops-controller
|
||||
version: v1.16.0-alpha.1
|
||||
version: v1.15.0-alpha.1
|
||||
name: kops-controller
|
||||
namespace: kube-system
|
||||
spec:
|
||||
|
|
@ -19,7 +19,7 @@ spec:
|
|||
labels:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
k8s-app: kops-controller
|
||||
version: v1.16.0-alpha.1
|
||||
version: v1.15.0-alpha.1
|
||||
spec:
|
||||
containers:
|
||||
- command:
|
||||
|
|
@ -28,7 +28,7 @@ spec:
|
|||
- --config=memfs://clusters.example.com/minimal.example.com
|
||||
- --metrics-addr=0
|
||||
- --v=2
|
||||
image: kope/kops-controller:1.14.0-alpha.1
|
||||
image: kope/kops-controller:1.15.0-alpha.1
|
||||
name: kops-controller
|
||||
resources:
|
||||
requests:
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@ spec:
|
|||
- id: k8s-1.16
|
||||
kubernetesVersion: '>=1.16.0-alpha.0'
|
||||
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
|
||||
manifestHash: de5108cf5c9a46a8dc13643428cbaddd0875b948
|
||||
manifestHash: 736a3efe35f5edf14a8b7bd6ad723935e12f2a4d
|
||||
name: kops-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
version: 1.16.0-alpha.1
|
||||
version: 1.15.0-alpha.1
|
||||
- manifest: core.addons.k8s.io/v1.4.0.yaml
|
||||
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
|
||||
name: core.addons.k8s.io
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@ spec:
|
|||
- id: k8s-1.16
|
||||
kubernetesVersion: '>=1.16.0-alpha.0'
|
||||
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
|
||||
manifestHash: de5108cf5c9a46a8dc13643428cbaddd0875b948
|
||||
manifestHash: 736a3efe35f5edf14a8b7bd6ad723935e12f2a4d
|
||||
name: kops-controller.addons.k8s.io
|
||||
selector:
|
||||
k8s-addon: kops-controller.addons.k8s.io
|
||||
version: 1.16.0-alpha.1
|
||||
version: 1.15.0-alpha.1
|
||||
- manifest: core.addons.k8s.io/v1.4.0.yaml
|
||||
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
|
||||
name: core.addons.k8s.io
|
||||
|
|
|
|||
Loading…
Reference in New Issue