Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Kops
Commits
b7c25f9a
Commit
b7c25f9a
authored
5 years ago
by
Justin SB
Browse files
Options
Download
Email Patches
Plain Diff
Release 1.14.1
parent
e7140ee1
No related merge requests found
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
Makefile
+1
-1
Makefile
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template
+3
-3
...ddons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template
+3
-3
...addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/pre-k8s-1.6.yaml.template
+3
-3
...ns/dns-controller.addons.k8s.io/pre-k8s-1.6.yaml.template
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
+1
-1
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
+6
-6
...loudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml
+6
-6
.../tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
+6
-6
...loudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
+6
-6
...cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
version.go
+2
-2
version.go
with
37 additions
and
37 deletions
+37
-37
Makefile
+
1
-
1
View file @
b7c25f9a
...
...
@@ -58,7 +58,7 @@ unexport KOPS_BASE_URL KOPS_CLUSTER_NAME KOPS_RUN_OBSOLETE_VERSION KOPS_STATE_ST
un
export
SKIP_REGION_CHECK
S3_ACCESS_KEY_ID
S3_ENDPOINT
S3_REGION
S3_SECRET_ACCESS_KEY
VSPHERE_USERNAME
VSPHERE_PASSWORD
# Keep in sync with upup/models/cloudup/resources/addons/dns-controller/
DNS_CONTROLLER_TAG
=
1.14.
0
DNS_CONTROLLER_TAG
=
1.14.
1
# Keep in sync with logic in get_workspace_status
# TODO: just invoke tools/get_workspace_status.sh?
...
...
This diff is collapsed.
Click to expand it.
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template
+
3
-
3
View file @
b7c25f9a
...
...
@@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.14.
0
version: v1.14.
1
spec:
replicas: 1
selector:
...
...
@@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.14.
0
version: v1.14.
1
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
...
...
@@ -31,7 +31,7 @@ spec:
serviceAccount: dns-controller
containers:
- name: dns-controller
image: kope/dns-controller:1.14.
0
image: kope/dns-controller:1.14.
1
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
...
...
This diff is collapsed.
Click to expand it.
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template
+
3
-
3
View file @
b7c25f9a
...
...
@@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.14.
0
version: v1.14.
1
spec:
replicas: 1
selector:
...
...
@@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.14.
0
version: v1.14.
1
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
# For 1.6, we keep the old tolerations in case of a downgrade to 1.5
...
...
@@ -33,7 +33,7 @@ spec:
serviceAccount: dns-controller
containers:
- name: dns-controller
image: kope/dns-controller:1.14.
0
image: kope/dns-controller:1.14.
1
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
...
...
This diff is collapsed.
Click to expand it.
upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/pre-k8s-1.6.yaml.template
+
3
-
3
View file @
b7c25f9a
...
...
@@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.14.
0
version: v1.14.
1
spec:
replicas: 1
selector:
...
...
@@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.14.
0
version: v1.14.
1
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
scheduler.alpha.kubernetes.io/tolerations: '[{"key": "dedicated", "value": "master"}]'
...
...
@@ -28,7 +28,7 @@ spec:
hostNetwork: true
containers:
- name: dns-controller
image: kope/dns-controller:1.14.
0
image: kope/dns-controller:1.14.
1
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
...
...
This diff is collapsed.
Click to expand it.
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
+
1
-
1
View file @
b7c25f9a
...
...
@@ -390,7 +390,7 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
if
externalDNS
==
nil
||
!
externalDNS
.
Disable
{
{
key
:=
"dns-controller.addons.k8s.io"
version
:=
"1.14.
0
"
version
:=
"1.14.
1
"
{
location
:=
key
+
"/pre-k8s-1.6.yaml"
...
...
This diff is collapsed.
Click to expand it.
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
+
6
-
6
View file @
b7c25f9a
...
...
@@ -59,27 +59,27 @@ spec:
-
id
:
pre-k8s-1.6
kubernetesVersion
:
<1.6.0
manifest
:
dns-controller.addons.k8s.io/pre-k8s-1.6.yaml
manifestHash
:
ea51fd4d4ba87cc6536dad5e5e453b79b8361b8b
manifestHash
:
588add512066653ed9791198e20a29aea2904ee5
name
:
dns-controller.addons.k8s.io
selector
:
k8s-addon
:
dns-controller.addons.k8s.io
version
:
1.14.
0
version
:
1.14.
1
-
id
:
k8s-1.6
kubernetesVersion
:
'
>=1.6.0
<1.12.0'
manifest
:
dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash
:
21539a8fe3f60cff4604521235c4f48c04ba1644
manifestHash
:
d1da30b3cfe07747f74fe808e58b04082708ed07
name
:
dns-controller.addons.k8s.io
selector
:
k8s-addon
:
dns-controller.addons.k8s.io
version
:
1.14.
0
version
:
1.14.
1
-
id
:
k8s-1.12
kubernetesVersion
:
'
>=1.12.0'
manifest
:
dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash
:
a9243888d806afd5d01d3c4055ef049b054e47be
manifestHash
:
6c29db0e12070b472e959f76d466d545816ac13d
name
:
dns-controller.addons.k8s.io
selector
:
k8s-addon
:
dns-controller.addons.k8s.io
version
:
1.14.
0
version
:
1.14.
1
-
id
:
v1.7.0
kubernetesVersion
:
'
>=1.7.0'
manifest
:
storage-aws.addons.k8s.io/v1.7.0.yaml
...
...
This diff is collapsed.
Click to expand it.
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml
+
6
-
6
View file @
b7c25f9a
...
...
@@ -59,27 +59,27 @@ spec:
-
id
:
pre-k8s-1.6
kubernetesVersion
:
<1.6.0
manifest
:
dns-controller.addons.k8s.io/pre-k8s-1.6.yaml
manifestHash
:
ea51fd4d4ba87cc6536dad5e5e453b79b8361b8b
manifestHash
:
588add512066653ed9791198e20a29aea2904ee5
name
:
dns-controller.addons.k8s.io
selector
:
k8s-addon
:
dns-controller.addons.k8s.io
version
:
1.14.
0
version
:
1.14.
1
-
id
:
k8s-1.6
kubernetesVersion
:
'
>=1.6.0
<1.12.0'
manifest
:
dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash
:
21539a8fe3f60cff4604521235c4f48c04ba1644
manifestHash
:
d1da30b3cfe07747f74fe808e58b04082708ed07
name
:
dns-controller.addons.k8s.io
selector
:
k8s-addon
:
dns-controller.addons.k8s.io
version
:
1.14.
0
version
:
1.14.
1
-
id
:
k8s-1.12
kubernetesVersion
:
'
>=1.12.0'
manifest
:
dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash
:
a9243888d806afd5d01d3c4055ef049b054e47be
manifestHash
:
6c29db0e12070b472e959f76d466d545816ac13d
name
:
dns-controller.addons.k8s.io
selector
:
k8s-addon
:
dns-controller.addons.k8s.io
version
:
1.14.
0
version
:
1.14.
1
-
id
:
v1.7.0
kubernetesVersion
:
'
>=1.7.0'
manifest
:
storage-aws.addons.k8s.io/v1.7.0.yaml
...
...
This diff is collapsed.
Click to expand it.
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
+
6
-
6
View file @
b7c25f9a
...
...
@@ -59,27 +59,27 @@ spec:
-
id
:
pre-k8s-1.6
kubernetesVersion
:
<1.6.0
manifest
:
dns-controller.addons.k8s.io/pre-k8s-1.6.yaml
manifestHash
:
ea51fd4d4ba87cc6536dad5e5e453b79b8361b8b
manifestHash
:
588add512066653ed9791198e20a29aea2904ee5
name
:
dns-controller.addons.k8s.io
selector
:
k8s-addon
:
dns-controller.addons.k8s.io
version
:
1.14.
0
version
:
1.14.
1
-
id
:
k8s-1.6
kubernetesVersion
:
'
>=1.6.0
<1.12.0'
manifest
:
dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash
:
21539a8fe3f60cff4604521235c4f48c04ba1644
manifestHash
:
d1da30b3cfe07747f74fe808e58b04082708ed07
name
:
dns-controller.addons.k8s.io
selector
:
k8s-addon
:
dns-controller.addons.k8s.io
version
:
1.14.
0
version
:
1.14.
1
-
id
:
k8s-1.12
kubernetesVersion
:
'
>=1.12.0'
manifest
:
dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash
:
a9243888d806afd5d01d3c4055ef049b054e47be
manifestHash
:
6c29db0e12070b472e959f76d466d545816ac13d
name
:
dns-controller.addons.k8s.io
selector
:
k8s-addon
:
dns-controller.addons.k8s.io
version
:
1.14.
0
version
:
1.14.
1
-
id
:
v1.7.0
kubernetesVersion
:
'
>=1.7.0'
manifest
:
storage-aws.addons.k8s.io/v1.7.0.yaml
...
...
This diff is collapsed.
Click to expand it.
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
+
6
-
6
View file @
b7c25f9a
...
...
@@ -59,27 +59,27 @@ spec:
-
id
:
pre-k8s-1.6
kubernetesVersion
:
<1.6.0
manifest
:
dns-controller.addons.k8s.io/pre-k8s-1.6.yaml
manifestHash
:
ea51fd4d4ba87cc6536dad5e5e453b79b8361b8b
manifestHash
:
588add512066653ed9791198e20a29aea2904ee5
name
:
dns-controller.addons.k8s.io
selector
:
k8s-addon
:
dns-controller.addons.k8s.io
version
:
1.14.
0
version
:
1.14.
1
-
id
:
k8s-1.6
kubernetesVersion
:
'
>=1.6.0
<1.12.0'
manifest
:
dns-controller.addons.k8s.io/k8s-1.6.yaml
manifestHash
:
21539a8fe3f60cff4604521235c4f48c04ba1644
manifestHash
:
d1da30b3cfe07747f74fe808e58b04082708ed07
name
:
dns-controller.addons.k8s.io
selector
:
k8s-addon
:
dns-controller.addons.k8s.io
version
:
1.14.
0
version
:
1.14.
1
-
id
:
k8s-1.12
kubernetesVersion
:
'
>=1.12.0'
manifest
:
dns-controller.addons.k8s.io/k8s-1.12.yaml
manifestHash
:
a9243888d806afd5d01d3c4055ef049b054e47be
manifestHash
:
6c29db0e12070b472e959f76d466d545816ac13d
name
:
dns-controller.addons.k8s.io
selector
:
k8s-addon
:
dns-controller.addons.k8s.io
version
:
1.14.
0
version
:
1.14.
1
-
id
:
v1.7.0
kubernetesVersion
:
'
>=1.7.0'
manifest
:
storage-aws.addons.k8s.io/v1.7.0.yaml
...
...
This diff is collapsed.
Click to expand it.
version.go
+
2
-
2
View file @
b7c25f9a
...
...
@@ -23,8 +23,8 @@ var Version = KOPS_RELEASE_VERSION
// These constants are parsed by build tooling - be careful about changing the formats
const
(
KOPS_RELEASE_VERSION
=
"1.14.
0
"
KOPS_CI_VERSION
=
"1.14.
1
"
KOPS_RELEASE_VERSION
=
"1.14.
1
"
KOPS_CI_VERSION
=
"1.14.
2
"
)
// GitVersion should be replaced by the makefile
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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
Menu
Projects
Groups
Snippets
Help