Merge pull request #39 from VictoriaMetrics/fixed-list_type-operator_…

…rbac-e2etests update recent bugs, fix kubernetes crd
VictoriaMetrics · Jun 18, 2020 · 6e16fa0 · 6e16fa0
2 parents ad1104b + 6da6770
commit 6e16fa0
Show file tree

Hide file tree

Showing 53 changed files with 1,212 additions and 1,135 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -48,22 +48,3 @@ jobs:
           tag_with_ref: true
           dockerfile: cmd/manager/Dockerfile
 
-# TODO fix it, for some reason it fails with timeout
-#      - name: Setup Minikube for e2e
-#        uses: manusa/actions-setup-minikube@v1.0.2
-#        with:
-#            minikube version: 'v1.5.2'
-#            kubernetes version: 'v1.16.0'
-#            github token: ${{ secrets.GITHUB_TOKEN }}
-#      - name: exec e2e tests
-#        env:
-#          GO111MODULE: on
-#          E2E_IMAGE: ${{ env.GITHUB_REF_SLUG }}
-#          SDK_VERSION: "0.17.0"
-#        run: |
-#          export PATH=$PATH:$(go env GOPATH)/bin
-#          export PATH=$PATH:`pwd`
-#          kubectl get nodes
-#          curl -L -o operator-sdk "https://github.com/operator-framework/operator-sdk/releases/download/v0.17.0/operator-sdk-v0.17.0-x86_64-linux-gnu"
-#          chmod +x operator-sdk
-#          make e2e
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -130,11 +130,17 @@ func main() {
 	if err != nil {
 		log.Info("Could not create metrics Service", "error", err.Error())
 	}
+	//retrieve operator namespace
+	//only works at kubernetes cluster
+	operatorNamespace, err := k8sutil.GetOperatorNamespace()
+	if err != nil {
+		log.Info("Could not detect operator namespace, not in cluster?", "err", err.Error())
+	}
 
 	// CreateServiceMonitors will automatically create the prometheus-operator ServiceMonitor resources
 	// necessary to configure Prometheus to scrape metrics from this operator.
 	services := []*v1.Service{service}
-	_, err = metrics.CreateServiceMonitors(cfg, namespace, services)
+	_, err = metrics.CreateServiceMonitors(cfg, operatorNamespace, services)
 	if err != nil {
 		log.Info("Could not create ServiceMonitor object", "error", err.Error())
 		// If this operator is deployed to a cluster without the prometheus-operator running, it will return

diff --git a/conf/config.go b/conf/config.go
@@ -16,10 +16,10 @@ const prefixVar = "VM"
 
 //genvars:true
 type BaseOperatorConf struct {
-	VmAlertDefault struct {
+	VMAlertDefault struct {
 		Image    string `default:"victoriametrics/vmalert"`
 		Version  string `default:"v1.37.0"`
-		Port     string `default:"8429"`
+		Port     string `default:"8080"`
 		Resource struct {
 			Limit struct {
 				Mem string `default:"500Mi"`
@@ -34,7 +34,7 @@ type BaseOperatorConf struct {
 		ConfigReloaderMemory string `default:"25Mi"`
 		ConfigReloadImage    string `default:"jimmidyson/configmap-reload:v0.3.0"`
 	}
-	VmAgentDefault struct {
+	VMAgentDefault struct {
 		Image             string `default:"victoriametrics/vmagent"`
 		Version           string `default:"v1.37.0"`
 		ConfigReloadImage string `default:"quay.io/coreos/prometheus-config-reloader:v0.30.1"`
@@ -53,24 +53,24 @@ type BaseOperatorConf struct {
 		ConfigReloaderMemory string `default:"25Mi"`
 	}
 
-	VmSingleDefault struct {
+	VMSingleDefault struct {
 		Image    string `default:"victoriametrics/victoria-metrics"`
 		Version  string `default:"v1.37.0"`
 		Port     string `default:"8429"`
 		Resource struct {
 			Limit struct {
-				Mem string `default:"500Mi"`
-				Cpu string `default:"200m"`
+				Mem string `default:"1500Mi"`
+				Cpu string `default:"1200m"`
 			}
 			Request struct {
-				Mem string `default:"200Mi"`
-				Cpu string `default:"50m"`
+				Mem string `default:"500Mi"`
+				Cpu string `default:"150m"`
 			}
 		}
 		ConfigReloaderCPU    string `default:"100m"`
 		ConfigReloaderMemory string `default:"25Mi"`
 	}
-	AlertManager struct {
+	VMAlertManager struct {
 		ConfigReloaderImage          string `default:"jimmidyson/configmap-reload:v0.3.0"`
 		ConfigReloaderCPU            string `default:"100m"`
 		ConfigReloaderMemory         string `default:"25Mi"`
@@ -85,13 +85,13 @@ type BaseOperatorConf struct {
 		ClusterDomain                string `default:""`
 		KubeletObject                string
 	}
-	DisabledServiceMonitorCreation bool   `default:"false"`
-	Host                           string `default:"0.0.0.0"`
-	ListenAddress                  string `default:"0.0.0.0"`
-	DefaultLabels                  string `default:"managed-by=vm-operator"`
-	Labels                         Labels `ignored:"true"`
-	LogLevel                       string
-	LogFormat                      string
+	DisableSelfServiceMonitorCreation bool   `default:"false"`
+	Host                              string `default:"0.0.0.0"`
+	ListenAddress                     string `default:"0.0.0.0"`
+	DefaultLabels                     string `default:"managed-by=vm-operator"`
+	Labels                            Labels `ignored:"true"`
+	LogLevel                          string
+	LogFormat                         string
 }
 
 func MustGetBaseConfig() *BaseOperatorConf {

diff --git a/deploy/crds/monitoring.coreos.com_podmonitors_crd.yaml b/deploy/crds/monitoring.coreos.com_podmonitors_crd.yaml
@@ -46,7 +46,6 @@ spec:
                   items:
                     type: string
                   type: array
-                  x-kubernetes-list-type: set
               type: object
             podMetricsEndpoints:
               description: A list of endpoints allowed as part of this PodMonitor.
@@ -103,15 +102,13 @@ spec:
                           items:
                             type: string
                           type: array
-                          x-kubernetes-list-type: set
                         targetLabel:
                           description: Label to which the resulting value is written
                             in a replace action. It is mandatory for replace actions.
                             Regex capture groups are available.
                           type: string
                       type: object
                     type: array
-                    x-kubernetes-list-type: set
                   params:
                     additionalProperties:
                       items:
@@ -169,15 +166,13 @@ spec:
                           items:
                             type: string
                           type: array
-                          x-kubernetes-list-type: set
                         targetLabel:
                           description: Label to which the resulting value is written
                             in a replace action. It is mandatory for replace actions.
                             Regex capture groups are available.
                           type: string
                       type: object
                     type: array
-                    x-kubernetes-list-type: set
                   scheme:
                     description: HTTP scheme to use for scraping.
                     type: string
@@ -192,14 +187,12 @@ spec:
                     x-kubernetes-int-or-string: true
                 type: object
               type: array
-              x-kubernetes-list-type: set
             podTargetLabels:
               description: PodTargetLabels transfers labels on the Kubernetes Pod
                 onto the target.
               items:
                 type: string
               type: array
-              x-kubernetes-list-type: set
             sampleLimit:
               description: SampleLimit defines per-scrape limit on number of scraped
                 samples that will be accepted.

diff --git a/deploy/crds/monitoring.coreos.com_prometheusrules_crd.yaml b/deploy/crds/monitoring.coreos.com_prometheusrules_crd.yaml
@@ -70,13 +70,11 @@ spec:
                       - expr
                       type: object
                     type: array
-                    x-kubernetes-list-type: set
                 required:
                 - name
                 - rules
                 type: object
               type: array
-              x-kubernetes-list-type: set
           type: object
       required:
       - spec

diff --git a/deploy/crds/monitoring.coreos.com_servicemonitors_crd.yaml b/deploy/crds/monitoring.coreos.com_servicemonitors_crd.yaml
@@ -154,15 +154,13 @@ spec:
                           items:
                             type: string
                           type: array
-                          x-kubernetes-list-type: set
                         targetLabel:
                           description: Label to which the resulting value is written
                             in a replace action. It is mandatory for replace actions.
                             Regex capture groups are available.
                           type: string
                       type: object
                     type: array
-                    x-kubernetes-list-type: set
                   params:
                     additionalProperties:
                       items:
@@ -220,15 +218,13 @@ spec:
                           items:
                             type: string
                           type: array
-                          x-kubernetes-list-type: set
                         targetLabel:
                           description: Label to which the resulting value is written
                             in a replace action. It is mandatory for replace actions.
                             Regex capture groups are available.
                           type: string
                       type: object
                     type: array
-                    x-kubernetes-list-type: set
                   scheme:
                     description: HTTP scheme to use for scraping.
                     type: string
@@ -370,7 +366,6 @@ spec:
                     type: object
                 type: object
               type: array
-              x-kubernetes-list-type: set
             jobLabel:
               description: The label to use to retrieve the job name from.
               type: string
@@ -387,15 +382,13 @@ spec:
                   items:
                     type: string
                   type: array
-                  x-kubernetes-list-type: set
               type: object
             podTargetLabels:
               description: PodTargetLabels transfers labels on the Kubernetes Pod
                 onto the target.
               items:
                 type: string
               type: array
-              x-kubernetes-list-type: set
             sampleLimit:
               description: SampleLimit defines per-scrape limit on number of scraped
                 samples that will be accepted.
@@ -450,7 +443,6 @@ spec:
               items:
                 type: string
               type: array
-              x-kubernetes-list-type: set
           required:
           - endpoints
           - selector