Remove prometheus-adapter temporary. (#396)

mattermost · Jan 13, 2021 · ca36e01 · ca36e01
1 parent 7856bc0
commit ca36e01
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 336 deletions.
diff --git a/internal/provisioner/kops_provisioner_cluster.go b/internal/provisioner/kops_provisioner_cluster.go
@@ -293,20 +293,6 @@ func (provisioner *KopsProvisioner) ProvisionCluster(cluster *model.Cluster, aws
 		return errors.Wrap(err, "failed to delete APIService v1beta1.metrics.k8s.io")
 	}
 
-	logger.Info("Cleaning up some prometheus-adapter resources to reapply")
-	err = k8sClient.Clientset.CoreV1().Services("kube-system").Delete(ctx, "prometheus-adapter", metav1.DeleteOptions{})
-	if k8sErrors.IsNotFound(err) {
-		logger.Info("Service metrics-server not found; skipping...")
-	} else if err != nil {
-		return errors.Wrap(err, "failed to delete service metrics-server")
-	}
-	err = k8sClient.KubeagClientSet.ApiregistrationV1beta1().APIServices().Delete(ctx, "v1beta1.custom.metrics.k8s.io", metav1.DeleteOptions{})
-	if k8sErrors.IsNotFound(err) {
-		logger.Info("APIService v1beta1.metrics.k8s.io not found; skipping...")
-	} else if err != nil {
-		return errors.Wrap(err, "failed to delete APIService v1beta1.custom.metrics.k8s.io")
-	}
-
 	// TODO: determine if we want to hard-code the k8s resource objects in code.
 	// For now, we will ingest manifest files to deploy the mattermost operator.
 	files := []k8s.ManifestFile{
@@ -343,9 +329,6 @@ func (provisioner *KopsProvisioner) ProvisionCluster(cluster *model.Cluster, aws
 		}, {
 			Path:            "manifests/metric-server/metric-server.yaml",
 			DeployNamespace: "kube-system",
-		}, {
-			Path:            "manifests/prometheus-adapter/prometheus-adapter.yaml",
-			DeployNamespace: "kube-system",
 		},
 	}
 	err = k8sClient.CreateFromFiles(files)

diff --git a/manifests/prometheus-adapter/prometheus-adapter.yaml b/manifests/prometheus-adapter/prometheus-adapter.yaml