Merge pull request #401 from chancez/remove_tectonic

*: Remove all things related to install on Tectonic

Author: Chance Zibolski

Documentation/install-metering.md

@@ -31,9 +31,10 @@ If you do not wish to modify the Operator Metering configuration, a minimal conf
 
 ### Prometheus Monitoring Configuration
 
-For installs into Openshift, ensuring Prometheus is installed can be done using Ansible. For installs into Tectonic, the manual installation method configures Metering to use the Prometheus that's installed by default into the tectonic-system namespace.
+For Openshift 3.11 or later, Prometheus is installed by default through cluster monitoring in the openshift-monitoring namespace.
 
-If you're not using Openshift or Tectonic, then you will need to use OLM or the manual install method. In this case if you are not using a [kube-prometheus][kube-prometheus] installation, or your Prometheus service is not named `prometheus-k8s` and in the `monitoring` namespace, then you must customize the [prometheus URL config option][configure-prometheus-url] before proceeding.
+If you're not using Openshift, then you will need to use OLM or the manual install method.
+In this case if you are not using a [kube-prometheus][kube-prometheus] installation, or your Prometheus service is not named `prometheus-k8s` and in the `monitoring` namespace, then you must customize the [prometheus URL config option][configure-prometheus-url] before proceeding.
 
 ## Install Methods
 

Documentation/manual-install.md

@@ -6,7 +6,7 @@ By default, if it's unset, it will use the `metering` namespace.
 
 ## Install
 
-Depending on your Kubernetes platform (regular Kubernetes, Tectonic, or Openshift)
+Depending on your Kubernetes platform (regular Kubernetes, or Openshift)
 
 For a standard Kubernetes cluster:
 
@@ -15,13 +15,6 @@ $ export METERING_NAMESPACE=metering-$USER
 $ ./hack/install.sh
 ```
 
-If your using Tectonic, use tectonic-install.sh:
-
-```
-$ export METERING_NAMESPACE=metering-$USER
-$ ./hack/tectonic-install.sh
-```
-
 If your using Openshift, use openshift-install.sh:
 
 ```
@@ -40,13 +33,6 @@ $ export METERING_NAMESPACE=metering-$USER
 $ ./hack/uninstall.sh
 ```
 
-If your using Tectonic, use tectonic-uninstall.sh:
-
-```
-$ export METERING_NAMESPACE=metering-$USER
-$ ./hack/tectonic-uninstall.sh
-```
-
 If your using Openshift, use openshift-uninstall.sh:
 
 ```
@@ -80,7 +66,6 @@ $ export METERING_CR_FILE=metering-custom.yaml
 Then run the installation script for your platform:
 
 - `./hack/install.sh`
-- `./hack/tectonic-install.sh`
 - `./hack/openshift-install.sh`
 
 For more details on configuration options, most are documented in the [configuring metering document][configuring-metering].
@@ -103,13 +88,13 @@ spec:
 Next, run the install script for your platform (see above).
 
 After running the install script, figure out where your Prometheus pod is running.
-By default the `run-reporting-operator-local` Makefile target assumes that the pod is in the `tectonic-system` namespace and can be queried using the label selector `app=prometheus`.
+By default the `run-reporting-operator-local` Makefile target assumes that the pod is in the `openshift-monitoring` namespace and can be queried using the label selector `app=prometheus`.
 
 If you're Prometheus is located somewhere, else, you can override the defaults using the environment variables `METERING_PROMETHEUS_NAMESPACE` and `METERING_PROMTHEUS_LABEL_SELECTOR` to the namespace your Prometheus pod is in, and the label selector for querying Prometheus.
 
 Ex (these are the defaults):
 ```
-export METERING_PROMETHEUS_NAMESPACE=tectonic-system
+export METERING_PROMETHEUS_NAMESPACE=openshift-monitoring
 export METERING_PROMTHEUS_LABEL_SELECTOR=app=prometheus
 ```
 

Makefile

@@ -256,22 +256,15 @@ bin/metering-override-values.yaml: ./hack/render-metering-chart-override-values.
 	@mkdir -p bin
 	./hack/render-metering-chart-override-values.sh $(RELEASE_TAG) > $@
 
-CHART_DEPS := bin/tectonic-metering-0.1.0.tgz \
-	bin/openshift-metering-0.1.0.tgz \
+CHART_DEPS := bin/openshift-metering-0.1.0.tgz \
 	bin/operator-metering-0.1.0.tgz
 
 all-charts: $(CHART_DEPS)
 
-tectonic-metering-chart: bin/tectonic-metering-0.1.0.tgz
-
 openshift-metering-chart: bin/openshift-metering-0.1.0.tgz
 
 operator-metering-chart: bin/operator-metering-0.1.0.tgz
 
-bin/tectonic-metering-0.1.0.tgz: $(shell find charts -type f)
-	@echo "Packaging tectonic-metering chart dependencies"
-	@mkdir -p bin && mkdir -p charts/tectonic-metering/charts && hack/yamltojson < charts/tectonic-metering/requirements.yaml | jq '.dependencies[].repository' -r | sed 's|file://||' | xargs -I {} helm package --save=false -d charts/tectonic-metering/charts charts/tectonic-metering/{}
-	helm package --save=false -d bin charts/tectonic-metering
 
 bin/openshift-metering-0.1.0.tgz: $(shell find charts -type f)
 	@echo "Packaging openshift-metering chart dependencies"
@@ -296,7 +289,7 @@ metering-manifests:
 	metering-test-docker \
 	metering-e2e-docker-build metering-builder-docker-build \
 	build-reporting-operator reporting-operator-bin reporting-operator-local \
-	operator-metering-chart tectonic-metering-chart openshift-metering chart \
+	operator-metering-chart penshift-metering chart \
 	bin/metering-override-values.yaml \
 	metering-manifests bill-of-materials.json \
 	install-kube-prometheus-helm