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

Show k3s system services correctly

This commit is contained in:
Vincent Fiduccia 2021-06-18 13:05:16 -07:00
parent a787f98a73
commit ad0774d36a
No known key found for this signature in database
GPG Key ID: 2B29AD6BB2BB2582
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1109,6 +1109,13 @@ cluster:
rke2-ingress-nginx: 'NGINX Ingress Controller'
rke2-kube-proxy: 'Kube Proxy'
rke2-metrics-server: 'Metrics Server'
k3s:
systemService:
coredns: 'CoreDNS'
local-storage: 'Local Storage'
metrics-server: 'Metrics Server'
servicelb: 'Klipper Service LB'
traefik: 'Traefik Ingress'
selectCredential:
genericDescription: "{vendor} has no built-in support for this driver. We've taken a guess, but consult the driver's documentation for the fields required for authentication."
tabs:

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

@ -342,9 +342,11 @@ export default {
},
disableOptions() {
const isK3s = (this.value?.spec?.kubernetesVersion || '').includes('k3s');
return this.serverArgs.disable.options.map((value) => {
return {
label: this.$store.getters['i18n/withFallback'](`cluster.rke2.systemService."${ value }"`, null, value.replace(/^(rke2|rancher)-/, '')),
label: this.$store.getters['i18n/withFallback'](`cluster.${ isK3s ? 'k3s' : 'rke2' }.systemService."${ value }"`, null, value.replace(/^(rke2|rancher)-/, '')),
value,
};
});
@ -772,10 +774,9 @@ export default {
},
syncChartValues: throttle(function() {
const keys = this.addonVersions.map(x => x.name );
const out = {};
for ( const k of keys ) {
for ( const k of this.addonNames ) {
const fromChart = this.versionInfo[k].values;
const fromUser = this.chartValues[k];
const different = diff(fromChart, fromUser);