mirror of https://github.com/kubernetes/kops.git
				
				
				
			Replace gcr.io URL with k8s.gcr.io vanity URL
This is just the changes that aren't for backwards compatability, from the bigger #4931
This commit is contained in:
		
							parent
							
								
									16e846d4ce
								
							
						
					
					
						commit
						cd89216042
					
				| 
						 | 
				
			
			@ -81,7 +81,7 @@ spec:
 | 
			
		|||
      serviceAccountName: metrics-server
 | 
			
		||||
      containers:
 | 
			
		||||
        - name: metrics-server
 | 
			
		||||
          image: gcr.io/google_containers/metrics-server-amd64:v0.1.0
 | 
			
		||||
          image: k8s.gcr.io/metrics-server-amd64:v0.1.0
 | 
			
		||||
          imagePullPolicy: Always
 | 
			
		||||
          command:
 | 
			
		||||
            - /metrics-server
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -136,7 +136,7 @@ spec:
 | 
			
		|||
        emptyDir: {}
 | 
			
		||||
      containers:
 | 
			
		||||
      - name: metrics-server
 | 
			
		||||
        image: gcr.io/google_containers/metrics-server-amd64:v0.3.1
 | 
			
		||||
        image: k8s.gcr.io/metrics-server-amd64:v0.3.1
 | 
			
		||||
        imagePullPolicy: Always
 | 
			
		||||
        volumeMounts:
 | 
			
		||||
        - name: tmp-dir
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -175,7 +175,7 @@ Reinitialize the etcd instances:
 | 
			
		|||
* Delete the containers and the data directories:
 | 
			
		||||
 | 
			
		||||
```bash
 | 
			
		||||
root@ip-172-20-116-230:~# docker stop $(docker ps | grep "gcr.io/google_containers/etcd" | awk '{print $1}')
 | 
			
		||||
root@ip-172-20-116-230:~# docker stop $(docker ps | grep "k8s.gcr.io/etcd" | awk '{print $1}')
 | 
			
		||||
root@ip-172-20-116-230:~# rm -r /mnt/master-vol-03b97b1249caf379a/var/etcd/data-events/member/
 | 
			
		||||
root@ip-172-20-116-230:~# rm -r /mnt/master-vol-0dbfd1f3c60b8c509/var/etcd/data/member/
 | 
			
		||||
```
 | 
			
		||||
| 
						 | 
				
			
			@ -247,7 +247,7 @@ $ kubectl --namespace=kube-system exec etcd-server-ip-172-20-36-161.ec2.internal
 | 
			
		|||
 * Delete the containers and the data directories:
 | 
			
		||||
 | 
			
		||||
 ```bash
 | 
			
		||||
 root@ip-172-20-139-130:~# docker stop $(docker ps | grep "gcr.io/google_containers/etcd" | awk '{print $1}')
 | 
			
		||||
 root@ip-172-20-139-130:~# docker stop $(docker ps | grep "k8s.gcr.io/etcd" | awk '{print $1}')
 | 
			
		||||
 root@ip-172-20-139-130:~# rm -r /mnt/master-vol-019796c3511a91b4f//var/etcd/data-events/member/
 | 
			
		||||
 root@ip-172-20-139-130:~# rm -r /mnt/master-vol-0c89fd6f6a256b686/var/etcd/data/member/
 | 
			
		||||
 ```
 | 
			
		||||
| 
						 | 
				
			
			@ -308,7 +308,7 @@ Reinitialize the etcd instances:
 | 
			
		|||
* Delete the containers and the data directories while restoring also from previous backup:
 | 
			
		||||
 | 
			
		||||
```bash
 | 
			
		||||
root@ip-172-20-116-230:~# docker stop $(docker ps | grep "gcr.io/google_containers/etcd" | awk '{print $1}')
 | 
			
		||||
root@ip-172-20-116-230:~# docker stop $(docker ps | grep "k8s.gcr.io/etcd" | awk '{print $1}')
 | 
			
		||||
root@ip-172-20-116-230:~# rm -r /mnt/master-vol-03b97b1249caf379a/var/etcd/data-events/member/
 | 
			
		||||
root@ip-172-20-116-230:~# rm -r /mnt/master-vol-0dbfd1f3c60b8c509/var/etcd/data/member/
 | 
			
		||||
root@ip-172-20-116-230:~# cp -R /mnt/master-vol-03b97b1249caf379a/var/etcd/data-events/backup/member  /mnt/master-vol-03b97b1249caf379a/var/etcd/data-events/
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue