mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-04 04:08:16 +00:00 
			
		
		
		
	Pull cluster addon images from gcr.io
This commit is contained in:
		@@ -12,7 +12,7 @@ desiredState:
 | 
			
		||||
        id: monitoring-heapster
 | 
			
		||||
        containers:
 | 
			
		||||
          - name: heapster
 | 
			
		||||
            image: kubernetes/heapster:v0.9
 | 
			
		||||
            image: gcr.io/google-containers/heapster:v0.9
 | 
			
		||||
            env: 
 | 
			
		||||
              - name: "INFLUXDB_HOST"
 | 
			
		||||
                value: "monitoring-influxdb"
 | 
			
		||||
 
 | 
			
		||||
@@ -15,14 +15,14 @@ desiredState:
 | 
			
		||||
        id: monitoring-influx-grafana
 | 
			
		||||
        containers: 
 | 
			
		||||
          - name: influxdb
 | 
			
		||||
            image: kubernetes/heapster_influxdb:v0.3
 | 
			
		||||
            image: gcr.io/google-containers/heapster_influxdb:v0.3
 | 
			
		||||
            ports: 
 | 
			
		||||
              - containerPort: 8083
 | 
			
		||||
                hostPort: 8083
 | 
			
		||||
              - containerPort: 8086
 | 
			
		||||
                hostPort: 8086
 | 
			
		||||
          - name: grafana
 | 
			
		||||
            image: kubernetes/heapster_grafana:v0.5
 | 
			
		||||
            image: gcr.io/google-containers/heapster_grafana:v0.5
 | 
			
		||||
            env: 
 | 
			
		||||
              - name: "HTTP_USER"
 | 
			
		||||
                value: "admin"
 | 
			
		||||
 
 | 
			
		||||
@@ -16,7 +16,7 @@ spec:
 | 
			
		||||
        kubernetes.io/cluster-service: "true"
 | 
			
		||||
    spec: 
 | 
			
		||||
      containers: 
 | 
			
		||||
        - image: kubernetes/heapster:v0.9
 | 
			
		||||
        - image: gcr.io/google-containers/heapster:v0.9
 | 
			
		||||
          name: heapster
 | 
			
		||||
          env: 
 | 
			
		||||
            - name: "INFLUXDB_HOST"
 | 
			
		||||
 
 | 
			
		||||
@@ -16,7 +16,7 @@ spec:
 | 
			
		||||
        kubernetes.io/cluster-service: "true"
 | 
			
		||||
    spec: 
 | 
			
		||||
      containers: 
 | 
			
		||||
        - image: kubernetes/heapster_influxdb:v0.3
 | 
			
		||||
        - image: gcr.io/google-containers/heapster_influxdb:v0.3
 | 
			
		||||
          name: influxdb
 | 
			
		||||
          ports: 
 | 
			
		||||
            - containerPort: 8083
 | 
			
		||||
@@ -24,7 +24,7 @@ spec:
 | 
			
		||||
            - containerPort: 8086
 | 
			
		||||
              hostPort: 8086
 | 
			
		||||
        - name: grafana
 | 
			
		||||
          image: kubernetes/heapster_grafana:v0.5
 | 
			
		||||
          image: gcr.io/google-containers/heapster_grafana:v0.5
 | 
			
		||||
          ports:
 | 
			
		||||
              - containerPort: 80
 | 
			
		||||
          env: 
 | 
			
		||||
 
 | 
			
		||||
@@ -29,13 +29,13 @@ desiredState:
 | 
			
		||||
                    "-advertise-client-urls=http://127.0.0.1:4001",
 | 
			
		||||
            ]
 | 
			
		||||
          - name: kube2sky
 | 
			
		||||
            image: kubernetes/kube2sky:1.1
 | 
			
		||||
            image: gcr.io/google-containers/kube2sky:1.1
 | 
			
		||||
            command: [
 | 
			
		||||
                    # entrypoint = "/kube2sky",
 | 
			
		||||
                    "-domain={{ pillar['dns_domain'] }}",
 | 
			
		||||
            ]
 | 
			
		||||
          - name: skydns
 | 
			
		||||
            image: kubernetes/skydns:2015-03-11-001
 | 
			
		||||
            image: gcr.io/google-containers/skydns:2015-03-11-001
 | 
			
		||||
            command: [
 | 
			
		||||
                    # entrypoint = "/skydns",
 | 
			
		||||
                    "-machines=http://localhost:4001",
 | 
			
		||||
 
 | 
			
		||||
@@ -12,7 +12,7 @@ desiredState:
 | 
			
		||||
        id: es-log-ingestion
 | 
			
		||||
        containers:
 | 
			
		||||
          - name: elasticsearch-logging
 | 
			
		||||
            image: kubernetes/elasticsearch:1.0
 | 
			
		||||
            image: gcr.io/google-containers/elasticsearch:1.0
 | 
			
		||||
            ports:
 | 
			
		||||
              - name: es-port
 | 
			
		||||
                containerPort: 9200
 | 
			
		||||
 
 | 
			
		||||
@@ -12,7 +12,7 @@ desiredState:
 | 
			
		||||
        id: kibana-viewer
 | 
			
		||||
        containers:
 | 
			
		||||
          - name: kibana-logging
 | 
			
		||||
            image: kubernetes/kibana:1.1
 | 
			
		||||
            image: gcr.io/google-containers/kibana:1.1
 | 
			
		||||
            ports:
 | 
			
		||||
              - name: kibana-port
 | 
			
		||||
                containerPort: 80
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user