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

Add missing labels and annotations section

This commit is contained in:
Westly Wright 2020-08-03 14:04:45 -07:00
parent 6b90aa3575
commit 01f4e4cc6f
No known key found for this signature in database
GPG Key ID: 4FAB3D8673DC54A3
2 changed files with 71 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ generic:
add: Add
back: Back
cancel: Cancel
clickToShow: '[Show Value]'
clickToShow: "[Show Value]"
close: Close
comingSoon: Coming Soon
create: Create
@ -39,10 +39,10 @@ nav:
ns:
all: All Namespaces
clusterLevel: Only Cluster Resources
namespace: '{name}'
namespace: "{name}"
namespaced: Only Namespaced Resources
orphan: Not in a Project
project: 'Project: {name}'
project: "Project: {name}"
system: Only System Namespaces
user: Only User Namespaces
@ -135,7 +135,7 @@ cluster:
clusterIndexPage:
hardwareResourceGauge:
consumption: '{useful} of {total} {units} {suffix}'
consumption: "{useful} of {total} {units} {suffix}"
coresReserved: Cores Reserved
coresUsed: Cores Used
podsReserved: Pods Reserved
@ -179,10 +179,10 @@ cruResource:
previewYaml: Preview Yaml
cancel: Cancelling will destroy your changes.
back: Going back will destroy your changes.
confirmYaml: 'No, Review Yaml'
confirmYaml: "No, Review Yaml"
backToForm: Go Back To Form
confirmCancel: 'Yes, Cancel'
confirmBack: 'Yes, Go Back'
confirmCancel: "Yes, Cancel"
confirmBack: "Yes, Go Back"
footer:
docs: Docs
@ -260,7 +260,7 @@ ingress:
placeholder: e.g. 80 or http
targetService:
label: Target Service
warning: 'Warning: Default backend is used globally for the entire cluster.'
warning: "Warning: Default backend is used globally for the entire cluster."
rules:
addPath: Add Path
addRule: Add Rule
@ -295,7 +295,7 @@ node:
version: Version
glance:
consumptionGauge:
amount: '{used} of {total} {unit} used'
amount: "{used} of {total} {unit} used"
cpu: CPU
memory: MEMORY
pods: PODS
@ -317,8 +317,8 @@ promptRemove:
=1 {, and one other.}
other {, and {count} others.}
}
attemptingToRemove: 'You are attemping to remove the {type}'
protip: 'protip: Hold the {alternateLabel} key while clicking delete to bypass this confirmation'
attemptingToRemove: "You are attemping to remove the {type}"
protip: "protip: Hold the {alternateLabel} key while clicking delete to bypass this confirmation"
resourceDetail:
detailTop:
@ -333,11 +333,11 @@ resourceDetail:
=1 {Show annotation}
other {Show {annotations} annotations}}
header:
clone: 'Clone from {type}: {name}'
clone: "Clone from {type}: {name}"
create: Create
edit: 'Edit {type}: {name}'
stage: 'Stage from {type}: {name}'
view: '{name}'
edit: "Edit {type}: {name}"
stage: "Stage from {type}: {name}"
view: "{name}"
masthead:
age: Age
defaultBannerMessage:
@ -352,14 +352,14 @@ resourceList:
head:
create: Create
createFromYaml: Create from YAML
createResource: 'Create {resourceName}'
createResource: "Create {resourceName}"
resourceTable:
groupLabel:
namespace: '<span>Namespace:</span> {name}'
namespace: "<span>Namespace:</span> {name}"
notInANamespace: Not Namespaced
notInAProject: Not in a Project
project: '<span>Project:</span> {name}'
project: "<span>Project:</span> {name}"
resourceTabs:
tabs:
@ -376,7 +376,7 @@ rioConfig:
description: Description
helpText:
listItem1: The application deployment engine for Kubernetes.
listItem2: 'Rio makes it faster and easier for DevOps to build, test, deploy, scale and version stateless applications'
listItem2: "Rio makes it faster and easier for DevOps to build, test, deploy, scale and version stateless applications"
requirements:
header: Requirements
helpText:
@ -392,7 +392,7 @@ secret:
cn: Domain Name
expires: Expires
issuer: Issuer
plusMore: '+ {n} more'
plusMore: "+ {n} more"
privateKey: Private Key
readFromFile: Read from File
data: Data
@ -430,6 +430,8 @@ serviceTypes:
nodeport: Node Port
servicesPage:
labelsAnnotations:
label: Labels & Annotations
affinity:
actionLabels:
clusterIp: ClusterIP
@ -441,7 +443,7 @@ servicesPage:
placeholder: e.g. 10800
externalName:
define: Define External Name
helpText: 'External Name is intended to specify a canonical DNS name. To hardcode an IP address, use a Headless service.'
helpText: "External Name is intended to specify a canonical DNS name. To hardcode an IP address, use a Headless service."
label: External Name
placeholder: e.g. my.database.example.com
ips:
@ -451,13 +453,13 @@ servicesPage:
label: External IPs
placeholder: e.g. 1.1.1.1
protip: List of IP addresses for which nodes in the cluster will also accept traffic for this service.
helpText: 'Warning: Configuring additional listener IPs is an advanced use case.'
helpText: "Warning: Configuring additional listener IPs is an advanced use case."
input:
label: Cluster IP
placeholder: e.g. 10.0.171.239
label: Listener IPs
selectors:
helpText: 'If no selector is created, manual endpoints must be made.'
helpText: "If no selector is created, manual endpoints must be made."
label: Selectors
serviceTypes:
clusterIp:
@ -466,7 +468,7 @@ servicesPage:
label: Cluster IP
externalName:
abbrv: EN
description: 'Maps the service to the contents of the `externalName` field (e.g. foo.bar.example.com), by returning a CNAME record with its value. No proxying of any kind is set up.'
description: "Maps the service to the contents of the `externalName` field (e.g. foo.bar.example.com), by returning a CNAME record with its value. No proxying of any kind is set up."
label: External Name
headless:
abbrv: H
@ -485,8 +487,8 @@ servicesPage:
sortableTable:
actionAvailability:
selected: '{actionable} selected'
some: 'Available for {actionable} of the {total} selected'
selected: "{actionable} selected"
some: "Available for {actionable} of the {total} selected"
noData: There are no rows which match your search query.
noRows: There are no rows to show.
paging:
@ -575,7 +577,7 @@ validation:
min: '"{key}" should contain at least {count} {count, plural, =1 {item} other {items}}'
chars: '"{key}" contains {count, plural, =1 {an invalid character} other {# invalid characters}}: {chars}'
custom:
missing: 'No validtor exists for { validatorName }! Does the validtor exist in custom-validtors? Is the name spelled correctly?'
missing: "No validtor exists for { validatorName }! Does the validtor exist in custom-validtors? Is the name spelled correctly?"
dns:
doubleHyphen: '"{key}" Cannot contain two or more consecutive hyphens'
hostname:
@ -614,17 +616,17 @@ validation:
service:
ports:
name:
required: 'Port Rule [{position}] - Name is required.'
required: "Port Rule [{position}] - Name is required."
nodePort:
requriedInt: 'Port Rule [{position}] - Node Port must be interger values if included.'
requriedInt: "Port Rule [{position}] - Node Port must be interger values if included."
port:
required: 'Port Rule [{position}] - Port is required.'
requriedInt: 'Port Rule [{position}] - Port must be interger values if included.'
required: "Port Rule [{position}] - Port is required."
requriedInt: "Port Rule [{position}] - Port must be interger values if included."
targetPort:
between: 'Port Rule [{position}] - Target Port must be between 1 and 65535'
iana: 'Port Rule [{position}] - Target Port must be an IANA Service Name or Integer'
ianaAt: 'Port Rule [{position}] - Target Port '
required: 'Port Rule [{position}] - Target Port is required'
between: "Port Rule [{position}] - Target Port must be between 1 and 65535"
iana: "Port Rule [{position}] - Target Port must be an IANA Service Name or Integer"
ianaAt: "Port Rule [{position}] - Target Port "
required: "Port Rule [{position}] - Target Port is required"
stringLength:
between: '"{key}" should be between {min} and {max} {max, plural, =1 {character} other {characters}}'
exactly: '"{key}" should be {count, plural, =1 {# character} other {# characters}}'
@ -637,7 +639,7 @@ wizard:
back: Back
finish: Finish
next: Next
step: 'Step {number}:'
step: "Step {number}:"
wm:
connection:
@ -647,7 +649,7 @@ wm:
error: Error
containerLogs:
clear: Clear
containerName: 'Container: {label}'
containerName: "Container: {label}"
download: Download
follow: Follow
noData: There are no log entries to show in the current range.
@ -662,7 +664,7 @@ wm:
other {Hours}
}
label: Show the last
lines: '{value, number} Lines'
lines: "{value, number} Lines"
minutes: |
{value, number} {value, plural,
=1 {Minute}
@ -673,9 +675,9 @@ wm:
wrap: Wrap Lines
containerShell:
clear: Clear
containerName: 'Container: {label}'
containerName: "Container: {label}"
kubectlShell:
title: 'Kubectl: {name}'
title: "Kubectl: {name}"
workload:
container:
@ -707,7 +709,7 @@ workload:
initialDelay: Initial Delay
livenessProbe: Liveness Probe
livenessTip: Containers will be restarted when this check is failing. Not recommended for most uses.
noHealthCheck: 'There is not a Readiness Check, Liveness Check or Startup Check configured.'
noHealthCheck: "There is not a Readiness Check, Liveness Check or Startup Check configured."
readinessProbe: Readiness Probe
readinessTip: Containers will be removed from service endpoints when this check is failing. Recommended.
startupProbe: Startup Probe
@ -736,8 +738,8 @@ workload:
runAsGroup: Run as Group ID
runAsNonRoot: Run as Non-Root
runAsNonRootOptions:
noOption: 'No'
yesOption: 'Yes: containers must run as non-root-user'
noOption: "No"
yesOption: "Yes: containers must run as non-root-user"
runAsUser: Run as User ID
shareProcessNamespace: Share single process namespace
supplementalGroups: Additional Group IDs
@ -796,7 +798,7 @@ workload:
label: Host Aliases
tip: Additional /etc/hosts entries to be injected in the container.
valueLabel: Hostname
valuePlaceholder: 'e.g. foo.com, bar.com'
valuePlaceholder: "e.g. foo.com, bar.com"
hostname:
label: Hostname
placeholder: e.g. web
@ -830,9 +832,9 @@ workload:
addRule: Add Rule
doesNotExist: Does Not Exist
exists: Exists
greaterThan: '>'
greaterThan: ">"
in: =
inNamespaces: 'Pods in these namespaces:'
inNamespaces: "Pods in these namespaces:"
key: Key
lessThan: <
notIn: ≠
@ -841,8 +843,8 @@ workload:
weight: Weight
noPodRules: There are no pod scheduling rules configured.
nodeName: Node Name
preferAny: 'Prefer any of:'
requireAny: 'Require any of:'
preferAny: "Prefer any of:"
requireAny: "Require any of:"
schedulingRules: Run pods on node(s) matching these scheduling rules
specificNode: Run pods on specific node(s)
thisPodNamespace: This pod's namespace
@ -868,7 +870,7 @@ workload:
effectOptions:
all: All
noExecute: NoExecute
noSchedule: 'NoSchedule,'
noSchedule: "NoSchedule,"
preferNoSchedule: PreferNoSchedule
labelKey: Label Key
operator: Operator
@ -901,8 +903,8 @@ workload:
tip: The number of old ReplicaSets to retain for rollback.
strategies:
labels:
delete: 'On Delete: New pods are only created when old pods are manually deleted.'
recreate: 'Recreate: Kill ALL pods, then start new pods.'
delete: "On Delete: New pods are only created when old pods are manually deleted."
recreate: "Recreate: Kill ALL pods, then start new pods."
rollingUpdate: "Rolling Update: Create new pods, until max surge is reached, before deleting old pods. Don't stop more pods than max unavailable."
terminationGracePeriodSeconds:
label: Termination Grace Period
@ -942,7 +944,7 @@ model:
registeredAgent: Registered Agent
service: Service
user: User
'catalog.cattle.io.release':
"catalog.cattle.io.release":
firstDeployed: First Deployed
lastDeployed: Last Deployed
cluster:
@ -953,7 +955,7 @@ model:
localUser: Local User
org: Organization
team: Team
unknown: '{type}?'
unknown: "{type}?"
user: User
ingress:
displayKind: L7 Ingress
@ -966,7 +968,7 @@ model:
domain:
help: Only users below this base will be used.
label: User Search Base
placeholder: 'e.g. ou=Users,dc=mycompany,dc=com'
placeholder: "e.g. ou=Users,dc=mycompany,dc=com"
server:
label: Hostname or IP Address
serviceAccountPassword:

15
edit/service.vue
View File

@ -15,6 +15,7 @@ import { ucFirst } from '@/utils/string';
import CruResource from '@/components/CruResource';
import InfoBox from '@/components/InfoBox';
import Banner from '@/components/Banner';
import Labels from '@/components/form/Labels';
const SESSION_AFFINITY_ACTION_VALUES = {
NONE: 'None',
@ -38,6 +39,7 @@ export default {
CruResource,
InfoBox,
KeyValue,
Labels,
LabeledInput,
NameNsDescription,
RadioGroup,
@ -312,6 +314,19 @@ export default {
</div>
</div>
</Tab>
<Tab
name="labels-and-annotations"
:label="t('servicesPage.labelsAnnotations.label', {}, true)"
:weight="1000"
>
<div class="row labels-row">
<Labels
:spec="value.spec"
:mode="mode"
:display-side-by-side="false"
/>
</div>
</Tab>
</Tabbed>
</template>
</CruResource>