Merge pull request #576 from chengshifan/disable-managed-prometheus

chore: disable managed prometheus by default

Author: chengshifan

src/services/gcp/Dockerfile

@@ -13,7 +13,7 @@ RUN dep ensure
 RUN ./tmp/build/build.sh
 
 FROM alpine:3.7
-ENV CLOUD_SDK_VERSION 330.0.0
+ENV CLOUD_SDK_VERSION 408.0.0
 
 ENV PATH /google-cloud-sdk/bin:$PATH
 

src/services/gcp/infrabox-service-gcp/templates/crd.yaml

@@ -4,7 +4,7 @@ metadata:
   name: gkeclusters.gcp.service.infrabox.net
 spec:
   group: gcp.service.infrabox.net
-  versions: 
+  versions:
     - name: v1alpha1
       served: true
       storage: true
@@ -50,6 +50,8 @@ spec:
                   type: string
                 clusterCidr:
                   type: string
+                enableManagedPrometheus:
+                  type: boolean
             status:
               x-kubernetes-preserve-unknown-fields: true
   names:

src/services/gcp/pkg/apis/gcp/v1alpha1/types.go

@@ -30,6 +30,7 @@ type GKEClusterSpec struct {
         Zone                       string `json:"zone"`
         ServiceCidr                string `json:"serviceCidr,omitempty"`
         ClusterCidr                string `json:"clusterCidr,omitempty"`
+        EnableManagedPrometheus    bool   `json:"enableManagedPrometheus,omitempty"`
 }
 
 type GKEClusterStatus struct {

src/services/gcp/pkg/stub/handler.go

@@ -223,6 +223,9 @@ func createCluster(cr *v1alpha1.GKECluster, log *logrus.Entry) (*v1alpha1.GKEClu
     args = append(args, "--enable-private-nodes")
 	args = append(args, "--master-ipv4-cidr", finalCIDR)
 	args = append(args, "--enable-master-authorized-networks")
+	if !cr.Spec.EnableManagedPrometheus {
+	    args = append(args, "--no-enable-managed-prometheus")
+	}
 	master_authorized_networks := os.Getenv("ALLOW_IPS")
 	if master_authorized_networks == "" {
 	    master_authorized_networks = "0.0.0.0/0"
@@ -1241,7 +1244,7 @@ func updateClusterFirewall(cluster *RemoteCluster, log *logrus.Entry) error {
             err = fmt.Errorf("failed to update firewall rule for cluster %s: %v", cluster.Name, err)
             log.Error(err)
             return err
-        } 
+        }
         return nil
 	}
     log.Warningf("MasterIpv4CidrBlock fetching failed for cluster %s", cluster.Name)