Merge branch 'updates' into 'master'

Updates for 9.0

See merge request !30

README.md

@@ -137,7 +137,7 @@ After GitLab is up and running, you will be able to connect to the Prometheus co
 https://prometheus.<wildcard-dns-entry>/
 ```
-It will monitor the system resources of the GitLab container, providing insight into metrics like CPU, memory, and throughput.
+It will monitor the system resources of the GitLab container, providing insight into metrics like CPU, memory, and throughput. It is also configured to collect metrics from all Nodes in the Kubernetes cluster.
 Sample Prometheus queries:
 * % Memory Used: `(1 - ((node_memory_MemFree + node_memory_Cached) / node_memory_MemTotal)) * 100`
@@ -145,6 +145,8 @@ Sample Prometheus queries:
 * Data Transmitted: `irate(node_network_transmit_bytes[5m])`
 * Data Received: `irate(node_network_receive_bytes[5m])`
+Prometheus project integration has also been enabled by default, utilizing the bundled Prometheus server.
+
 # Upgrading to a new version
 Upgrading your Kubernetes deployment of GitLab proves to be quite simple.
@@ -152,4 +154,3 @@ Upgrading your Kubernetes deployment of GitLab proves to be quite simple.
 * Fetch the latest `master` with `git checkout master && git pull`
 * Re-run the `generate.bash` with the same variables originally used.
 * Apply the updates YAML with `kubectl apply -f gitlab-{domain}.yml`
-

gitlab-runner/gitlab-runner-docker-deployment.yml

@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
       - name: gitlab-runner-docker
-        image: gitlab/gitlab-runner:alpine-v1.11.1
+        image: gitlab/gitlab-runner:alpine-v9.0.0
         command: ["/bin/bash", "/scripts/entrypoint"]
         imagePullPolicy: IfNotPresent
         env:

gitlab/gitlab-deployment.yml

@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: gitlab/gitlab-ce:8.17.2-ce.0
+        image: gitlab/gitlab-ce:9.0.0-ce.0
         imagePullPolicy: IfNotPresent
         command: ["/bin/bash", "-c",
           "sed -i \"s/environment ({'GITLAB_ROOT_PASSWORD' => initial_root_password }) if initial_root_password/environment ({'GITLAB_ROOT_PASSWORD' => initial_root_password, 'GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN' => node['gitlab']['gitlab-rails']['initial_shared_runners_registration_token'] })/g\" /opt/gitlab/embedded/cookbooks/gitlab/recipes/database_migrations.rb && exec /assets/wrapper"]
@@ -129,22 +129,17 @@ spec:
             gitlab_rails['registry_path'] = '/gitlab-registry'
             gitlab_rails['trusted_proxies'] = ["10.0.0.0/8","172.16.0.0/12","192.168.0.0/16"]
-            prometheus['enable'] = true
             prometheus['listen_address'] = '0.0.0.0:9090'
-            node_exporter['enable'] = true
-            gitlab_monitor['enable'] = true
-            postgres_exporter['enable'] = true
             postgres_exporter['env'] = {
               'DATA_SOURCE_NAME' => "user=#{ENV['POSTGRES_USER']} host=gitlab-postgresql port=5432 dbname=#{ENV['POSTGRES_DB']} password=#{ENV['POSTGRES_PASSWORD']} sslmode=disable"
             }
-            redis_exporter['enable'] = true
             redis_exporter['flags'] = {
               'redis.addr' => "gitlab-redis:6379",
             }
         - name: GITLAB_POST_RECONFIGURE_SCRIPT
           value: |
-            /opt/gitlab/bin/gitlab-rails runner -e production 'Doorkeeper::Application.where(uid: ENV["MATTERMOST_APP_UID"], secret: ENV["MATTERMOST_APP_SECRET"], redirect_uri: "#{ENV["GITLAB_MATTERMOST_EXTERNAL_SCHEME"]}://#{ENV["GITLAB_MATTERMOST_EXTERNAL_HOSTNAME"]}/signup/gitlab/complete\r\n#{ENV["GITLAB_MATTERMOST_EXTERNAL_SCHEME"]}://#{ENV["GITLAB_MATTERMOST_EXTERNAL_HOSTNAME"]}/login/gitlab/complete", name: "GitLab Mattermost").first_or_create;'
+            /opt/gitlab/bin/gitlab-rails runner -e production 'Doorkeeper::Application.where(uid: ENV["MATTERMOST_APP_UID"], secret: ENV["MATTERMOST_APP_SECRET"], redirect_uri: "#{ENV["GITLAB_MATTERMOST_EXTERNAL_SCHEME"]}://#{ENV["GITLAB_MATTERMOST_EXTERNAL_HOSTNAME"]}/signup/gitlab/complete\r\n#{ENV["GITLAB_MATTERMOST_EXTERNAL_SCHEME"]}://#{ENV["GITLAB_MATTERMOST_EXTERNAL_HOSTNAME"]}/login/gitlab/complete", name: "GitLab Mattermost").first_or_create && PrometheusService.where(template: true).first_or_create(active: true, properties: {"api_url"=>"http://localhost:9090"})'
         ports:
         - name: registry
           containerPort: 8105

gitlab/postgresql-deployment.yml

@@ -12,7 +12,7 @@ spec:
     spec:
       containers:
       - name: postgresql
-        image: postgres:9.5.3
+        image: postgres:9.6.1
         imagePullPolicy: IfNotPresent
         env:
         - name: POSTGRES_USER