Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
9916d7a4
M
minikube
项目概览
Chu Peng 楚鹏
/
minikube
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
minikube
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
9916d7a4
编写于
7月 30, 2019
作者:
M
Medya Ghazizadeh
提交者:
GitHub
7月 30, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #4786 from reegnz/remove-nginx-ingress-default-backend
Remove ingress-nginx default backend.
上级
5add11bb
d1436b40
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
0 addition
and
111 deletion
+0
-111
deploy/addons/ingress/ingress-dp.yaml.tmpl
deploy/addons/ingress/ingress-dp.yaml.tmpl
+0
-46
deploy/addons/ingress/ingress-svc.yaml.tmpl
deploy/addons/ingress/ingress-svc.yaml.tmpl
+0
-33
pkg/minikube/assets/addons.go
pkg/minikube/assets/addons.go
+0
-6
test/integration/addons_test.go
test/integration/addons_test.go
+0
-4
test/integration/util/util.go
test/integration/util/util.go
+0
-22
未找到文件。
deploy/addons/ingress/ingress-dp.yaml.tmpl
浏览文件 @
9916d7a4
...
...
@@ -12,51 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: default-http-backend
namespace: kube-system
labels:
app.kubernetes.io/name: default-http-backend
app.kubernetes.io/part-of: kube-system
addonmanager.kubernetes.io/mode: Reconcile
spec:
replicas: 1
selector:
matchLabels:
app.kubernetes.io/name: default-http-backend
addonmanager.kubernetes.io/mode: Reconcile
template:
metadata:
labels:
app.kubernetes.io/name: default-http-backend
addonmanager.kubernetes.io/mode: Reconcile
spec:
terminationGracePeriodSeconds: 60
containers:
- name: default-http-backend
# Any image is permissible as long as:
# 1. It serves a 404 page at /
# 2. It serves 200 on a /healthz endpoint
image: {{default "gcr.io/google_containers" .ImageRepository}}/defaultbackend{{.ExoticArch}}:1.4
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
path: /healthz
port: 8080
scheme: HTTP
initialDelaySeconds: 30
timeoutSeconds: 5
ports:
- containerPort: 8080
resources:
limits:
cpu: 20m
memory: 30Mi
requests:
cpu: 20m
memory: 30Mi
---
apiVersion: extensions/v1beta1
kind: Deployment
...
...
@@ -121,7 +76,6 @@ spec:
hostPort: 18080
args:
- /nginx-ingress-controller
- --default-backend-service=$(POD_NAMESPACE)/default-http-backend
- --configmap=$(POD_NAMESPACE)/nginx-load-balancer-conf
- --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
- --udp-services-configmap=$(POD_NAMESPACE)/udp-services
...
...
deploy/addons/ingress/ingress-svc.yaml.tmpl
已删除
100644 → 0
浏览文件 @
5add11bb
# Copyright 2016 The Kubernetes Authors All rights reserved.
#
# 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.
apiVersion: v1
kind: Service
metadata:
name: default-http-backend
namespace: kube-system
labels:
app.kubernetes.io/name: default-http-backend
app.kubernetes.io/part-of: kube-system
kubernetes.io/minikube-addons: ingress
kubernetes.io/minikube-addons-endpoint: ingress
addonmanager.kubernetes.io/mode: Reconcile
spec:
type: NodePort
ports:
- port: 80
targetPort: 8080
nodePort: 30001
selector:
app.kubernetes.io/name: default-http-backend
\ No newline at end of file
pkg/minikube/assets/addons.go
浏览文件 @
9916d7a4
...
...
@@ -220,12 +220,6 @@ var Addons = map[string]*Addon{
"ingress-dp.yaml"
,
"0640"
,
true
),
MustBinAsset
(
"deploy/addons/ingress/ingress-svc.yaml.tmpl"
,
constants
.
AddonsPath
,
"ingress-svc.yaml"
,
"0640"
,
false
),
},
false
,
"ingress"
),
"metrics-server"
:
NewAddon
([]
*
BinAsset
{
MustBinAsset
(
...
...
test/integration/addons_test.go
浏览文件 @
9916d7a4
...
...
@@ -129,10 +129,6 @@ func testIngressController(t *testing.T) {
t
.
Fatalf
(
"waiting for ingress-controller to be up: %v"
,
err
)
}
if
err
:=
util
.
WaitForIngressDefaultBackendRunning
(
t
);
err
!=
nil
{
t
.
Fatalf
(
"waiting for default-http-backend to be up: %v"
,
err
)
}
curdir
,
err
:=
filepath
.
Abs
(
""
)
if
err
!=
nil
{
t
.
Errorf
(
"Error getting the file path for current directory: %s"
,
curdir
)
...
...
test/integration/util/util.go
浏览文件 @
9916d7a4
...
...
@@ -359,28 +359,6 @@ func WaitForIngressControllerRunning(t *testing.T) error {
return
nil
}
// WaitForIngressDefaultBackendRunning waits until ingress default backend pod to be running
func
WaitForIngressDefaultBackendRunning
(
t
*
testing
.
T
)
error
{
client
,
err
:=
commonutil
.
GetClient
()
if
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"getting kubernetes client"
)
}
if
err
:=
commonutil
.
WaitForDeploymentToStabilize
(
client
,
"kube-system"
,
"default-http-backend"
,
time
.
Minute
*
10
);
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"waiting for default-http-backend deployment to stabilize"
)
}
if
err
:=
commonutil
.
WaitForService
(
client
,
"kube-system"
,
"default-http-backend"
,
true
,
time
.
Millisecond
*
500
,
time
.
Minute
*
10
);
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"waiting for default-http-backend service to be up"
)
}
if
err
:=
commonutil
.
WaitForServiceEndpointsNum
(
client
,
"kube-system"
,
"default-http-backend"
,
1
,
time
.
Second
*
3
,
time
.
Minute
*
10
);
err
!=
nil
{
return
errors
.
Wrap
(
err
,
"waiting for one default-http-backend endpoint to be up"
)
}
return
nil
}
// WaitForGvisorControllerRunning waits for the gvisor controller pod to be running
func
WaitForGvisorControllerRunning
(
t
*
testing
.
T
)
error
{
client
,
err
:=
commonutil
.
GetClient
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录