From ae651eb6456a123255716de2a94b8664c864261c Mon Sep 17 00:00:00 2001 From: Robert Patrick Date: Thu, 20 Oct 2022 08:21:41 -0500 Subject: [PATCH 1/2] making ssl passthru conditional --- README.md | 2 ++ documentation/1.3/content/_index.md | 2 ++ webui/src/js/utils/ingress-controller-installer.js | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c1a32867a..f94529873 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ applications to run in Linux containers on a Kubernetes cluster. WKT includes t images for running WebLogic domains. - [WebLogic Kubernetes Operator (WKO)](https://github.com/oracle/weblogic-kubernetes-operator) - A Kubernetes operator that allows WebLogic domains to run natively in a Kubernetes cluster. +- [WebLogic Remote Console](https://github.com/oracle/weblogic-remote-console) - A lightweight console that for managing + WebLogic Server domains running anywhere. The WKT UI provides a graphical user interface that wraps the WKT tools, Docker, Helm, and the Kubernetes client (`kubectl`) and helps guide you through the process of creating and modifying a model of your WebLogic domain, creating diff --git a/documentation/1.3/content/_index.md b/documentation/1.3/content/_index.md index cff917b53..94443c396 100644 --- a/documentation/1.3/content/_index.md +++ b/documentation/1.3/content/_index.md @@ -9,6 +9,8 @@ applications to run in Linux containers on a Kubernetes cluster. WKT includes t images for running WebLogic domains. - [WebLogic Kubernetes Operator (WKO)](https://github.com/oracle/weblogic-kubernetes-operator) - A Kubernetes operator that allows WebLogic domains to run natively in a Kubernetes cluster. +- [WebLogic Remote Console](https://github.com/oracle/weblogic-remote-console) - A lightweight console that for managing + WebLogic Server domains running anywhere. The WKT UI provides a graphical user interface that wraps the WKT tools, Docker, Helm, and the Kubernetes client (`kubectl`) and helps guide you through the process of creating and modifying a model of your WebLogic domain, creating diff --git a/webui/src/js/utils/ingress-controller-installer.js b/webui/src/js/utils/ingress-controller-installer.js index b518bde86..9a877a838 100644 --- a/webui/src/js/utils/ingress-controller-installer.js +++ b/webui/src/js/utils/ingress-controller-installer.js @@ -249,7 +249,7 @@ function(IngressActionsBase, project, wktConsole, k8sHelper, i18n, dialogHelper, helmChartData['kubernetes.namespaces'] = `{${ingressControllerNamespace},${this.project.k8sDomain.kubernetesNamespace.value}}`; } - if (ingressControllerProvider === 'nginx' && this.project.ingress.allowNginxSSLPassThrough) { + if (ingressControllerProvider === 'nginx' && this.project.ingress.allowNginxSSLPassThrough.value) { helmChartData['controller.extraArgs.enable-ssl-passthrough'] = true; } From 522b399d3b797d6a446be4cd420c5f93a22ab079 Mon Sep 17 00:00:00 2001 From: Robert Patrick Date: Thu, 20 Oct 2022 08:25:20 -0500 Subject: [PATCH 2/2] fixing typo --- README.md | 2 +- documentation/1.3/content/_index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f94529873..e60ee6621 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ applications to run in Linux containers on a Kubernetes cluster. WKT includes t images for running WebLogic domains. - [WebLogic Kubernetes Operator (WKO)](https://github.com/oracle/weblogic-kubernetes-operator) - A Kubernetes operator that allows WebLogic domains to run natively in a Kubernetes cluster. -- [WebLogic Remote Console](https://github.com/oracle/weblogic-remote-console) - A lightweight console that for managing +- [WebLogic Remote Console](https://github.com/oracle/weblogic-remote-console) - A lightweight console for managing WebLogic Server domains running anywhere. The WKT UI provides a graphical user interface that wraps the WKT tools, Docker, Helm, and the Kubernetes client diff --git a/documentation/1.3/content/_index.md b/documentation/1.3/content/_index.md index 94443c396..6d5ffa4a4 100644 --- a/documentation/1.3/content/_index.md +++ b/documentation/1.3/content/_index.md @@ -9,7 +9,7 @@ applications to run in Linux containers on a Kubernetes cluster. WKT includes t images for running WebLogic domains. - [WebLogic Kubernetes Operator (WKO)](https://github.com/oracle/weblogic-kubernetes-operator) - A Kubernetes operator that allows WebLogic domains to run natively in a Kubernetes cluster. -- [WebLogic Remote Console](https://github.com/oracle/weblogic-remote-console) - A lightweight console that for managing +- [WebLogic Remote Console](https://github.com/oracle/weblogic-remote-console) - A lightweight console for managing WebLogic Server domains running anywhere. The WKT UI provides a graphical user interface that wraps the WKT tools, Docker, Helm, and the Kubernetes client