Skip to content

Commit

Permalink
Enable new SD agents by default (#1252)
Browse files Browse the repository at this point in the history
* Enable new SD agents by default

* fix
  • Loading branch information
lluunn authored and k8s-ci-robot committed Jul 31, 2018
1 parent e50226d commit bc13fb9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
4 changes: 4 additions & 0 deletions scripts/gke/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,10 @@ if ${KUBEFLOW_DEPLOY}; then
# Install the GPU driver. It has no effect on non-GPU nodes.
kubectl apply -f https://raw.githubusercontent.com/GoogleCloudPlatform/container-engine-accelerators/stable/nvidia-driver-installer/cos/daemonset-preloaded.yaml

# Install Stackdriver Kubernetes agents.
kubectl apply -f https://storage.googleapis.com/stackdriver-kubernetes/stable/rbac-setup.yaml --as=admin --as-group=system:masters
kubectl apply -f https://storage.googleapis.com/stackdriver-kubernetes/stable/agents.yaml

set -e
fi

Expand Down
16 changes: 3 additions & 13 deletions scripts/gke/deployment_manager_configs/cluster.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -63,20 +63,10 @@ resources:
zone: {{ properties['zone'] }}
cluster:
name: {{ CLUSTER_NAME }}
{% if properties['stackdriver-kubernetes'] %}
# TODO: remove alpha when 10.2 is public.
# https://github.com/kubeflow/kubeflow/issues/821
enableKubernetesAlpha: true
# We need 1.10.2 to support Stackdrivier GKE.
initialClusterVersion: 1.10.2-gke.0
# Logging and monitoring have default value [logging/monitoring].googleapis.com
# if not set. We are using the new Stackdricer Kubernetes agents here.
# See cloud.google.com/monitoring/kubernetes-engine/.
loggingService: logging.googleapis.com/kubernetes
monitoringService: monitoring.googleapis.com/kubernetes
{% else %}
initialClusterVersion: 1.9.6-gke.1
{% endif %}
initialClusterVersion: 1.10.5-gke.3
loggingService: none
monitoringService: none
{% if properties['gkeApiVersion'] == 'v1beta1' %}
podSecurityPolicyConfig:
enabled: {{ properties['securityConfig']['podSecurityPolicy'] }}
Expand Down

0 comments on commit bc13fb9

Please sign in to comment.