Merge branch 'remove_prometheus_enable_ingress' into 'master'

Remove prometheus_enable_ingress setting

See merge request openappstack/openappstack!410

docs/upgrading.md

@@ -44,8 +44,6 @@ Additionally, if you want to re-use your old `settings.yaml` file, this data
 needs to be added to it:
 
 ```
-prometheus_enable_ingress: false
-
 backup:
   s3:
     # Disabled by default. To enable, change to `true` and configure the

openappstack/__main__.py

@@ -331,8 +331,6 @@ def create(clus, args):  # pylint: disable=too-many-branches
         clus.acme_staging = True
     if args.local_flux:
         clus.local_flux = True
-    if args.prometheus_enable_ingress:
-        clus.prometheus_enable_ingress = True
     if args.create_droplet:
         clus.create_droplet(ssh_key_id=args.ssh_key_id, hostname=args.create_hostname)
         if args.verbose:

openappstack/cluster.py

@@ -59,9 +59,6 @@ class Cluster:
         self.local_flux = False
         # Set this to False if the data needs to be (re)loaded from file
         self.data_loaded = False
-        # Set this to true if you want to access prometheus from outside you cluster
-        # The prometheus api is protected by basic authentication
-        self.prometheus_enable_ingress = False
         # Load data from inventory.yml and settings.yml
         if load_data:
             self.load_data()
@@ -174,7 +171,6 @@ class Cluster:
         settings['admin_email'] = 'admin@{0}'.format(self.domain)
         settings['flux']['local_flux'] = self.local_flux
         settings['cluster_dir'] = self.cluster_dir
-        settings['prometheus_enable_ingress'] = self.prometheus_enable_ingress
 
         # Configure apps to handle invalid certs i.e. from
         # Letsencrypt staging API
@@ -207,7 +203,6 @@ HOSTNAME={hostname}
 FQDN={domain}
 LOCAL_FLUX={local_flux}
 KUBECONFIG={secret_dir}/kube_config_cluster.yml
-PROMETHEUS_ENABLE_INGRESS={prometheus_enable_ingress}
 """
 
         with open(self.dotenv_file, 'w') as stream:
@@ -218,8 +213,7 @@ PROMETHEUS_ENABLE_INGRESS={prometheus_enable_ingress}
                 hostname=self.hostname,
                 domain=self.domain,
                 local_flux=self.local_flux,
-                secret_dir=self.secret_dir,
-                prometheus_enable_ingress=self.prometheus_enable_ingress
+                secret_dir=self.secret_dir
             ))
             log.info("Created %s", self.dotenv_file)