mas-cli 15.3.1__py3-none-any.whl → 15.4.0__py3-none-any.whl

mas/cli/__init__.py

@@ -8,4 +8,4 @@
 #
 # *****************************************************************************
 
-__version__ = "15.3.1"  # Python module compatible semver
+__version__ = "15.4.0"  # Python module compatible semver

mas/cli/cli.py

@@ -117,7 +117,7 @@ class BaseApp(PrintMixin, PromptMixin):
         logging.getLogger('asyncio').setLevel(logging.INFO)
 
         # Supports extended semver, unlike mas.cli.__version__
-        self.version = "15.3.1"
+        self.version = "15.4.0"
         self.h1count = 0
         self.h2count = 0
 

mas/cli/install/app.py

@@ -526,6 +526,14 @@ class InstallApp(BaseApp, InstallSettingsMixin, InstallSummarizerMixin, ConfigGe
                         # Use MAS default self-signed cluster issuer with a custom domain
                         self.setParam("dns_provider", "")
                         self.setParam("mas_cluster_issuer", "")
+
+                    if dnsProvider in [1, 2]:
+                        self.printDescription([
+                            "By default, DNS CNAME records will be created pointing to the domain of the cluster ingress (ingress.config.openshift.io/cluster).",
+                            "CloudFlare and CIS DNS integrations support the ability to provide an alternative domain, which may be necessary if you are using OpenShift Container Platform in a non-standard networking configuration."
+                        ])
+                        self.promptForString("Cluster Ingress Domain Override", "ocp_ingress")
+
                 else:
                     # Use MAS default self-signed cluster issuer with the default domain
                     self.setParam("dns_provider", "")

mas/cli/install/argBuilder.py

@@ -98,16 +98,22 @@ class installArgBuilderMixin():
         if self.getParam('mas_manual_cert_mgmt') is True:
             command += f"  --manual-certificates \"{self.manualCertsDir}\"{newline}"
 
-        if self.getParam('mas_domain') is True:
+        if self.getParam('mas_domain') != "":
             command += f"  --domain \"{self.getParam('mas_domain')}\"{newline}"
 
-        if self.getParam('--dns-provider') == "cis":
+        if self.getParam('dns_provider') == "cis":
             command += f"  --dns-provider cis --cis-apikey \"{self.getParam('cis_apikey')}\""
             command += f" --cis-subdomain \"{self.getParam('cis_subdomain')}\""
             command += f" --cis-crn \"{self.getParam('cis_crn')}\""
             command += f" --cis-email \"{self.getParam('cis_email')}\"{newline}"
 
-        if self.getParam('--mas-cluster-issuer') != "":
+        if self.getParam('dns_provider') == "cloudflare":
+            command += f"  --dns-provider cloudflare --cloudflare-apitoken \"{self.getParam('cloudflare_apitoken')}\"{newline}"
+            command += f"  --cloudflare-email \"{self.getParam('cloudflare_email')}\"{newline}"
+            command += f"  --cloudflare-zone \"{self.getParam('cloudflare_zone')}\"{newline}"
+            command += f"  --cloudflare-subdomain \"{self.getParam('cloudflare_subdomain')}\"{newline}"
+
+        if self.getParam('mas_cluster_issuer') != "":
             command += f"  --mas-cluster-issuer \"{self.getParam('mas_cluster_issuer')}\"{newline}"
 
         if self.getParam('mas_enable_walkme') == "false":
@@ -152,6 +158,8 @@ class installArgBuilderMixin():
         # -----------------------------------------------------------------------------
         if self.getParam('ocp_ingress_tls_secret_name') != "":
             command += f"  --ocp-ingress-tls-secret-name \"{self.getParam('ocp_ingress_tls_secret_name')}\"{newline}"
+        if self.getParam('ocp_ingress') != "":
+            command += f"  --ocp-ingress \"{self.getParam('ocp_ingress')}\"{newline}"
 
         # MAS Applications
         # -----------------------------------------------------------------------------

mas/cli/install/argParser.py

@@ -187,6 +187,13 @@ masAdvancedArgGroup.add_argument(
     choices=["cloudflare", "cis", "route53"]
 )
 
+masAdvancedArgGroup.add_argument(
+    "--ocp-ingress",
+    dest="ocp_ingress",
+    required=False,
+    help="Overwrites Ingress Domain"
+)
+
 masAdvancedArgGroup.add_argument(
     "--mas-cluster-issuer",
     dest="mas_cluster_issuer",
@@ -231,6 +238,34 @@ cisArgGroup.add_argument(
     help="Optionally setup MAS instance as a subdomain under a multi-tenant CIS DNS record"
 )
 
+# DNS Configuration - CloudFlare
+# -----------------------------------------------------------------------------
+cloudFlareArgGroup = installArgParser.add_argument_group("DNS Configuration - CloudFlare")
+cloudFlareArgGroup.add_argument(
+    "--cloudflare-email",
+    dest="cloudflare_email",
+    required=False,
+    help="Required when DNS provider is Cloudflare"
+)
+cloudFlareArgGroup.add_argument(
+    "--cloudflare-apitoken",
+    dest="cloudflare_apitoken",
+    required=False,
+    help="Required when DNS provider is Cloudflare"
+)
+cloudFlareArgGroup.add_argument(
+    "--cloudflare-zone",
+    dest="cloudflare_zone",
+    required=False,
+    help="Required when DNS provider is Cloudflare"
+)
+cloudFlareArgGroup.add_argument(
+    "--cloudflare-subdomain",
+    dest="cloudflare_subdomain",
+    required=False,
+    help="Required when DNS provider is Cloudflare"
+)
+
 # Storage
 # -----------------------------------------------------------------------------
 storageArgGroup = installArgParser.add_argument_group("Storage")

mas/cli/install/params.py

@@ -66,13 +66,20 @@ optionalParams = [
     # SLS
     "sls_namespace",
     # DNS Providers
-    # TODO: Add CloudFlare and Route53 support
+    # TODO: Route53 support
     "dns_provider",
+    "mas_cluster_issuer",
+    "ocp_ingress",
+    # CIS
     "cis_email",
     "cis_apikey",
     "cis_crn",
     "cis_subdomain",
-    "mas_cluster_issuer",
+    # CloudFlare
+    "cloudflare_email",
+    "cloudflare_apitoken",
+    "cloudflare_zone",
+    "cloudflare_subdomain",
     # DRO
     "dro_namespace",
     # Db2

mas/cli/install/settings/manageSettings.py

@@ -121,6 +121,8 @@ class ManageSettingsMixin():
                     self.params["mas_appws_components"] += ",workday=latest"
                 if self.yesOrNo(" - AIP"):
                     self.params["mas_appws_components"] += ",aip=latest"
+                if self.yesOrNo(" - Vegetation Management"):
+                    self.params["mas_appws_components"] += ",vegm=latest"
                 logger.debug(f"Generated mas_appws_components = {self.params['mas_appws_components']}")
 
                 if ",icd=" in self.params["mas_appws_components"]:

mas/cli/install/summarizer.py

@@ -58,13 +58,18 @@ class InstallSummarizerMixin():
             self.printParamSummary("DNS Provider", "dns_provider")
             self.printParamSummary("Certificate Issuer", "mas_cluster_issuer")
 
+            if self.getParam('ocp_ingress') != "":
+                self.printParamSummary("OCP Ingress", "ocp_ingress")
             if self.getParam('dns_provider') == "cloudflare":
                 self.printParamSummary("CloudFlare e-mail", "cloudflare_email")
                 self.printParamSummary("CloudFlare API token", "cloudflare_apitoken")
                 self.printParamSummary("CloudFlare zone", "cloudflare_zone")
                 self.printParamSummary("CloudFlare subdomain", "cloudflare_subdomain")
             elif self.getParam('dns_provider') == "cis":
-                pass
+                self.printParamSummary("CIS e-mail", "cis_email")
+                self.printParamSummary("CIS API Key", "cis_apikey")
+                self.printParamSummary("CIS CRN", "cis_crn")
+                self.printParamSummary("CIS subdomain", "cis_subdomain")
             elif self.getParam('dns_provider') == "route53":
                 pass
             elif self.getParam('dns_provider') == "":
@@ -177,6 +182,7 @@ class InstallSummarizerMixin():
                 self.printSummary("  + Utilities", "Enabled" if "utilities=" in self.getParam("mas_appws_components") else "Disabled")
                 self.printSummary("  + Workday Applications", "Enabled" if "workday=" in self.getParam("mas_appws_components") else "Disabled")
                 self.printSummary("  + AIP", "Enabled" if "aip=" in self.getParam("mas_appws_components") else "Disabled")
+                self.printSummary("  + Vegetation Management", "Enabled" if "vegm=" in self.getParam("mas_appws_components") else "Disabled")
 
                 self.printParamSummary("+ Upgrade Type", "mas_appws_upgrade_type")