Skip to content

Commit ef2e2ee

Browse files
committed
Merge branch 'vz-oke-warning' into 'main'
Adding warning message about OKE NPN networking See merge request weblogic-cloud/weblogic-toolkit-ui!270
2 parents 8b6086d + 370c375 commit ef2e2ee

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

electron/app/locales/en/webui.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959

6060
"kubectl-k8s-flavor-label": "Kubernetes Cluster Type",
6161
"kubectl-k8s-flavor-help": "The Kubernetes cluster provider type where the Oracle Fusion Middleware domain will be deployed.",
62+
"kubectl-vz-oke-warning": "<b>WARNING</b>: When creating an OKE cluster, the default Native Pod Networking is not compatible with Verrazzano unless the Kubernetes version is 1.26.2 or higher. For earlier Kubernetes versions, you must use Flannel networking for Verrazzano to install and work properly.",
6263
"kubectl-exe-file-path-label": "Kubectl Executable to Use",
6364
"kubectl-exe-file-path-help": "The full path to the Kubernetes kubectl client executable that is compatible with the target Kubernetes cluster.",
6465
"kubectl-exe-file-path-tooltip": "Choose the Kubectl Executable",

webui/src/js/viewModels/kubectl-page.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,11 @@ function(accUtils, ko, project, i18n, ArrayDataProvider, BufferingDataProvider,
358358
}
359359
return flavor;
360360
};
361+
362+
this.isVerrazzanoOKE = ko.computed(() => {
363+
return this.project.settings.wdtTargetType.observable() === 'vz'
364+
&& this.project.kubectl.k8sFlavor.observable() === 'OKE';
365+
}, this);
361366
}
362367

363368
/*

webui/src/js/views/kubectl-page.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ <h6 id="kubectl-instructions-title" class="wkt-subheading"><oj-bind-text value="
3737
</template>
3838
</oj-bind-for-each>
3939
</ol>
40+
<oj-bind-if test="[[isVerrazzanoOKE()]]">
41+
<p id="kubectl-vz-oke-warning" data-bind="html: labelMapper('vz-oke-warning')"></p>
42+
<!-- <oj-bind-text value="[[labelMapper('vz-oke-warning')]]"></oj-bind-text>-->
43+
</oj-bind-if>
4044
</div>
4145
</div>
4246
</div>

0 commit comments

Comments
 (0)