rancher
/
dashboard
mirror of https://github.com/rancher/dashboard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Node role labels, typos

This commit is contained in:
Vincent Fiduccia 2021-05-28 17:06:39 -07:00
parent 05329a9f1b
commit abfa67416f
No known key found for this signature in database
GPG Key ID: 2B29AD6BB2BB2582
4 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/translations/en-us.yaml
View File

@ -510,9 +510,9 @@ asyncButton:
waiting: Restoring…
success: Restored
snapshot:
action: Snapshow Now
action: Snapshot Now
waiting: Snapshotting…
success: Shapshot Creating
success: Snapshot Creating
update:
action: Update
success: Updated
@ -961,7 +961,7 @@ cluster:
googlegke: Google GKE
gke: Google GKE
huaweicce: Huawei CCE
import: Import
import: Generic
imported: Imported
k3s: K3s
kubeAdmin: KubeADM
@ -979,7 +979,7 @@ cluster:
rackspace: RackSpace
rancherkubernetesengine: RKE
rke2: RKE2
rke: RKE
rke: RKE1
rkeWindows: Windows
softlayer: SoftLayer
tencenttke: Tencent TKE

7
config/labels-annotations.js
View File

@ -28,9 +28,10 @@ export const STORAGE = {
};
export const NODE_ROLES = {
CONTROL_PLANE: 'node-role.kubernetes.io/controlplane',
WORKER: 'node-role.kubernetes.io/worker',
ETCD: 'node-role.kubernetes.io/etcd',
CONTROL_PLANE_OLD: 'node-role.kubernetes.io/controlplane',
CONTROL_PLANE: 'node-role.kubernetes.io/control-plane',
WORKER: 'node-role.kubernetes.io/worker',
ETCD: 'node-role.kubernetes.io/etcd',
};
export const CAPI = {

14
edit/provisioning.cattle.io.cluster/rke2.vue
View File

@ -835,20 +835,6 @@ export default {
:mode="mode"
/>
</template>
<template v-if="serverArgs['etcd-s3'] && serverConfig['etcd-s3'] !== false">
<pre><code>
--etcd-s3 (db) Enable backup to S3
--etcd-s3-endpoint value (db) S3 endpoint url (default: "s3.amazonaws.com")
--etcd-s3-endpoint-ca value (db) S3 custom CA cert to connect to S3 endpoint
--etcd-s3-skip-ssl-verify (db) Disables S3 SSL certificate validation
--etcd-s3-access-key value (db) S3 access key [$AWS_ACCESS_KEY_ID]
--etcd-s3-secret-key value (db) S3 secret key [$AWS_SECRET_ACCESS_KEY]
--etcd-s3-bucket value (db) S3 bucket name
--etcd-s3-region value (db) S3 region / bucket location (optional) (default: "us-east-1")
--etcd-s3-folder value (db) S3 folder
</code></pre>
</template>
</Tab>
<Tab v-if="haveArgInfo" name="networking" label-key="cluster.tabs.networking" :weight="8">

13
models/node.js
View File

@ -90,15 +90,18 @@ export default {
},
isWorker() {
const { WORKER: worker } = NODE_ROLES;
return `${ this.labels[worker] }` === 'true';
return `${ this.labels[NODE_ROLES.WORKER] }` === 'true';
},
isControlPlane() {
const { CONTROL_PLANE: controlPlane } = NODE_ROLES;
if (
`${ this.labels[NODE_ROLES.CONTROL_PLANE] }` === 'true' ||
`${ this.labels[NODE_ROLES.CONTROL_PLANE_OLD] }` === 'true'
) {
return true;
}
return `${ this.labels[controlPlane] }` === 'true';
return false;
},
isEtcd() {