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
4380d1fb
Unverified
Commit
4380d1fb
authored
Jun 24, 2017
by
Lucas Käldström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kubeadm: Remove the validate phase as it's not needed nor used
parent
a81c6592
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
0 additions
and
226 deletions
+0
-226
BUILD
cmd/kubeadm/app/BUILD
+0
-1
BUILD
cmd/kubeadm/app/cmd/phases/BUILD
+0
-2
phase.go
cmd/kubeadm/app/cmd/phases/phase.go
+0
-1
validate.go
cmd/kubeadm/app/cmd/phases/validate.go
+0
-43
BUILD
cmd/kubeadm/app/phases/validate/BUILD
+0
-40
validate.go
cmd/kubeadm/app/phases/validate/validate.go
+0
-139
No files found.
cmd/kubeadm/app/BUILD
View file @
4380d1fb
...
...
@@ -42,7 +42,6 @@ filegroup(
"//cmd/kubeadm/app/phases/certs:all-srcs",
"//cmd/kubeadm/app/phases/kubeconfig:all-srcs",
"//cmd/kubeadm/app/phases/token:all-srcs",
"//cmd/kubeadm/app/phases/validate:all-srcs",
"//cmd/kubeadm/app/preflight:all-srcs",
"//cmd/kubeadm/app/util:all-srcs",
],
...
...
cmd/kubeadm/app/cmd/phases/BUILD
View file @
4380d1fb
...
...
@@ -14,7 +14,6 @@ go_library(
"kubeconfig.go",
"phase.go",
"preflight.go",
"validate.go",
],
tags = ["automanaged"],
deps = [
...
...
@@ -23,7 +22,6 @@ go_library(
"//cmd/kubeadm/app/apis/kubeadm/validation:go_default_library",
"//cmd/kubeadm/app/phases/certs:go_default_library",
"//cmd/kubeadm/app/phases/kubeconfig:go_default_library",
"//cmd/kubeadm/app/phases/validate:go_default_library",
"//cmd/kubeadm/app/preflight:go_default_library",
"//cmd/kubeadm/app/util:go_default_library",
"//pkg/api:go_default_library",
...
...
cmd/kubeadm/app/cmd/phases/phase.go
View file @
4380d1fb
...
...
@@ -32,7 +32,6 @@ func NewCmdPhase(out io.Writer) *cobra.Command {
cmd
.
AddCommand
(
NewCmdKubeConfig
(
out
))
cmd
.
AddCommand
(
NewCmdCerts
())
cmd
.
AddCommand
(
NewCmdValidate
())
cmd
.
AddCommand
(
NewCmdPreFlight
())
return
cmd
...
...
cmd/kubeadm/app/cmd/phases/validate.go
deleted
100644 → 0
View file @
a81c6592
/*
Copyright 2017 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package
phases
import
(
"os"
"k8s.io/kubernetes/cmd/kubeadm/app/phases/validate"
"github.com/spf13/cobra"
)
func
NewCmdValidate
()
*
cobra
.
Command
{
var
kubeconfig
string
cmd
:=
&
cobra
.
Command
{
Use
:
"validate"
,
Short
:
"Run end to end validation"
,
RunE
:
func
(
cmd
*
cobra
.
Command
,
args
[]
string
)
error
{
return
validate
.
Validate
(
kubeconfig
)
},
}
//TODO: what's the convention for defaulting a kubeconfig?
cmd
.
Flags
()
.
StringVar
(
&
kubeconfig
,
"kubeconfig"
,
os
.
Getenv
(
"HOME"
)
+
"/.kube/config"
,
"path to kubeconfig"
)
return
cmd
}
cmd/kubeadm/app/phases/validate/BUILD
deleted
100644 → 0
View file @
a81c6592
package(default_visibility = ["//visibility:public"])
licenses(["notice"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
)
go_library(
name = "go_default_library",
srcs = ["validate.go"],
tags = ["automanaged"],
deps = [
"//cmd/kubeadm/app/apis/kubeadm:go_default_library",
"//cmd/kubeadm/app/constants:go_default_library",
"//cmd/kubeadm/app/util:go_default_library",
"//cmd/kubeadm/app/util/kubeconfig:go_default_library",
"//pkg/api:go_default_library",
"//pkg/api/v1/node:go_default_library",
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)
cmd/kubeadm/app/phases/validate/validate.go
deleted
100644 → 0
View file @
a81c6592
/*
Copyright 2017 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package
validate
import
(
"fmt"
"runtime"
"time"
extensions
"k8s.io/api/extensions/v1beta1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
kuberuntime
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/wait"
clientset
"k8s.io/client-go/kubernetes"
kubeadmapi
"k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
kubeadmconstants
"k8s.io/kubernetes/cmd/kubeadm/app/constants"
kubeadmutil
"k8s.io/kubernetes/cmd/kubeadm/app/util"
kubeconfigutil
"k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig"
"k8s.io/kubernetes/pkg/api"
nodeutil
"k8s.io/kubernetes/pkg/api/v1/node"
)
func
Validate
(
kubeconfigPath
string
)
error
{
client
,
err
:=
kubeconfigutil
.
ClientSetFromFile
(
kubeconfigPath
)
if
err
!=
nil
{
return
err
}
fmt
.
Println
(
"[validate] Waiting for at least one node to register and become ready"
)
start
:=
time
.
Now
()
wait
.
PollInfinite
(
kubeadmconstants
.
APICallRetryInterval
,
func
()
(
bool
,
error
)
{
nodeList
,
err
:=
client
.
Nodes
()
.
List
(
metav1
.
ListOptions
{})
if
err
!=
nil
{
fmt
.
Println
(
"[validate] Temporarily unable to list nodes (will retry)"
)
return
false
,
nil
}
if
len
(
nodeList
.
Items
)
<
1
{
return
false
,
nil
}
n
:=
&
nodeList
.
Items
[
0
]
if
!
nodeutil
.
IsNodeReady
(
n
)
{
fmt
.
Println
(
"[validate] First node has registered, but is not ready yet"
)
return
false
,
nil
}
fmt
.
Printf
(
"[validate] First node is ready after %f seconds
\n
"
,
time
.
Since
(
start
)
.
Seconds
())
return
true
,
nil
})
if
err
:=
createAndWaitForADummyDeployment
(
client
);
err
!=
nil
{
return
err
}
return
nil
}
func
createAndWaitForADummyDeployment
(
client
*
clientset
.
Clientset
)
error
{
dummyDeploymentBytes
,
err
:=
kubeadmutil
.
ParseTemplate
(
DummyDeployment
,
struct
{
ImageRepository
,
Arch
string
}{
ImageRepository
:
kubeadmapi
.
GlobalEnvParams
.
RepositoryPrefix
,
Arch
:
runtime
.
GOARCH
,
})
if
err
!=
nil
{
return
fmt
.
Errorf
(
"error when parsing dummy deployment template: %v"
,
err
)
}
dummyDeployment
:=
&
extensions
.
Deployment
{}
if
err
:=
kuberuntime
.
DecodeInto
(
api
.
Codecs
.
UniversalDecoder
(),
dummyDeploymentBytes
,
dummyDeployment
);
err
!=
nil
{
return
fmt
.
Errorf
(
"unable to decode dummy deployment %v"
,
err
)
}
wait
.
PollInfinite
(
kubeadmconstants
.
APICallRetryInterval
,
func
()
(
bool
,
error
)
{
// TODO: we should check the error, as some cases may be fatal
if
_
,
err
:=
client
.
ExtensionsV1beta1
()
.
Deployments
(
metav1
.
NamespaceSystem
)
.
Create
(
dummyDeployment
);
err
!=
nil
{
fmt
.
Printf
(
"[validate] Failed to create test deployment [%v] (will retry)
\n
"
,
err
)
return
false
,
nil
}
return
true
,
nil
})
wait
.
PollInfinite
(
kubeadmconstants
.
APICallRetryInterval
,
func
()
(
bool
,
error
)
{
d
,
err
:=
client
.
ExtensionsV1beta1
()
.
Deployments
(
metav1
.
NamespaceSystem
)
.
Get
(
"dummy"
,
metav1
.
GetOptions
{})
if
err
!=
nil
{
fmt
.
Printf
(
"[validate] Failed to get test deployment [%v] (will retry)
\n
"
,
err
)
return
false
,
nil
}
if
d
.
Status
.
AvailableReplicas
<
1
{
return
false
,
nil
}
return
true
,
nil
})
fmt
.
Println
(
"[validate] Test deployment succeeded"
)
foreground
:=
metav1
.
DeletePropagationForeground
if
err
:=
client
.
ExtensionsV1beta1
()
.
Deployments
(
metav1
.
NamespaceSystem
)
.
Delete
(
"dummy"
,
&
metav1
.
DeleteOptions
{
PropagationPolicy
:
&
foreground
,
});
err
!=
nil
{
fmt
.
Printf
(
"[validate] Failed to delete test deployment [%v] (will ignore)
\n
"
,
err
)
}
return
nil
}
const
(
DummyDeployment
=
`
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
labels:
app: dummy
name: dummy
namespace: kube-system
spec:
replicas: 1
selector:
matchLabels:
app: dummy
template:
metadata:
labels:
app: dummy
spec:
containers:
- image: {{ .ImageRepository }}/pause-{{ .Arch }}:3.0
name: dummy
hostNetwork: true
`
)
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