+
+
+
![]()
-
-
diff --git a/pages/prefs.vue b/pages/prefs.vue
index 564cbe7c49..b119b5b839 100644
--- a/pages/prefs.vue
+++ b/pages/prefs.vue
@@ -166,7 +166,6 @@ export default {
-
+
-
-
-
- API Keys
-
+
@@ -236,6 +236,18 @@ export default {
}
> .user {
+ outline: none;
+
+ &:focus {
+ .v-popover {
+ ::v-deep .trigger {
+ .user-image > * {
+ @include form-focus
+ }
+ }
+ }
+ }
+
grid-area: user;
background-color: var(--header-bg);
padding: 5px;
diff --git a/config/labels-annotations.js b/config/labels-annotations.js
index 42a42a4e3c..22f00bbbe6 100644
--- a/config/labels-annotations.js
+++ b/config/labels-annotations.js
@@ -68,6 +68,8 @@ export const RBAC = { PRODUCT: 'management.cattle.io/ui-product' };
export const RKE = { EXTERNAL_IP: 'rke.cattle.io/external-ip' };
+export const ISTIO = { AUTO_INJECTION: 'istio-injection' };
+
const CATTLE_REGEX = /cattle\.io\//;
export const LABELS_TO_IGNORE_REGEX = [
diff --git a/config/product/auth.js b/config/product/auth.js
index c858829a86..4201fb2661 100644
--- a/config/product/auth.js
+++ b/config/product/auth.js
@@ -42,6 +42,15 @@ export function init(store) {
});
componentForType(`${ MANAGEMENT.AUTH_CONFIG }/github`, 'auth/github');
+ componentForType(`${ MANAGEMENT.AUTH_CONFIG }/openldap`, 'auth/ldap/index');
+ componentForType(`${ MANAGEMENT.AUTH_CONFIG }/freeipa`, 'auth/ldap/index');
+ componentForType(`${ MANAGEMENT.AUTH_CONFIG }/activedirectory`, 'auth/ldap/index');
+ componentForType(`${ MANAGEMENT.AUTH_CONFIG }/ping`, 'auth/saml');
+ componentForType(`${ MANAGEMENT.AUTH_CONFIG }/shibboleth`, 'auth/saml');
+ componentForType(`${ MANAGEMENT.AUTH_CONFIG }/okta`, 'auth/saml');
+ componentForType(`${ MANAGEMENT.AUTH_CONFIG }/keycloak`, 'auth/saml');
+ componentForType(`${ MANAGEMENT.AUTH_CONFIG }/adfs`, 'auth/saml');
+ componentForType(`${ MANAGEMENT.AUTH_CONFIG }/googleoauth`, 'auth/googleoauth');
basicType([
'config',
diff --git a/config/product/backup.js b/config/product/backup.js
index 9e687b1293..436d293169 100644
--- a/config/product/backup.js
+++ b/config/product/backup.js
@@ -27,18 +27,32 @@ export function init(store) {
]);
headers(BACKUP_RESTORE.BACKUP, [
- STATE,
- 'Status',
+ { ...STATE, value: 'Status' },
NAME_HEADER,
'Location',
'Type',
- 'Latest-Backup',
- AGE,
+ {
+ name: 'backupFilename',
+ labelKey: 'backupRestoreOperator.backupFilename',
+ value: 'status.filename'
+ },
+ {
+ name: 'nextBackup',
+ labelKey: 'backupRestoreOperator.nextBackup',
+ value: 'status.nextSnapshotAt',
+ formatter: 'Date'
+ },
+ {
+ name: 'nextBackup',
+ labelKey: 'backupRestoreOperator.lastBackup',
+ value: 'status.lastSnapshotTs',
+ formatter: 'Date'
+
+ }
]);
headers(BACKUP_RESTORE.RESTORE, [
- STATE,
- 'Status',
+ { ...STATE, value: 'Status' },
NAME_HEADER,
'Backup-Source',
'Backup-File',
diff --git a/config/types.js b/config/types.js
index 3bcb36ed1a..d91a628051 100644
--- a/config/types.js
+++ b/config/types.js
@@ -14,6 +14,8 @@ export const STEVE = {
export const NORMAN = {
AUTH_CONFIG: 'authconfig',
PRINCIPAL: 'principal',
+ USER: 'user',
+ TOKEN: 'token',
};
// Public (via Norman)
@@ -126,6 +128,7 @@ export const MANAGEMENT = {
SETTING: 'management.cattle.io.setting',
TOKEN: 'management.cattle.io.token',
USER: 'management.cattle.io.user',
+ TOKEN: 'management.cattle.io.token',
};
export const CAPI = {
diff --git a/edit/auth/github.vue b/edit/auth/github.vue
index 7ee6052b79..73ab05c201 100644
--- a/edit/auth/github.vue
+++ b/edit/auth/github.vue
@@ -10,7 +10,7 @@ import AsyncButton from '@/components/AsyncButton';
import CopyToClipboardText from '@/components/CopyToClipboardText.vue';
import AllowedPrincipals from '@/components/auth/AllowedPrincipals';
import { NORMAN, MANAGEMENT } from '@/config/types';
-import { addObject, findBy } from '@/utils/array';
+import { findBy } from '@/utils/array';
const NAME = 'github';
@@ -105,6 +105,14 @@ export default {
AUTH_CONFIG() {
return MANAGEMENT.AUTH_CONFIG;
},
+
+ toSave() {
+ return {
+ enabled: true,
+ githubConfig: this.model,
+ description: 'Enable GitHub',
+ };
+ }
},
watch: {
@@ -113,18 +121,6 @@ export default {
},
methods: {
- async reloadModel() {
- this.originalModel = await this.$store.dispatch('rancher/find', {
- type: NORMAN.AUTH_CONFIG,
- id: NAME,
- opt: { url: `/v3/${ NORMAN.AUTH_CONFIG }/${ NAME }`, force: true }
- });
-
- this.model = await this.$store.dispatch(`rancher/clone`, { resource: this.originalModel });
-
- return this.model;
- },
-
updateHost() {
const match = this.targetUrl.match(/^(((https?):)?\/\/)?([^/]+)(\/.*)?$/);
@@ -138,67 +134,6 @@ export default {
this.model.hostname = match[4] || 'github.com';
}
},
-
- async save(btnCb) {
- this.errors = [];
-
- const wasEnabled = this.model.enabled;
-
- try {
- if ( !wasEnabled ) {
- const code = await this.$store.dispatch('auth/test', { provider: NAME, body: this.model });
-
- this.model.enabled = true;
-
- await this.model.doAction('testAndApply', {
- code,
- enabled: true,
- githubConfig: this.model,
- description: 'Enable GitHub',
- });
-
- // Reload principals to get the new ones from GitHub
- this.principals = await this.$store.dispatch('rancher/findAll', {
- type: NORMAN.PRINCIPAL,
- opt: { url: '/v3/principals', force: true }
- });
-
- this.model.accessMode = 'restricted';
- this.model.allowedPrincipalIds = this.model.allowedPrincipalIds || [];
-
- if ( this.me && !this.model.allowedPrincipalIds.includes(this.me.id) ) {
- addObject(this.model.allowedPrincipalIds, this.me.id);
- }
- }
-
- await this.model.save();
-
- await this.reloadModel();
-
- btnCb(true);
-
- if ( wasEnabled ) {
- this.done();
- }
- } catch (err) {
- this.errors = [err];
- btnCb(false);
- }
- },
-
- async disable(btnCb) {
- try {
- const clone = await this.$store.dispatch(`rancher/clone`, { resource: this.model });
-
- clone.enabled = false;
- await clone.save();
- await this.reloadModel();
- btnCb(true);
- } catch (err) {
- this.errors = [err];
- btnCb(false);
- }
- }
},
};
@@ -219,7 +154,7 @@ export default {
@finish="save"
@cancel="done"
>
-
+
{{ t('authConfig.stateBanner.enabled', tArgs) }}
diff --git a/edit/auth/googleoauth.vue b/edit/auth/googleoauth.vue
new file mode 100644
index 0000000000..3dbf6628a8
--- /dev/null
+++ b/edit/auth/googleoauth.vue
@@ -0,0 +1,180 @@
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
diff --git a/edit/auth/ldap/config.vue b/edit/auth/ldap/config.vue
new file mode 100644
index 0000000000..c0bbbd12e5
--- /dev/null
+++ b/edit/auth/ldap/config.vue
@@ -0,0 +1,205 @@
+
+
+
+
+ {{ t('authConfig.stateBanner.enabled', tArgs) }}
+
+
+
+ {{ t(`authConfig.${NAME}.adminEmail`) }}: {{ model.adminEmail }}
+ {{ t(`authConfig.${NAME}.domain`) }}: {{ model.hostname }}
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/edit/auth/ldap/index.vue b/edit/auth/ldap/index.vue
new file mode 100644
index 0000000000..fb60579b4d
--- /dev/null
+++ b/edit/auth/ldap/index.vue
@@ -0,0 +1,139 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('authConfig.ldap.customizeSchema') }}
+
+
+
+
+ {{ t('authConfig.ldap.users') }}
+
+
+ {{ t('authConfig.ldap.groups') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
diff --git a/edit/auth/saml.vue b/edit/auth/saml.vue
new file mode 100644
index 0000000000..3577e9d12a
--- /dev/null
+++ b/edit/auth/saml.vue
@@ -0,0 +1,195 @@
+
+
+
+
+ {{ t('authConfig.stateBanner.enabled', tArgs) }}
+
+
+
+ Server: {{ serverUrl }}
+ Client ID: {{ model.serviceAccountDistinguishedName || model.serviceAccountUsername }}
+
+ + +
{{ t(`authConfig.ldap.${NAME}`) }}
+{{ t('authConfig.testAndEnable') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
diff --git a/edit/monitoring.coreos.com.receiver/types/opsgenie.vue b/edit/monitoring.coreos.com.receiver/types/opsgenie.vue
index 0fee4bce64..491036f02e 100644
--- a/edit/monitoring.coreos.com.receiver/types/opsgenie.vue
+++ b/edit/monitoring.coreos.com.receiver/types/opsgenie.vue
@@ -173,26 +173,26 @@ export default {
diff --git a/edit/resources.cattle.io.backup.vue b/edit/resources.cattle.io.backup.vue
index 756c29487b..c902c70fd5 100644
--- a/edit/resources.cattle.io.backup.vue
+++ b/edit/resources.cattle.io.backup.vue
@@ -171,9 +171,8 @@ export default {
+ {{ t('authConfig.stateBanner.enabled', tArgs) }}
+
+
+
+ Server: {{ baseUrl }}
+ Display Name: {{ model.displayNameField }}
+
+ + +
{{ t(`authConfig.saml.${NAME}`) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
import { isEmpty } from 'lodash';
+import throttle from 'lodash/throttle';
import ArrayList from '@/components/form/ArrayList';
import CreateEditView from '@/mixins/create-edit-view';
import KeyValue from '@/components/form/KeyValue';
@@ -16,15 +17,17 @@ import CruResource from '@/components/CruResource';
import Banner from '@/components/Banner';
import Labels from '@/components/form/Labels';
import { clone } from '@/utils/object';
+import { POD } from '@/config/types';
+import { matching } from '@/utils/selector';
const SESSION_AFFINITY_ACTION_VALUES = {
NONE: 'None',
- CLIENTIP: 'ClientIP'
+ CLIENTIP: 'ClientIP',
};
const SESSION_AFFINITY_ACTION_LABELS = {
NONE: 'servicesPage.affinity.actionLabels.none',
- CLIENTIP: 'servicesPage.affinity.actionLabels.clientIp'
+ CLIENTIP: 'servicesPage.affinity.actionLabels.clientIp',
};
const SESSION_STICKY_TIME_DEFAULT = 10800;
@@ -45,22 +48,36 @@ export default {
ServicePorts,
Tab,
Tabbed,
- UnitInput
+ UnitInput,
},
mixins: [CreateEditView],
+ fetch() {
+ return this.loadPods();
+ },
+
data() {
if (!this?.value?.spec?.type) {
if (!this.value?.spec) {
this.$set(this.value, 'spec', {
ports: [],
- sessionAffinity: 'None'
+ sessionAffinity: 'None',
});
}
}
+ const matchingPods = {
+ matched: 0,
+ matches: [],
+ none: true,
+ sample: null,
+ total: 0,
+ };
+
return {
+ matchingPods,
+ allPods: [],
defaultServiceTypes: DEFAULT_SERVICE_TYPES,
saving: false,
sessionAffinityActionLabels: Object.values(SESSION_AFFINITY_ACTION_LABELS)
@@ -68,7 +85,7 @@ export default {
.map(ucFirst),
sessionAffinityActionOptions: Object.values(
SESSION_AFFINITY_ACTION_VALUES
- )
+ ),
};
},
@@ -112,18 +129,26 @@ export default {
this.$set(this.value.spec, 'type', serviceType);
}
- }
+ },
},
showAffinityTimeout() {
- return this.value.spec.sessionAffinity === 'ClientIP' && !isEmpty(this.value.spec.sessionAffinityConfig);
+ return (
+ this.value.spec.sessionAffinity === 'ClientIP' &&
+ !isEmpty(this.value.spec.sessionAffinityConfig)
+ );
},
hasClusterIp() {
- return this.checkTypeIs('ClusterIP') || this.checkTypeIs('LoadBalancer') || this.checkTypeIs('NodePort');
- }
+ return (
+ this.checkTypeIs('ClusterIP') ||
+ this.checkTypeIs('LoadBalancer') ||
+ this.checkTypeIs('NodePort')
+ );
+ },
},
watch: {
+ 'value.spec.selector': 'updateMatchingPods',
'value.spec.sessionAffinity'(val) {
if (val === 'ClientIP') {
this.value.spec.sessionAffinityConfig = { clientIP: { timeoutSeconds: null } };
@@ -139,7 +164,7 @@ export default {
) {
delete this.value.spec.sessionAffinityConfig.clientIP.timeoutSeconds;
}
- }
+ },
},
created() {
@@ -153,6 +178,37 @@ export default {
},
methods: {
+ updateMatchingPods: throttle(function() {
+ const { allPods, value: { spec: { selector = { } } } } = this;
+
+ if (isEmpty(selector)) {
+ this.matchingPods = {
+ matched: 0,
+ total: allPods.length,
+ none: true,
+ sample: null,
+ };
+ } else {
+ const match = matching(allPods, selector);
+
+ this.matchingPods = {
+ matched: match.length,
+ total: allPods.length,
+ none: match.length === 0,
+ sample: match[0] ? match[0].nameDisplay : null,
+ };
+ }
+ }, 250, { leading: true }),
+
+ async loadPods() {
+ try {
+ const inStore = this.$store.getters['currentProduct'].inStore;
+
+ this.allPods = await this.$store.dispatch(`${ inStore }/findAll`, { type: POD });
+ this.matchingPods.total = this.allPods.length;
+ } catch (e) { }
+ },
+
checkTypeIs(typeIn) {
const { serviceType } = this;
@@ -187,8 +243,7 @@ export default {
this.value.spec.ports = this.targetPortsStrOrInt(this.value.spec.ports);
}
},
-
- }
+ },
};
@@ -201,10 +256,10 @@ export default {
:subtypes="defaultServiceTypes"
:validation-passed="true"
:errors="errors"
- @error="e=>errors = e"
+ @error="(e) => (errors = e)"
@finish="save"
@cancel="done"
- @select-type="(st) => serviceType = st"
+ @select-type="(st) => (serviceType = st)"
@apply-hooks="() => applyHooks('_beforeSaveHooks')"
>
-
+
-
-
@@ -313,10 +379,22 @@ export default {
-
+
+
@@ -258,24 +321,27 @@ export default {
:mode="mode"
:initial-empty-row="true"
:protip="false"
- @input="e=>$set(value.spec, 'selector', e)"
+ @input="(e) => $set(value.spec, 'selector', e)"
/>
+
+
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/pages/c/_cluster/istio/index.vue b/pages/c/_cluster/istio/index.vue
index 3862a68ea3..92260d1d1e 100644
--- a/pages/c/_cluster/istio/index.vue
+++ b/pages/c/_cluster/istio/index.vue
@@ -100,6 +100,9 @@ export default {
+
-
-
+
+
+
+