mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-01 07:47:56 +00:00
[VDF] Remove references to gcr.io/google-containers
Signed-off-by: Stephen Augustus <saugustus@vmware.com>
This commit is contained in:
parent
90c223fa5c
commit
99dd7570eb
@ -25,7 +25,7 @@ Otherwise it will be omitted.
|
|||||||
|
|
||||||
#### Images
|
#### Images
|
||||||
|
|
||||||
addon-manager images are pushed to `k8s.gcr.io`. As addon-manager is built for multiple architectures, there is an image per architecture in the format - `k8s.gcr.io/kube-addon-manager-$(ARCH):$(VERSION)`. The list of existing images and version can be found in gcr.io/google-containers/.
|
addon-manager images are pushed to `k8s.gcr.io`. As addon-manager is built for multiple architectures, there is an image per architecture in the format - `k8s.gcr.io/kube-addon-manager-$(ARCH):$(VERSION)`.
|
||||||
|
|
||||||
#### How to release
|
#### How to release
|
||||||
|
|
||||||
|
@ -164,7 +164,7 @@ spec:
|
|||||||
hostPath:
|
hostPath:
|
||||||
path: /etc/srv/kubernetes/pki/konnectivity-agent
|
path: /etc/srv/kubernetes/pki/konnectivity-agent
|
||||||
containers:
|
containers:
|
||||||
- image: gcr.io/google-containers/proxy-agent:v0.0.3
|
- image: k8s.gcr.io/proxy-agent:v0.0.3
|
||||||
name: proxy-agent
|
name: proxy-agent
|
||||||
command: ["/proxy-agent"]
|
command: ["/proxy-agent"]
|
||||||
args: ["--caCert=/etc/srv/kubernetes/pki/proxy-agent/ca.crt", "--agentCert=/etc/srv/kubernetes/pki/proxy-agent/client.crt", "--agentKey=/etc/srv/kubernetes/pki/proxy-agent/client.key", "--proxyServerHost=127.0.0.1", "--proxyServerPort=8132"]
|
args: ["--caCert=/etc/srv/kubernetes/pki/proxy-agent/ca.crt", "--agentCert=/etc/srv/kubernetes/pki/proxy-agent/client.crt", "--agentKey=/etc/srv/kubernetes/pki/proxy-agent/client.key", "--proxyServerHost=127.0.0.1", "--proxyServerPort=8132"]
|
||||||
|
@ -76,5 +76,5 @@ spec:
|
|||||||
- name: root-mount
|
- name: root-mount
|
||||||
mountPath: /root
|
mountPath: /root
|
||||||
containers:
|
containers:
|
||||||
- image: "gcr.io/google-containers/pause:3.2"
|
- image: "k8s.gcr.io/pause:3.2"
|
||||||
name: pause
|
name: pause
|
@ -37,8 +37,6 @@ type RegistryList struct {
|
|||||||
InvalidRegistry string `yaml:"invalidRegistry"`
|
InvalidRegistry string `yaml:"invalidRegistry"`
|
||||||
GcRegistry string `yaml:"gcRegistry"`
|
GcRegistry string `yaml:"gcRegistry"`
|
||||||
GcrReleaseRegistry string `yaml:"gcrReleaseRegistry"`
|
GcrReleaseRegistry string `yaml:"gcrReleaseRegistry"`
|
||||||
// TODO: The last consumer of this has been removed and it should be deprecated
|
|
||||||
GoogleContainerRegistry string `yaml:"googleContainerRegistry"`
|
|
||||||
PrivateRegistry string `yaml:"privateRegistry"`
|
PrivateRegistry string `yaml:"privateRegistry"`
|
||||||
SampleRegistry string `yaml:"sampleRegistry"`
|
SampleRegistry string `yaml:"sampleRegistry"`
|
||||||
K8sCSI string `yaml:"k8sCSI"`
|
K8sCSI string `yaml:"k8sCSI"`
|
||||||
@ -78,8 +76,6 @@ func initReg() RegistryList {
|
|||||||
InvalidRegistry: "invalid.com/invalid",
|
InvalidRegistry: "invalid.com/invalid",
|
||||||
GcRegistry: "k8s.gcr.io",
|
GcRegistry: "k8s.gcr.io",
|
||||||
GcrReleaseRegistry: "gcr.io/gke-release",
|
GcrReleaseRegistry: "gcr.io/gke-release",
|
||||||
// TODO: The last consumer of this has been removed and it should be deleted
|
|
||||||
GoogleContainerRegistry: "gcr.io/google-containers",
|
|
||||||
PrivateRegistry: "gcr.io/k8s-authenticated-test",
|
PrivateRegistry: "gcr.io/k8s-authenticated-test",
|
||||||
SampleRegistry: "gcr.io/google-samples",
|
SampleRegistry: "gcr.io/google-samples",
|
||||||
K8sCSI: "gcr.io/k8s-staging-csi",
|
K8sCSI: "gcr.io/k8s-staging-csi",
|
||||||
|
Loading…
Reference in New Issue
Block a user