Skip to content
Permalink
Browse files

move testground services to control network (#737)

  • Loading branch information
nonsense committed Mar 25, 2020
1 parent e1f3e60 commit fb557a600ee993267059a6a3c86c5c68a212aae0
Showing with 16 additions and 4 deletions.
  1. +3 −2 infra/k8s/install.sh
  2. +13 −2 infra/k8s/testground-infra/values.yaml
@@ -114,8 +114,9 @@ kubectl apply -f ./efs/rbac.yaml \
-f $EFS_MANIFEST_SPEC

# monitoring and redis.
echo "installing helm infrastructure"
helm install testground-infra ./testground-infra
echo "Installing helm infrastructure"
helm install --wait --timeout 2m testground-infra ./testground-infra
sleep 10

echo "Install Weave, CNI-Genie, s3bucket DaemonSet, Sidecar Daemonset..."
echo
@@ -17,6 +17,9 @@
# See https://github.com/helm/charts/blob/master/stable/prometheus-operator/README.md#L193
# for an explanation of this option.
prometheus-operator:
podAnnotations: {
cni: "flannel"
}
alertmanager:
enabled: false
grafana:
@@ -59,7 +62,7 @@ prometheus-operator:
# * override "fullname" so it is resolves with http://prometheus-pushgateway
# This matches the behavior from the kops addon, but we don't need to do this
# once we make this a configurable option.
# * enable the serviceMonitor, so it will be picked up by the prometheus
# * enable the serviceMonitor, so it will be picked up by the prometheus
# operator. Move the serviceMonitor to the default namespace.
# * Change the scrape interval to a short value. This should be set to the same
# value with which plans push to the pushgatway. See the runner sdk.
@@ -72,6 +75,9 @@ prometheus-pushgateway:
namespace: default
networkPolicy:
allowAll: true
podAnnotations: {
cni: "flannel"
}


# Changes from defaults:
@@ -80,8 +86,13 @@ prometheus-pushgateway:
redis:
metrics:
enabled: true
serviceMonitor:
serviceMonitor:
enabled: true
namespace: default
usePassword: false
cluster:
enabled: false
master:
podAnnotations: {
cni: "flannel"
}

0 comments on commit fb557a6

Please sign in to comment.
You can’t perform that action at this time.