Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Chu Peng 楚鹏
minikube
提交
6ff68709
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,发现更多精彩内容 >>
未验证
提交
6ff68709
编写于
11月 06, 2019
作者:
S
Sharif Elgamal
提交者:
GitHub
11月 06, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #5243 from rajalokan/remove-heapster
Remove heapster addon
上级
a583cbec
ccc20428
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
4 addition
and
273 deletion
+4
-273
cmd/minikube/cmd/config/addons.go
cmd/minikube/cmd/config/addons.go
+1
-1
cmd/minikube/cmd/config/config.go
cmd/minikube/cmd/config/config.go
+0
-6
cmd/minikube/cmd/config/util_test.go
cmd/minikube/cmd/config/util_test.go
+2
-1
deploy/addons/heapster/grafana-svc.yaml.tmpl
deploy/addons/heapster/grafana-svc.yaml.tmpl
+0
-34
deploy/addons/heapster/heapster-rc.yaml.tmpl
deploy/addons/heapster/heapster-rc.yaml.tmpl
+0
-54
deploy/addons/heapster/heapster-svc.yaml.tmpl
deploy/addons/heapster/heapster-svc.yaml.tmpl
+0
-31
deploy/addons/heapster/influx-grafana-rc.yaml.tmpl
deploy/addons/heapster/influx-grafana-rc.yaml.tmpl
+0
-75
deploy/addons/heapster/influxdb-svc.yaml.tmpl
deploy/addons/heapster/influxdb-svc.yaml.tmpl
+0
-34
pkg/minikube/assets/addons.go
pkg/minikube/assets/addons.go
+0
-32
site/content/en/docs/Reference/Commands/addons.md
site/content/en/docs/Reference/Commands/addons.md
+1
-1
site/content/en/docs/Reference/Commands/config.md
site/content/en/docs/Reference/Commands/config.md
+0
-1
site/content/en/docs/Reference/Configuration/minikube.md
site/content/en/docs/Reference/Configuration/minikube.md
+0
-1
site/content/en/docs/Tasks/addons.md
site/content/en/docs/Tasks/addons.md
+0
-2
未找到文件。
cmd/minikube/cmd/config/addons.go
浏览文件 @
6ff68709
...
...
@@ -25,7 +25,7 @@ import (
var
AddonsCmd
=
&
cobra
.
Command
{
Use
:
"addons SUBCOMMAND [flags]"
,
Short
:
"Modify minikube's kubernetes addons"
,
Long
:
`addons modifies minikube addons files using subcommands like "minikube addons enable
heapster
"`
,
Long
:
`addons modifies minikube addons files using subcommands like "minikube addons enable
dashboard
"`
,
Run
:
func
(
cmd
*
cobra
.
Command
,
args
[]
string
)
{
if
err
:=
cmd
.
Help
();
err
!=
nil
{
glog
.
Errorf
(
"help: %v"
,
err
)
...
...
cmd/minikube/cmd/config/config.go
浏览文件 @
6ff68709
...
...
@@ -159,12 +159,6 @@ var settings = []Setting{
validations
:
[]
setFn
{
IsValidAddon
},
callbacks
:
[]
setFn
{
EnableOrDisableStorageClasses
},
},
{
name
:
"heapster"
,
set
:
SetBool
,
validations
:
[]
setFn
{
IsValidAddon
},
callbacks
:
[]
setFn
{
EnableOrDisableAddon
},
},
{
name
:
"efk"
,
set
:
SetBool
,
...
...
cmd/minikube/cmd/config/util_test.go
浏览文件 @
6ff68709
...
...
@@ -90,8 +90,9 @@ func TestIsAddonAlreadySet(t *testing.T) {
{
addonName
:
"ingress"
,
},
{
addonName
:
"
heapster
"
,
addonName
:
"
registry
"
,
},
}
...
...
deploy/addons/heapster/grafana-svc.yaml.tmpl
已删除
100644 → 0
浏览文件 @
a583cbec
# Copyright 2017 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:
labels:
kubernetes.io/name: monitoring-grafana
kubernetes.io/minikube-addons: heapster
kubernetes.io/minikube-addons-endpoint: heapster
addonmanager.kubernetes.io/mode: Reconcile
name: monitoring-grafana
namespace: kube-system
spec:
type: NodePort
ports:
- port: 80
nodePort: 30002
protocol: TCP
targetPort: ui
selector:
addonmanager.kubernetes.io/mode: Reconcile
k8s-app: influx-grafana
deploy/addons/heapster/heapster-rc.yaml.tmpl
已删除
100644 → 0
浏览文件 @
a583cbec
# Copyright 2017 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: ReplicationController
metadata:
labels:
k8s-app: heapster
kubernetes.io/minikube-addons: heapster
addonmanager.kubernetes.io/mode: Reconcile
version: v1.5.3
name: heapster
namespace: kube-system
spec:
replicas: 1
selector:
k8s-app: heapster
version: v1.5.3
addonmanager.kubernetes.io/mode: Reconcile
template:
metadata:
labels:
k8s-app: heapster
version: v1.5.3
addonmanager.kubernetes.io/mode: Reconcile
spec:
containers:
- name: heapster
image: {{default "k8s.gcr.io" .ImageRepository}}/heapster-{{.Arch}}:v1.5.3
imagePullPolicy: IfNotPresent
command:
- /heapster
- --source=kubernetes.summary_api:''
- --sink=influxdb:http://monitoring-influxdb:8086
- --metric_resolution=60s
volumeMounts:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
volumes:
- name: ssl-certs
hostPath:
path: /etc/ssl/certs
deploy/addons/heapster/heapster-svc.yaml.tmpl
已删除
100644 → 0
浏览文件 @
a583cbec
# Copyright 2017 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:
labels:
kubernetes.io/name: heapster
kubernetes.io/minikube-addons: heapster
addonmanager.kubernetes.io/mode: Reconcile
kubernetes.io/minikube-addons-endpoint: heapster
name: heapster
namespace: kube-system
spec:
ports:
- port: 80
targetPort: 8082
selector:
addonmanager.kubernetes.io/mode: Reconcile
k8s-app: heapster
deploy/addons/heapster/influx-grafana-rc.yaml.tmpl
已删除
100644 → 0
浏览文件 @
a583cbec
# Copyright 2017 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: ReplicationController
metadata:
name: influxdb-grafana
labels:
k8s-app: influx-grafana
kubernetes.io/minikube-addons: heapster
addonmanager.kubernetes.io/mode: Reconcile
namespace: kube-system
spec:
replicas: 1
selector:
k8s-app: influx-grafana
addonmanager.kubernetes.io/mode: Reconcile
template:
metadata:
labels:
k8s-app: influx-grafana
addonmanager.kubernetes.io/mode: Reconcile
spec:
containers:
- name: influxdb
image: {{default "k8s.gcr.io" .ImageRepository}}/heapster-influxdb-{{.Arch}}:v1.3.3
imagePullPolicy: IfNotPresent
ports:
- name: http
containerPort: 8083
- name: api
containerPort: 8086
volumeMounts:
- mountPath: /data
name: influxdb-storage
- name: grafana
image: {{default "k8s.gcr.io" .ImageRepository}}/heapster-grafana-{{.Arch}}:v4.4.3
imagePullPolicy: IfNotPresent
env:
- name: INFLUXDB_SERVICE_URL
value: http://localhost:8086
# The following env variables are required to make Grafana accessible via
# the kubernetes api-server proxy. On production clusters, we recommend
# removing these env variables, setup auth for grafana, and expose the grafana
# service using a LoadBalancer or a public IP.
- name: GF_AUTH_BASIC_ENABLED
value: "false"
- name: GF_AUTH_ANONYMOUS_ENABLED
value: "true"
- name: GF_AUTH_ANONYMOUS_ORG_ROLE
value: Admin
- name: GF_SERVER_ROOT_URL
value: /
ports:
- name: ui
containerPort: 3000
volumeMounts:
- mountPath: /var
name: grafana-storage
volumes:
- name: influxdb-storage
emptyDir: {}
- name: grafana-storage
emptyDir: {}
deploy/addons/heapster/influxdb-svc.yaml.tmpl
已删除
100644 → 0
浏览文件 @
a583cbec
# Copyright 2017 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:
labels:
kubernetes.io/name: monitoring-influxdb
kubernetes.io/minikube-addons: heapster
addonmanager.kubernetes.io/mode: Reconcile
name: monitoring-influxdb
namespace: kube-system
spec:
ports:
- name: http
port: 8083
targetPort: 8083
- name: api
port: 8086
targetPort: 8086
selector:
addonmanager.kubernetes.io/mode: Reconcile
k8s-app: influx-grafana
pkg/minikube/assets/addons.go
浏览文件 @
6ff68709
...
...
@@ -132,38 +132,6 @@ var Addons = map[string]*Addon{
"0640"
,
false
),
},
false
,
"storage-provisioner-gluster"
),
"heapster"
:
NewAddon
([]
*
BinAsset
{
MustBinAsset
(
"deploy/addons/heapster/influx-grafana-rc.yaml.tmpl"
,
vmpath
.
GuestAddonsDir
,
"influxGrafana-rc.yaml"
,
"0640"
,
true
),
MustBinAsset
(
"deploy/addons/heapster/grafana-svc.yaml.tmpl"
,
vmpath
.
GuestAddonsDir
,
"grafana-svc.yaml"
,
"0640"
,
false
),
MustBinAsset
(
"deploy/addons/heapster/influxdb-svc.yaml.tmpl"
,
vmpath
.
GuestAddonsDir
,
"influxdb-svc.yaml"
,
"0640"
,
false
),
MustBinAsset
(
"deploy/addons/heapster/heapster-rc.yaml.tmpl"
,
vmpath
.
GuestAddonsDir
,
"heapster-rc.yaml"
,
"0640"
,
true
),
MustBinAsset
(
"deploy/addons/heapster/heapster-svc.yaml.tmpl"
,
vmpath
.
GuestAddonsDir
,
"heapster-svc.yaml"
,
"0640"
,
false
),
},
false
,
"heapster"
),
"efk"
:
NewAddon
([]
*
BinAsset
{
MustBinAsset
(
"deploy/addons/efk/elasticsearch-rc.yaml.tmpl"
,
...
...
site/content/en/docs/Reference/Commands/addons.md
浏览文件 @
6ff68709
...
...
@@ -4,7 +4,7 @@ linkTitle: "addons"
weight
:
1
date
:
2019-08-01
description
:
>
Modifies minikube addons files using subcommands like "minikube addons enable
heapster
"
Modifies minikube addons files using subcommands like "minikube addons enable
dashboard
"
---
## Overview
...
...
site/content/en/docs/Reference/Commands/config.md
浏览文件 @
6ff68709
...
...
@@ -36,7 +36,6 @@ Configurable fields:
*
dashboard
*
addon-manager
*
default-storageclass
*
heapster
*
efk
*
ingress
*
registry
...
...
site/content/en/docs/Reference/Configuration/minikube.md
浏览文件 @
6ff68709
...
...
@@ -77,7 +77,6 @@ Configurable fields:
*
dashboard
*
addon-manager
*
default-storageclass
*
heapster
*
efk
*
ingress
*
registry
...
...
site/content/en/docs/Tasks/addons.md
浏览文件 @
6ff68709
...
...
@@ -11,7 +11,6 @@ minikube has a set of built-in addons that, when enabled, can be used within Kub
## Available addons
*
[
Kubernetes Dashboard
](
https://github.com/kubernetes/kubernetes/tree/master/cluster/addons/dashboard
)
*
[
Heapster
](
https://github.com/kubernetes/heapster
)
:
[
Troubleshooting Guide
](
https://github.com/kubernetes/heapster/blob/master/docs/influxdb.md
)
Note:You will need to login to Grafana as admin/admin in order to access the console
*
[
EFK
](
https://github.com/kubernetes/kubernetes/tree/master/cluster/addons/fluentd-elasticsearch
)
*
[
Registry
](
https://github.com/kubernetes/minikube/tree/master/deploy/addons/registry
)
*
[
Registry Credentials
](
https://github.com/upmc-enterprises/registry-creds
)
...
...
@@ -39,7 +38,6 @@ Example output:
- freshpod: disabled
- addon-manager: enabled
- dashboard: enabled
- heapster: disabled
- efk: disabled
- ingress: disabled
- default-storageclass: enabled
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录