Merge pull request #253 from smarterclayton/fix_unreferenced_url

openshift-merge-robot · web-flow · commit dc3bfa19e6e3 · 2019-02-20T14:08:03.000+01:00
jsonnet: Fix incorrectly referenced oauth-proxy image
diff --git a/assets/alertmanager/alertmanager.yaml b/assets/alertmanager/alertmanager.yaml
@@ -45,7 +45,7 @@ spec:
       value: ""
     - name: NO_PROXY
       value: ""
-    image: openshift/oauth-proxy:latest
+    image: quay.io/openshift/oauth-proxy:latest
     name: alertmanager-proxy
     ports:
     - containerPort: 9094
diff --git a/assets/grafana/deployment.yaml b/assets/grafana/deployment.yaml
@@ -77,7 +77,7 @@ spec:
         - -openshift-ca=/etc/pki/tls/cert.pem
         - -openshift-ca=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt
         - -skip-auth-regex=^/metrics
-        image: openshift/oauth-proxy:latest
+        image: quay.io/openshift/oauth-proxy:latest
         name: grafana-proxy
         ports:
         - containerPort: 3000
diff --git a/assets/prometheus-k8s/prometheus.yaml b/assets/prometheus-k8s/prometheus.yaml
@@ -52,7 +52,7 @@ spec:
     - -openshift-ca=/etc/pki/tls/cert.pem
     - -openshift-ca=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt
     - -skip-auth-regex=^/metrics
-    image: openshift/oauth-proxy:latest
+    image: quay.io/openshift/oauth-proxy:latest
     name: prometheus-proxy
     ports:
     - containerPort: 9091
diff --git a/jsonnet/main.jsonnet b/jsonnet/main.jsonnet
@@ -16,7 +16,7 @@ local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') +
            {
              _config+:: {
                imageRepos+:: {
-                 openshiftOauthProxy: 'openshift/oauth-proxy',
+                 openshiftOauthProxy: 'quay.io/openshift/oauth-proxy',
                  prometheus: 'openshift/prometheus',
                  alertmanager: 'openshift/prometheus-alertmanager',
                  nodeExporter: 'openshift/prometheus-node-exporter',
diff --git a/pkg/manifests/bindata.go b/pkg/manifests/bindata.go

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') +`
`16`	`16`	`{`
`17`	`17`	`_config+:: {`
`18`	`18`	`imageRepos+:: {`
`19`		`- openshiftOauthProxy: 'openshift/oauth-proxy',`
	`19`	`+ openshiftOauthProxy: 'quay.io/openshift/oauth-proxy',`
`20`	`20`	`prometheus: 'openshift/prometheus',`
`21`	`21`	`alertmanager: 'openshift/prometheus-alertmanager',`
`22`	`22`	`nodeExporter: 'openshift/prometheus-node-exporter',`