未验证 提交 1f66b1c1 编写于 作者: M Marcin Maciaszczyk 提交者: GitHub

Prepare for v2.0.0 release (#5085)

* Prepare for v2.0.0 release

* Fix logs breadcrumb

* Fix tooltip text formatting for workload statuses

* Add lock to settings load to avoid concurrent change
Co-authored-by: NSebastian Florek <sebastian.florek@loodse.com>
上级 7edd6b4f
......@@ -17,7 +17,7 @@ Kubernetes Dashboard is a general purpose, web-based UI for Kubernetes clusters.
To deploy Dashboard, execute following command:
```sh
$ kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.0-rc7/aio/deploy/recommended.yaml
$ kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.0/aio/deploy/recommended.yaml
```
To access Dashboard from your local workstation you must create a secure channel to your Kubernetes cluster. Run the following command:
......
......@@ -176,7 +176,7 @@ spec:
spec:
containers:
- name: kubernetes-dashboard
image: kubernetesui/dashboard:v2.0.0-rc7
image: kubernetesui/dashboard:v2.0.0
ports:
- containerPort: 9090
protocol: TCP
......
......@@ -34,7 +34,7 @@ spec:
spec:
containers:
- name: kubernetes-dashboard
image: kubernetesui/dashboard:v2.0.0-rc7
image: kubernetesui/dashboard:v2.0.0
ports:
- containerPort: 9090
protocol: TCP
......
......@@ -187,7 +187,7 @@ spec:
spec:
containers:
- name: kubernetes-dashboard
image: kubernetesui/dashboard:v2.0.0-rc7
image: kubernetesui/dashboard:v2.0.0
imagePullPolicy: Always
ports:
- containerPort: 8443
......
......@@ -34,7 +34,7 @@ spec:
spec:
containers:
- name: kubernetes-dashboard
image: kubernetesui/dashboard:v2.0.0-rc7
image: kubernetesui/dashboard:v2.0.0
imagePullPolicy: Always
ports:
- containerPort: 8443
......
......@@ -53,7 +53,7 @@ const version = {
/**
* Current release version of the project.
*/
release: 'v2.0.0-rc7',
release: 'v2.0.0',
/**
* Version name of the head release of the project.
*/
......
......@@ -23,7 +23,7 @@ kubectl create secret generic kubernetes-dashboard-certs --from-file=$HOME/certs
For Dashboard to pickup the certificates, you must pass arguments `--tls-cert-file=/tls.crt` and `--tls-key-file=/tls.key` to the container. You can edit YAML definition and deploy Dashboard in one go:
```
kubectl create --edit -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.0-rc7/aio/deploy/recommended.yaml
kubectl create --edit -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.0/aio/deploy/recommended.yaml
```
Under Deployment section, add arguments to pod definition, it should look as follows:
......@@ -42,7 +42,7 @@ This setup is not fully secure. Certificates are not used and Dashboard is expos
To deploy Dashboard execute following command:
```
kubectl create -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.0-rc7/aio/deploy/alternative.yaml
kubectl create -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.0/aio/deploy/alternative.yaml
```
......@@ -55,7 +55,7 @@ Besides official releases, there are also development releases, that are pushed
In most of the use cases you need to execute the following command to deploy latest development release:
```
$ kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.0-rc7/aio/deploy/head.yaml
$ kubectl apply -f https://raw.githubusercontent.com/kubernetes/dashboard/v2.0.0/aio/deploy/head.yaml
```
### Update
......
......@@ -293,7 +293,7 @@
<target>Cron Jobs</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">33</context>
<context context-type="linenumber">38</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/cronjob/template.html</context>
......@@ -305,7 +305,7 @@
<target>Daemon Sets</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">46</context>
<context context-type="linenumber">56</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/daemonset/template.html</context>
......@@ -317,7 +317,7 @@
<target>Deployments</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">59</context>
<context context-type="linenumber">74</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/deployment/template.html</context>
......@@ -329,7 +329,7 @@
<target>Jobs</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">72</context>
<context context-type="linenumber">92</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/job/template.html</context>
......@@ -341,7 +341,7 @@
<target>Pods</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">86</context>
<context context-type="linenumber">111</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/creator/template.html</context>
......@@ -403,7 +403,7 @@
<target>Replica Sets</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">99</context>
<context context-type="linenumber">129</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/replicaset/template.html</context>
......@@ -415,7 +415,7 @@
<target>Replication Controllers</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">112</context>
<context context-type="linenumber">147</context>
</context-group>
</trans-unit>
<trans-unit id="0756fdca226249dcff9d05651d50b7acdade2aba" datatype="html">
......@@ -423,7 +423,7 @@
<target>Stateful Sets</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">125</context>
<context context-type="linenumber">165</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/statefulset/template.html</context>
......
......@@ -297,7 +297,7 @@
<target>Cron Jobs</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">33</context>
<context context-type="linenumber">38</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/cronjob/template.html</context>
......@@ -309,7 +309,7 @@
<target>Daemon Sets</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">46</context>
<context context-type="linenumber">56</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/daemonset/template.html</context>
......@@ -321,7 +321,7 @@
<target>Déploiements</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">59</context>
<context context-type="linenumber">74</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/deployment/template.html</context>
......@@ -333,7 +333,7 @@
<target>Jobs</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">72</context>
<context context-type="linenumber">92</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/job/template.html</context>
......@@ -345,7 +345,7 @@
<target>Pods</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">86</context>
<context context-type="linenumber">111</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/creator/template.html</context>
......@@ -407,7 +407,7 @@
<target>Replica Sets</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">99</context>
<context context-type="linenumber">129</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/replicaset/template.html</context>
......@@ -419,7 +419,7 @@
<target>Contrôleurs de réplication</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">112</context>
<context context-type="linenumber">147</context>
</context-group>
</trans-unit>
<trans-unit id="0756fdca226249dcff9d05651d50b7acdade2aba" datatype="html">
......@@ -427,7 +427,7 @@
<target>Stateful Sets</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">125</context>
<context context-type="linenumber">165</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/statefulset/template.html</context>
......
......@@ -539,7 +539,7 @@
<target>Cron ジョブ</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">33</context>
<context context-type="linenumber">38</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/cronjob/template.html</context>
......@@ -1371,7 +1371,7 @@
<target>ポッド</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">86</context>
<context context-type="linenumber">111</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/creator/template.html</context>
......@@ -1556,7 +1556,7 @@
<target>デーモンセット</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">46</context>
<context context-type="linenumber">56</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/daemonset/template.html</context>
......@@ -1568,7 +1568,7 @@
<target>デプロイメント</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">59</context>
<context context-type="linenumber">74</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/deployment/template.html</context>
......@@ -1732,7 +1732,7 @@
<target>ジョブ</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">72</context>
<context context-type="linenumber">92</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/job/template.html</context>
......@@ -2222,7 +2222,7 @@
<target>レプリカセット</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">99</context>
<context context-type="linenumber">129</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/replicaset/template.html</context>
......@@ -2270,7 +2270,7 @@
<target>ステートフルセット</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">125</context>
<context context-type="linenumber">165</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/statefulset/template.html</context>
......@@ -4119,7 +4119,7 @@
<target>レプリケーションコントローラー</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">112</context>
<context context-type="linenumber">147</context>
</context-group>
</trans-unit>
<trans-unit id="8a3abe0df530103020a480befe1757e3b1776e7b" datatype="html">
......
......@@ -351,7 +351,7 @@
<target>크론 잡</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">33</context>
<context context-type="linenumber">38</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/cronjob/template.html</context>
......@@ -363,7 +363,7 @@
<target>데몬 셋</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">46</context>
<context context-type="linenumber">56</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/daemonset/template.html</context>
......@@ -375,7 +375,7 @@
<target>디플로이먼트</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">59</context>
<context context-type="linenumber">74</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/deployment/template.html</context>
......@@ -387,7 +387,7 @@
<target></target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">72</context>
<context context-type="linenumber">92</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/job/template.html</context>
......@@ -399,7 +399,7 @@
<target>파드</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">86</context>
<context context-type="linenumber">111</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/creator/template.html</context>
......@@ -447,7 +447,7 @@
<target>레플리카 셋</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">99</context>
<context context-type="linenumber">129</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/replicaset/template.html</context>
......@@ -459,7 +459,7 @@
<target>레플리케이션 컨트롤러</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">112</context>
<context context-type="linenumber">147</context>
</context-group>
</trans-unit>
<trans-unit id="0756fdca226249dcff9d05651d50b7acdade2aba" datatype="html">
......@@ -467,7 +467,7 @@
<target>스테이트풀 셋</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">125</context>
<context context-type="linenumber">165</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/statefulset/template.html</context>
......
此差异已折叠。
......@@ -351,7 +351,7 @@
<target>Cron Jobs</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">33</context>
<context context-type="linenumber">38</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/cronjob/template.html</context>
......@@ -363,7 +363,7 @@
<target>Daemon Sets</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">46</context>
<context context-type="linenumber">56</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/daemonset/template.html</context>
......@@ -375,7 +375,7 @@
<target>Deployments</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">59</context>
<context context-type="linenumber">74</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/deployment/template.html</context>
......@@ -387,7 +387,7 @@
<target>Jobs</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">72</context>
<context context-type="linenumber">92</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/job/template.html</context>
......@@ -399,7 +399,7 @@
<target>Pods</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">86</context>
<context context-type="linenumber">111</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/creator/template.html</context>
......@@ -447,7 +447,7 @@
<target>Replica Sets</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">99</context>
<context context-type="linenumber">129</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/replicaset/template.html</context>
......@@ -459,7 +459,7 @@
<target>Replication Controllers</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">112</context>
<context context-type="linenumber">147</context>
</context-group>
</trans-unit>
<trans-unit id="0756fdca226249dcff9d05651d50b7acdade2aba" datatype="html">
......@@ -467,7 +467,7 @@
<target>Stateful Sets</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">125</context>
<context context-type="linenumber">165</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/statefulset/template.html</context>
......
......@@ -351,7 +351,7 @@
<target>Cron Jobs</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">33</context>
<context context-type="linenumber">38</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/cronjob/template.html</context>
......@@ -363,7 +363,7 @@
<target>Daemon Sets</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">46</context>
<context context-type="linenumber">56</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/daemonset/template.html</context>
......@@ -375,7 +375,7 @@
<target>Deployments</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">59</context>
<context context-type="linenumber">74</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/deployment/template.html</context>
......@@ -387,7 +387,7 @@
<target>Jobs</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">72</context>
<context context-type="linenumber">92</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/job/template.html</context>
......@@ -399,7 +399,7 @@
<target>Pods</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">86</context>
<context context-type="linenumber">111</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/creator/template.html</context>
......@@ -447,7 +447,7 @@
<target>Replica Sets</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">99</context>
<context context-type="linenumber">129</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/replicaset/template.html</context>
......@@ -459,7 +459,7 @@
<target>Replication Controllers</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">112</context>
<context context-type="linenumber">147</context>
</context-group>
</trans-unit>
<trans-unit id="0756fdca226249dcff9d05651d50b7acdade2aba" datatype="html">
......@@ -467,7 +467,7 @@
<target>Stateful Sets</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">125</context>
<context context-type="linenumber">165</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/statefulset/template.html</context>
......
......@@ -351,7 +351,7 @@
<target>Cron Jobs</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">33</context>
<context context-type="linenumber">38</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/cronjob/template.html</context>
......@@ -363,7 +363,7 @@
<target>Daemon Sets</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">46</context>
<context context-type="linenumber">56</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/daemonset/template.html</context>
......@@ -375,7 +375,7 @@
<target>Deployments</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">59</context>
<context context-type="linenumber">74</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/deployment/template.html</context>
......@@ -387,7 +387,7 @@
<target>Jobs</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">72</context>
<context context-type="linenumber">92</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/job/template.html</context>
......@@ -399,7 +399,7 @@
<target>Pods</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">86</context>
<context context-type="linenumber">111</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/creator/template.html</context>
......@@ -447,7 +447,7 @@
<target>Replica Sets</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">99</context>
<context context-type="linenumber">129</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/replicaset/template.html</context>
......@@ -459,7 +459,7 @@
<target>Replication Controllers</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">112</context>
<context context-type="linenumber">147</context>
</context-group>
</trans-unit>
<trans-unit id="0756fdca226249dcff9d05651d50b7acdade2aba" datatype="html">
......@@ -467,7 +467,7 @@
<target>Stateful Sets</target>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/workloadstatus/template.html</context>
<context context-type="linenumber">125</context>
<context context-type="linenumber">165</context>
</context-group>
<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/resourcelist/statefulset/template.html</context>
......
{
"name": "kubernetes-dashboard",
"version": "2.0.0-rc7",
"version": "2.0.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......
{
"name": "kubernetes-dashboard",
"version": "2.0.0-rc7",
"version": "2.0.0",
"repository": {
"type": "git",
"url": "https://github.com/kubernetes/dashboard.git"
......
......@@ -19,6 +19,7 @@ import (
"log"
"net/http"
"reflect"
"sync"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
......@@ -34,6 +35,7 @@ type SettingsManager struct {
settings map[string]api.Settings
pinnedResources []api.PinnedResource
rawSettings map[string]string
mux sync.Mutex
}
// NewSettingsManager creates new settings manager.
......@@ -58,6 +60,8 @@ func (sm *SettingsManager) load(client kubernetes.Interface) (configMap *v1.Conf
isDifferent = !reflect.DeepEqual(sm.rawSettings, configMap.Data)
if isDifferent {
sm.mux.Lock()
defer sm.mux.Unlock()
sm.rawSettings = configMap.Data
sm.settings = make(map[string]api.Settings)
......
......@@ -17,6 +17,8 @@ import {ActivatedRoute, NavigationEnd, Params, Route, Router} from '@angular/rou
import {Breadcrumb} from '@api/frontendapi';
import {POD_DETAIL_ROUTE} from '../../../resource/workloads/pod/routing';
import {SEARCH_QUERY_STATE_PARAM} from '../../params/params';
import {REPLICATIONCONTROLLER_DETAIL_ROUTE} from '../../../resource/workloads/replicationcontroller/routing';
import {REPLICASET_DETAIL_ROUTE} from '../../../resource/workloads/replicaset/routing';
export const LOGS_PARENT_PLACEHOLDER = '___LOGS_PARENT_PLACEHOLDER___';
export const EXEC_PARENT_PLACEHOLDER = '___EXEC_PARENT_PLACEHOLDER___';
......@@ -115,6 +117,10 @@ export class BreadcrumbsComponent implements OnInit {
const resourceType = params['resourceType'];
if (resourceType === 'pod') {
return POD_DETAIL_ROUTE;
} else if (resourceType === 'replicationcontroller') {
return REPLICATIONCONTROLLER_DETAIL_ROUTE;
} else if (resourceType === 'replicaset') {
return REPLICASET_DETAIL_ROUTE;
} else {
return undefined;
}
......
......@@ -27,7 +27,12 @@ limitations under the License.
<ngx-charts-pie-chart [results]="resourcesRatio.cronJobRatio"
[view]="[200,200]"
[customColors]="getCustomColor"
[animations]="false"></ngx-charts-pie-chart>
[animations]="false">
<ng-template #tooltipTemplate
let-model="model">
{{model.value | number}}%
</ng-template>
</ngx-charts-pie-chart>
</div>
<div class="kd-graph-title"
i18n>Cron Jobs</div>
......@@ -40,7 +45,12 @@ limitations under the License.
<ngx-charts-pie-chart [results]="resourcesRatio.daemonSetRatio"
[view]="[200,200]"
[customColors]="getCustomColor"
[animations]="false"></ngx-charts-pie-chart>
[animations]="false">
<ng-template #tooltipTemplate
let-model="model">
{{model.value | number}}%
</ng-template>
</ngx-charts-pie-chart>
</div>
<div class="kd-graph-title"
i18n>Daemon Sets</div>
......@@ -53,7 +63,12 @@ limitations under the License.
<ngx-charts-pie-chart [results]="resourcesRatio.deploymentRatio"
[view]="[200,200]"
[customColors]="getCustomColor"
[animations]="false"></ngx-charts-pie-chart>
[animations]="false">
<ng-template #tooltipTemplate
let-model="model">
{{model.value | number}}%
</ng-template>
</ngx-charts-pie-chart>
</div>
<div class="kd-graph-title"
i18n>Deployments</div>
......@@ -66,7 +81,12 @@ limitations under the License.
<ngx-charts-pie-chart [results]="resourcesRatio.jobRatio"
[view]="[200,200]"
[customColors]="getCustomColor"
[animations]="false"></ngx-charts-pie-chart>
[animations]="false">
<ng-template #tooltipTemplate
let-model="model">
{{model.value | number}}%
</ng-template>
</ngx-charts-pie-chart>
</div>
<div class="kd-graph-title"
i18n>Jobs</div>
......@@ -80,7 +100,12 @@ limitations under the License.
[view]="[200,200]"
[customColors]="getCustomColor"
[animations]="false"
id="kd-graph-pods"></ngx-charts-pie-chart>
id="kd-graph-pods">
<ng-template #tooltipTemplate
let-model="model">
{{model.value | number}}%
</ng-template>
</ngx-charts-pie-chart>
</div>
<div class="kd-graph-title"
i18n>Pods</div>
......@@ -93,7 +118,12 @@ limitations under the License.
<ngx-charts-pie-chart [results]="resourcesRatio.replicaSetRatio"
[view]="[200,200]"
[customColors]="getCustomColor"
[animations]="false"></ngx-charts-pie-chart>
[animations]="false">
<ng-template #tooltipTemplate
let-model="model">
{{model.value | number}}%
</ng-template>
</ngx-charts-pie-chart>
</div>
<div class="kd-graph-title"
i18n>Replica Sets</div>
......@@ -106,7 +136,12 @@ limitations under the License.
<ngx-charts-pie-chart [results]="resourcesRatio.replicationControllerRatio"
[view]="[200,200]"
[customColors]="getCustomColor"
[animations]="false"></ngx-charts-pie-chart>
[animations]="false">
<ng-template #tooltipTemplate
let-model="model">
{{model.value | number}}%
</ng-template>
</ngx-charts-pie-chart>
</div>
<div class="kd-graph-title"
i18n>Replication Controllers</div>
......@@ -119,7 +154,12 @@ limitations under the License.
<ngx-charts-pie-chart [results]="resourcesRatio.statefulSetRatio"
[view]="[200,200]"
[customColors]="getCustomColor"
[animations]="false"></ngx-charts-pie-chart>
[animations]="false">
<ng-template #tooltipTemplate
let-model="model">
{{model.value | number}}%
</ng-template>
</ngx-charts-pie-chart>
</div>
<div class="kd-graph-title"
i18n>Stateful Sets</div>
......
......@@ -30,7 +30,7 @@ const REPLICASET_LIST_ROUTE: Route = {
},
};
const REPLICASET_DETAIL_ROUTE: Route = {
export const REPLICASET_DETAIL_ROUTE: Route = {
path: ':resourceNamespace/:resourceName',
component: ReplicaSetDetailComponent,
data: {
......
......@@ -30,7 +30,7 @@ const REPLICATIONCONTROLLER_LIST_ROUTE: Route = {
},
};
const REPLICATIONCONTROLLER_DETAIL_ROUTE: Route = {
export const REPLICATIONCONTROLLER_DETAIL_ROUTE: Route = {
path: ':resourceNamespace/:resourceName',
component: ReplicationControllerDetailComponent,
data: {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册