kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 2019-09-28 18:52:38 -04:00
parent 4c23a693af
commit 0f1880295f
No known key found for this signature in database
GPG Key ID: 8DEC5C8217494E37
8 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -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/ # Keep in sync with upup/models/cloudup/resources/addons/dns-controller/
DNS_CONTROLLER_TAG=1.15.0-alpha.1 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 KOPS_CONTROLLER_TAG=1.15.0-alpha.1
# Keep in sync with logic in get_workspace_status # Keep in sync with logic in get_workspace_status

6
upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template
View File

@ -6,7 +6,7 @@ metadata:
labels: labels:
k8s-addon: kops-controller.addons.k8s.io k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller k8s-app: kops-controller
version: v1.16.0-alpha.1 version: v1.15.0-alpha.1
spec: spec:
replicas: 1 replicas: 1
selector: selector:
@ -17,7 +17,7 @@ spec:
labels: labels:
k8s-addon: kops-controller.addons.k8s.io k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller k8s-app: kops-controller
version: v1.16.0-alpha.1 version: v1.15.0-alpha.1
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
spec: spec:
@ -31,7 +31,7 @@ spec:
serviceAccount: kops-controller serviceAccount: kops-controller
containers: containers:
- name: kops-controller - name: kops-controller
image: kope/kops-controller:1.14.0-alpha.1 image: kope/kops-controller:1.15.0-alpha.1
command: command:
{{ range $arg := KopsControllerArgv }} {{ range $arg := KopsControllerArgv }}
- "{{ $arg }}" - "{{ $arg }}"

2
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View File

@ -115,7 +115,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
{ {
key := "kops-controller.addons.k8s.io" key := "kops-controller.addons.k8s.io"
version := "1.16.0-alpha.1" version := "1.15.0-alpha.1"
{ {
location := key + "/k8s-1.16.yaml" location := key + "/k8s-1.16.yaml"

6
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/kops-controller.addons.k8s.io-k8s-1.16.yaml
View File

@ -4,7 +4,7 @@ metadata:
labels: labels:
k8s-addon: kops-controller.addons.k8s.io k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller k8s-app: kops-controller
version: v1.16.0-alpha.1 version: v1.15.0-alpha.1
name: kops-controller name: kops-controller
namespace: kube-system namespace: kube-system
spec: spec:
@ -19,7 +19,7 @@ spec:
labels: labels:
k8s-addon: kops-controller.addons.k8s.io k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller k8s-app: kops-controller
version: v1.16.0-alpha.1 version: v1.15.0-alpha.1
spec: spec:
containers: containers:
- command: - command:
@ -28,7 +28,7 @@ spec:
- --config=memfs://clusters.example.com/minimal.example.com - --config=memfs://clusters.example.com/minimal.example.com
- --metrics-addr=0 - --metrics-addr=0
- --v=2 - --v=2
image: kope/kops-controller:1.14.0-alpha.1 image: kope/kops-controller:1.15.0-alpha.1
name: kops-controller name: kops-controller
resources: resources:
requests: requests:

4
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
View File

@ -7,11 +7,11 @@ spec:
- id: k8s-1.16 - id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0' kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: de5108cf5c9a46a8dc13643428cbaddd0875b948 manifestHash: 736a3efe35f5edf14a8b7bd6ad723935e12f2a4d
name: kops-controller.addons.k8s.io name: kops-controller.addons.k8s.io
selector: selector:
k8s-addon: kops-controller.addons.k8s.io 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 - manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io name: core.addons.k8s.io

6
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/kops-controller.addons.k8s.io-k8s-1.16.yaml
View File

@ -4,7 +4,7 @@ metadata:
labels: labels:
k8s-addon: kops-controller.addons.k8s.io k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller k8s-app: kops-controller
version: v1.16.0-alpha.1 version: v1.15.0-alpha.1
name: kops-controller name: kops-controller
namespace: kube-system namespace: kube-system
spec: spec:
@ -19,7 +19,7 @@ spec:
labels: labels:
k8s-addon: kops-controller.addons.k8s.io k8s-addon: kops-controller.addons.k8s.io
k8s-app: kops-controller k8s-app: kops-controller
version: v1.16.0-alpha.1 version: v1.15.0-alpha.1
spec: spec:
containers: containers:
- command: - command:
@ -28,7 +28,7 @@ spec:
- --config=memfs://clusters.example.com/minimal.example.com - --config=memfs://clusters.example.com/minimal.example.com
- --metrics-addr=0 - --metrics-addr=0
- --v=2 - --v=2
image: kope/kops-controller:1.14.0-alpha.1 image: kope/kops-controller:1.15.0-alpha.1
name: kops-controller name: kops-controller
resources: resources:
requests: requests:

4
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
View File

@ -7,11 +7,11 @@ spec:
- id: k8s-1.16 - id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0' kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: de5108cf5c9a46a8dc13643428cbaddd0875b948 manifestHash: 736a3efe35f5edf14a8b7bd6ad723935e12f2a4d
name: kops-controller.addons.k8s.io name: kops-controller.addons.k8s.io
selector: selector:
k8s-addon: kops-controller.addons.k8s.io 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 - manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io name: core.addons.k8s.io

4
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
View File

@ -7,11 +7,11 @@ spec:
- id: k8s-1.16 - id: k8s-1.16
kubernetesVersion: '>=1.16.0-alpha.0' kubernetesVersion: '>=1.16.0-alpha.0'
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
manifestHash: de5108cf5c9a46a8dc13643428cbaddd0875b948 manifestHash: 736a3efe35f5edf14a8b7bd6ad723935e12f2a4d
name: kops-controller.addons.k8s.io name: kops-controller.addons.k8s.io
selector: selector:
k8s-addon: kops-controller.addons.k8s.io 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 - manifest: core.addons.k8s.io/v1.4.0.yaml
manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90 manifestHash: 3ffe9ac576f9eec72e2bdfbd2ea17d56d9b17b90
name: core.addons.k8s.io name: core.addons.k8s.io