Merge branch '37-updates-for-9-1' into 'master'

Updates for 9.1

Closes #37

See merge request !35

gitlab/gitlab-deployment.yml

@@ -13,7 +13,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: gitlab/gitlab-ce:9.0.5-ce.0
+        image: gitlab/gitlab-ce:9.1.2-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"]
@@ -130,9 +130,11 @@ spec:
             gitlab_rails['trusted_proxies'] = ["10.0.0.0/8","172.16.0.0/12","192.168.0.0/16"]
             prometheus['listen_address'] = '0.0.0.0:9090'
+            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",
             }
@@ -167,8 +169,6 @@ spec:
           containerPort: 22
         - name: prometheus
           containerPort: 9090
-        - name: node-exporter
-          containerPort: 9100
         volumeMounts:
         - name: config
           mountPath: /etc/gitlab

gitlab/gitlab-svc.yml

@@ -24,6 +24,3 @@ spec:
     - name: prometheus
       port: 9090
       targetPort: prometheus
-    - name: node-exporter
-      port: 9100
-      targetPort: node-exporter