diff --git a/clusterloader2/cmd/clusterloader.go b/clusterloader2/cmd/clusterloader.go index 291ecf2172..51d8020b11 100644 --- a/clusterloader2/cmd/clusterloader.go +++ b/clusterloader2/cmd/clusterloader.go @@ -75,7 +75,7 @@ func initClusterFlags() { flags.IntEnvVar(&clusterLoaderConfig.ClusterConfig.K8SClientsNumber, "k8s-clients-number", "K8S_CLIENTS_NUMBER", 0, fmt.Sprintf("(Optional) Number of k8s clients to use. If 0, will create 1 client per %d nodes", nodesPerClients)) flags.StringEnvVar(&clusterLoaderConfig.ClusterConfig.EtcdCertificatePath, "etcd-certificate", "ETCD_CERTIFICATE", "/etc/srv/kubernetes/pki/etcd-apiserver-server.crt", "Path to the etcd certificate on the master machine") flags.StringEnvVar(&clusterLoaderConfig.ClusterConfig.EtcdKeyPath, "etcd-key", "ETCD_KEY", "/etc/srv/kubernetes/pki/etcd-apiserver-server.key", "Path to the etcd key on the master machine") - flags.IntEnvVar(&clusterLoaderConfig.ClusterConfig.EtcdInsecurePort, "etcd-insecure-port", "ETCD_INSECURE_PORT", 2382, "Inscure http port") + flags.IntEnvVar(&clusterLoaderConfig.ClusterConfig.EtcdInsecurePort, "etcd-insecure-port", "ETCD_INSECURE_PORT", 2382, "Insecure http port for metrics") flags.BoolEnvVar(&clusterLoaderConfig.ClusterConfig.DeleteStaleNamespaces, "delete-stale-namespaces", "DELETE_STALE_NAMESPACES", false, "DEPRECATED: Whether to delete all stale namespaces before the test execution.") err := flags.MarkDeprecated("delete-stale-namespaces", "specify deleteStaleNamespaces in testconfig file instead.") if err != nil { diff --git a/clusterloader2/drivers/gcp-csi-driver-stable.yaml b/clusterloader2/drivers/gcp-csi-driver-stable.yaml index 4b38092ff4..493537f5b3 100644 --- a/clusterloader2/drivers/gcp-csi-driver-stable.yaml +++ b/clusterloader2/drivers/gcp-csi-driver-stable.yaml @@ -807,3 +807,12 @@ provisioner: pd.csi.storage.gke.io parameters: type: pd-standard volumeBindingMode: WaitForFirstConsumer +--- +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: ssd +provisioner: pd.csi.storage.gke.io +parameters: + type: pd-ssd +volumeBindingMode: WaitForFirstConsumer diff --git a/clusterloader2/pkg/config/cluster.go b/clusterloader2/pkg/config/cluster.go index ea775bf316..bd828715ab 100644 --- a/clusterloader2/pkg/config/cluster.go +++ b/clusterloader2/pkg/config/cluster.go @@ -95,8 +95,6 @@ type PrometheusConfig struct { APIServerScrapePort int SnapshotProject string AdditionalMonitorsPath string - StorageClassProvisioner string - StorageClassVolumeType string PVCStorageClass string ReadyTimeout time.Duration PrometheusMemoryRequest string diff --git a/clusterloader2/pkg/framework/client/objects.go b/clusterloader2/pkg/framework/client/objects.go index 171cd2b753..d02f29a33c 100644 --- a/clusterloader2/pkg/framework/client/objects.go +++ b/clusterloader2/pkg/framework/client/objects.go @@ -265,14 +265,6 @@ func ListEvents(c clientset.Interface, namespace string, name string, options .. return obj, nil } -// DeleteStorageClass deletes storage class with given name. -func DeleteStorageClass(c clientset.Interface, name string) error { - deleteFunc := func() error { - return c.StorageV1().StorageClasses().Delete(context.TODO(), name, metav1.DeleteOptions{}) - } - return RetryWithExponentialBackOff(RetryFunction(deleteFunc, Allow(apierrs.IsNotFound))) -} - // CreateObject creates object based on given object description. func CreateObject(dynamicClient dynamic.Interface, namespace string, name string, obj *unstructured.Unstructured, options ...*APICallOptions) error { gvk := obj.GroupVersionKind() diff --git a/clusterloader2/pkg/prometheus/manifests/0ssd-storage-class.yaml b/clusterloader2/pkg/prometheus/manifests/0ssd-storage-class.yaml deleted file mode 100644 index f7011643f5..0000000000 --- a/clusterloader2/pkg/prometheus/manifests/0ssd-storage-class.yaml +++ /dev/null @@ -1,22 +0,0 @@ -{{$PROMETHEUS_STORAGE_CLASS_PROVISIONER := DefaultParam .PROMETHEUS_STORAGE_CLASS_PROVISIONER "kubernetes.io/gce-pd"}} -{{$PROMETHEUS_STORAGE_CLASS_VOLUME_TYPE := DefaultParam .PROMETHEUS_STORAGE_CLASS_VOLUME_TYPE "pd-ssd"}} - -kind: StorageClass -apiVersion: storage.k8s.io/v1 -metadata: - name: ssd -provisioner: {{$PROMETHEUS_STORAGE_CLASS_PROVISIONER}} -{{if eq $PROMETHEUS_STORAGE_CLASS_PROVISIONER "kubernetes.io/azure-disk"}} -parameters: - kind: Managed - storageaccounttype: {{$PROMETHEUS_STORAGE_CLASS_VOLUME_TYPE}} - cachingmode: ReadOnly -volumeBindingMode: WaitForFirstConsumer -allowVolumeExpansion: true -{{else}} -parameters: - type: {{$PROMETHEUS_STORAGE_CLASS_VOLUME_TYPE}} -{{end}} -{{if .RetainPD}} -reclaimPolicy: Retain -{{end}} diff --git a/clusterloader2/pkg/prometheus/prometheus.go b/clusterloader2/pkg/prometheus/prometheus.go index b25d913314..170e01155b 100644 --- a/clusterloader2/pkg/prometheus/prometheus.go +++ b/clusterloader2/pkg/prometheus/prometheus.go @@ -99,8 +99,6 @@ func InitFlags(p *config.PrometheusConfig) { flags.IntEnvVar(&p.APIServerScrapePort, "prometheus-apiserver-scrape-port", "PROMETHEUS_APISERVER_SCRAPE_PORT", 443, "Port for scraping kube-apiserver (default 443).") flags.StringEnvVar(&p.SnapshotProject, "experimental-snapshot-project", "PROJECT", "", "GCP project used where disks and snapshots are located.") flags.StringEnvVar(&p.AdditionalMonitorsPath, "prometheus-additional-monitors-path", "PROMETHEUS_ADDITIONAL_MONITORS_PATH", "", "Additional monitors to apply.") - flags.StringEnvVar(&p.StorageClassProvisioner, "prometheus-storage-class-provisioner", "PROMETHEUS_STORAGE_CLASS_PROVISIONER", "kubernetes.io/gce-pd", "Volumes plugin used to provision PVs for Prometheus.") - flags.StringEnvVar(&p.StorageClassVolumeType, "prometheus-storage-class-volume-type", "PROMETHEUS_STORAGE_CLASS_VOLUME_TYPE", "pd-ssd", "Volume types of storage class, This will be different depending on the provisioner.") flags.StringEnvVar(&p.PVCStorageClass, "prometheus-pvc-storage-class", "PROMETHEUS_PVC_STORAGE_CLASS", "ssd", "Storage class used with prometheus persistent volume claim.") flags.DurationEnvVar(&p.ReadyTimeout, "prometheus-ready-timeout", "PROMETHEUS_READY_TIMEOUT", 15*time.Minute, "Timeout for waiting for Prometheus stack to become healthy.") flags.StringEnvVar(&p.PrometheusMemoryRequest, "prometheus-memory-request", "PROMETHEUS_MEMORY_REQUEST", "10Gi", "Memory request to be used by promehteus.") @@ -213,8 +211,6 @@ func NewController(clusterLoaderConfig *config.ClusterLoaderConfig) (pc *Control mapping["PROMETHEUS_SCRAPE_KUBELETS"] = clusterLoaderConfig.PrometheusConfig.ScrapeKubelets mapping["PROMETHEUS_SCRAPE_MASTER_KUBELETS"] = clusterLoaderConfig.PrometheusConfig.ScrapeKubelets || clusterLoaderConfig.PrometheusConfig.ScrapeMasterKubelets mapping["PROMETHEUS_APISERVER_SCRAPE_PORT"] = clusterLoaderConfig.PrometheusConfig.APIServerScrapePort - mapping["PROMETHEUS_STORAGE_CLASS_PROVISIONER"] = clusterLoaderConfig.PrometheusConfig.StorageClassProvisioner - mapping["PROMETHEUS_STORAGE_CLASS_VOLUME_TYPE"] = clusterLoaderConfig.PrometheusConfig.StorageClassVolumeType mapping["PROMETHEUS_KUBE_PROXY_SELECTOR_KEY"] = clusterLoaderConfig.PrometheusConfig.KubeProxySelectorKey mapping["PROMETHEUS_PVC_STORAGE_CLASS"] = clusterLoaderConfig.PrometheusConfig.PVCStorageClass mapping["PROMETHEUS_MEMORY_REQUEST"] = clusterLoaderConfig.PrometheusConfig.PrometheusMemoryRequest @@ -259,10 +255,6 @@ func (pc *Controller) SetUpPrometheusStack() error { return err } - // Removing Storage Class as Reclaim Policy cannot be changed - if err := client.DeleteStorageClass(rootClusterClientSet, storageClass); err != nil { - return err - } if err := pc.applyDefaultManifests(coreManifests); err != nil { return err }