Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Kops
Commits
5099bc55
Commit
5099bc55
authored
7 years ago
by
Justin Santa Barbara
Browse files
Options
Download
Email Patches
Plain Diff
Tag 1.8.0
parent
0e7dc55d
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
Makefile
+3
-3
Makefile
channels/alpha
+1
-1
channels/alpha
cmd/kops/BUILD.bazel
+1
-1
cmd/kops/BUILD.bazel
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/kopeio-vxlan/manifest.yaml
+2
-2
.../tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
+2
-2
...loudup/tests/bootstrapchannelbuilder/simple/manifest.yaml
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
+2
-2
...cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml
with
18 additions
and
18 deletions
+18
-18
Makefile
+
3
-
3
View file @
5099bc55
...
...
@@ -43,10 +43,10 @@ SOURCES:=$(shell find . -name "*.go")
MAKEDIR
:=
$(
strip
$(
shell
dirname
"
$(
realpath
$(
lastword
$(MAKEFILE_LIST)
))
"
))
# Keep in sync with upup/models/cloudup/resources/addons/dns-controller/
DNS_CONTROLLER_TAG
=
1.8.0
-beta.2
DNS_CONTROLLER_TAG
=
1.8.0
KOPS_RELEASE_VERSION
=
1.8.0
-beta.2
KOPS_CI_VERSION
=
1.8.
0
-beta.
3
KOPS_RELEASE_VERSION
=
1.8.0
KOPS_CI_VERSION
=
1.8.
1
-beta.
1
# kops local location
KOPS
=
${LOCAL}
/kops
...
...
This diff is collapsed.
Click to expand it.
channels/alpha
+
1
-
1
View file @
5099bc55
...
...
@@ -48,7 +48,7 @@ spec:
requiredVersion: 1.4.2
kopsVersions:
- range: ">=1.8.0-alpha.1"
recommendedVersion: 1.8.0
-beta.2
recommendedVersion: 1.8.0
#requiredVersion: 1.8.0
kubernetesVersion: 1.8.4
- range: ">=1.7.0-alpha.1"
...
...
This diff is collapsed.
Click to expand it.
cmd/kops/BUILD.bazel
+
1
-
1
View file @
5099bc55
...
...
@@ -120,7 +120,7 @@ go_binary(
library
=
":go_default_library"
,
visibility
=
[
"//visibility:public"
],
x_defs
=
{
"k8s.io/kops.Version"
:
"1.8.0
-beta.2
"
,
# keep
"k8s.io/kops.Version"
:
"1.8.0"
,
# keep
"k8s.io/kops.GitVersion"
:
"{BUILD_SCM_REVISION}"
,
# keep
},
)
...
...
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 @
5099bc55
...
...
@@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.8.0
-beta.2
version: v1.8.0
spec:
replicas: 1
selector:
...
...
@@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.8.0
-beta.2
version: v1.8.0
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.8.0
-beta.2
image: kope/dns-controller:1.8.0
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 @
5099bc55
...
...
@@ -6,7 +6,7 @@ metadata:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.8.0
-beta.2
version: v1.8.0
spec:
replicas: 1
selector:
...
...
@@ -17,7 +17,7 @@ spec:
labels:
k8s-addon: dns-controller.addons.k8s.io
k8s-app: dns-controller
version: v1.8.0
-beta.2
version: v1.8.0
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.8.0
-beta.2
image: kope/dns-controller:1.8.0
command:
{{ range $arg := DnsControllerArgv }}
- "{{ $arg }}"
...
...
This diff is collapsed.
Click to expand it.
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
+
1
-
1
View file @
5099bc55
...
...
@@ -191,7 +191,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
if
externalDNS
==
nil
||
!
externalDNS
.
Disable
{
{
key
:=
"dns-controller.addons.k8s.io"
version
:=
"1.8.0
-beta.2
"
version
:=
"1.8.0"
{
location
:=
key
+
"/pre-k8s-1.6.yaml"
...
...
This diff is collapsed.
Click to expand it.
upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml
+
2
-
2
View file @
5099bc55
...
...
@@ -41,14 +41,14 @@ spec:
name
:
dns-controller.addons.k8s.io
selector
:
k8s-addon
:
dns-controller.addons.k8s.io
version
:
1.8.0
-beta.2
version
:
1.8.0
-
id
:
k8s-1.6
kubernetesVersion
:
'
>=1.6.0'
manifest
:
dns-controller.addons.k8s.io/k8s-1.6.yaml
name
:
dns-controller.addons.k8s.io
selector
:
k8s-addon
:
dns-controller.addons.k8s.io
version
:
1.8.0
-beta.2
version
:
1.8.0
-
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
+
2
-
2
View file @
5099bc55
...
...
@@ -41,14 +41,14 @@ spec:
name
:
dns-controller.addons.k8s.io
selector
:
k8s-addon
:
dns-controller.addons.k8s.io
version
:
1.8.0
-beta.2
version
:
1.8.0
-
id
:
k8s-1.6
kubernetesVersion
:
'
>=1.6.0'
manifest
:
dns-controller.addons.k8s.io/k8s-1.6.yaml
name
:
dns-controller.addons.k8s.io
selector
:
k8s-addon
:
dns-controller.addons.k8s.io
version
:
1.8.0
-beta.2
version
:
1.8.0
-
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
+
2
-
2
View file @
5099bc55
...
...
@@ -41,14 +41,14 @@ spec:
name
:
dns-controller.addons.k8s.io
selector
:
k8s-addon
:
dns-controller.addons.k8s.io
version
:
1.8.0
-beta.2
version
:
1.8.0
-
id
:
k8s-1.6
kubernetesVersion
:
'
>=1.6.0'
manifest
:
dns-controller.addons.k8s.io/k8s-1.6.yaml
name
:
dns-controller.addons.k8s.io
selector
:
k8s-addon
:
dns-controller.addons.k8s.io
version
:
1.8.0
-beta.2
version
:
1.8.0
-
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.
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