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
9d4021b8
Commit
9d4021b8
authored
May 16, 2018
by
Di Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename v180AndAboveKubeDNSDeployment to KubeDNSDeployment
parent
2ef81576
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
dns_test.go
cmd/kubeadm/app/phases/addons/dns/dns_test.go
+1
-1
manifests.go
cmd/kubeadm/app/phases/addons/dns/manifests.go
+2
-2
versions.go
cmd/kubeadm/app/phases/addons/dns/versions.go
+1
-1
No files found.
cmd/kubeadm/app/phases/addons/dns/dns_test.go
View file @
9d4021b8
...
@@ -94,7 +94,7 @@ func TestCompileManifests(t *testing.T) {
...
@@ -94,7 +94,7 @@ func TestCompileManifests(t *testing.T) {
expected
bool
expected
bool
}{
}{
{
{
manifest
:
v180AndAbove
KubeDNSDeployment
,
manifest
:
KubeDNSDeployment
,
data
:
struct
{
ImageRepository
,
Arch
,
Version
,
DNSBindAddr
,
DNSProbeAddr
,
DNSDomain
,
MasterTaintKey
string
}{
data
:
struct
{
ImageRepository
,
Arch
,
Version
,
DNSBindAddr
,
DNSProbeAddr
,
DNSDomain
,
MasterTaintKey
string
}{
ImageRepository
:
"foo"
,
ImageRepository
:
"foo"
,
Arch
:
"foo"
,
Arch
:
"foo"
,
...
...
cmd/kubeadm/app/phases/addons/dns/manifests.go
View file @
9d4021b8
...
@@ -17,8 +17,8 @@ limitations under the License.
...
@@ -17,8 +17,8 @@ limitations under the License.
package
dns
package
dns
const
(
const
(
//
v180AndAbove
KubeDNSDeployment is the kube-dns Deployment manifest for the kube-dns manifest for v1.7+
// KubeDNSDeployment is the kube-dns Deployment manifest for the kube-dns manifest for v1.7+
v180AndAbove
KubeDNSDeployment
=
`
KubeDNSDeployment
=
`
apiVersion: apps/v1
apiVersion: apps/v1
kind: Deployment
kind: Deployment
metadata:
metadata:
...
...
cmd/kubeadm/app/phases/addons/dns/versions.go
View file @
9d4021b8
...
@@ -46,7 +46,7 @@ func GetDNSVersion(kubeVersion *version.Version, dns string) string {
...
@@ -46,7 +46,7 @@ func GetDNSVersion(kubeVersion *version.Version, dns string) string {
func
GetKubeDNSManifest
(
kubeVersion
*
version
.
Version
)
string
{
func
GetKubeDNSManifest
(
kubeVersion
*
version
.
Version
)
string
{
// v1.8.0+ has only one known YAML manifest spec, just return that here
// v1.8.0+ has only one known YAML manifest spec, just return that here
// In the future when the kube-dns version is bumped at HEAD; add conditional logic to return the right manifest
// In the future when the kube-dns version is bumped at HEAD; add conditional logic to return the right manifest
return
v180AndAbove
KubeDNSDeployment
return
KubeDNSDeployment
}
}
// GetCoreDNSManifest returns the right CoreDNS YAML manifest for a specific k8s version
// GetCoreDNSManifest returns the right CoreDNS YAML manifest for a specific k8s version
...
...
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