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

Merge pull request #4328 from westlywright/bug.eks.import.private 

Bug EKS Import Command
This commit is contained in:
Westly Wright 2020-12-03 11:12:25 -07:00 committed by GitHub
parent 1293d745b2 78ff7f8a96
commit e8c96cdec3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/cluster.js
View File

@ -165,7 +165,7 @@ export default Resource.extend(Grafana, ResourceUsage, {
const { const {
clusterProvider, eksConfig = {}, eksStatus = {} clusterProvider, eksConfig = {}, eksStatus = {}
} = this; } = this;
const privateAccess = get(eksConfig, 'privateAccess') || get(eksStatus, 'upstreamSpec.privateAccess') || false; const privateAccess = !get(eksConfig, 'publicAccess') && get(eksConfig, 'privateAccess') || get(eksStatus, 'upstreamSpec.privateAccess') || false;
if (clusterProvider === 'amazoneksv2' && privateAccess) { if (clusterProvider === 'amazoneksv2' && privateAccess) {
return true; return true;
@ -178,7 +178,7 @@ export default Resource.extend(Grafana, ResourceUsage, {
const { const {
clusterProvider, eksConfig = {}, eksStatus = {} clusterProvider, eksConfig = {}, eksStatus = {}
} = this; } = this;
const privateAccess = get(eksConfig, 'privateAccess') || get(eksStatus, 'upstreamSpec.privateAccess') || false; const privateAccess = !get(eksConfig, 'publicAccess') && get(eksConfig, 'privateAccess') || get(eksStatus, 'upstreamSpec.privateAccess') || false;
const ignored = ['custom', 'import', 'amazoneksv2']; const ignored = ['custom', 'import', 'amazoneksv2'];
if (!ignored.includes(clusterProvider)) { if (!ignored.includes(clusterProvider)) {

10
lib/shared/addon/components/cluster-driver/driver-eks/component.js
View File

@ -306,17 +306,17 @@ export default Component.extend(ClusterDriver, {
const { const {
isNew, isNew,
isPostSave, isPostSave,
config: { privateAccess } config: { privateAccess, publicAccess }
} = this; } = this;
if (privateAccess && isPostSave) { if (!publicAccess && privateAccess && isPostSave) {
if (isNew) { if (isNew) {
set(this, 'step', 5); set(this, 'step', 5);
} else if (this.close) {
this.close();
} else { } else {
this.send('close'); this.close();
} }
} else {
this.close();
} }
}), }),

2
lib/shared/addon/components/cluster-driver/driver-import-eks/component.js
View File

@ -167,7 +167,7 @@ export default Component.extend(ClusterDriver, {
} }
} }
} = this; } = this;
const privateAccess = get(eksConfig, 'privateAccess') || get(eksStatus, 'upstreamSpec.privateAccess') || false; const privateAccess = !get(eksConfig, 'publicAccess') && get(eksConfig, 'privateAccess') || get(eksStatus, 'upstreamSpec.privateAccess') || false;
if (isPostSave && privateAccess) { if (isPostSave && privateAccess) {
set(this, 'step', 3); set(this, 'step', 3);