Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

Update references to gcr.io to point to Azure CDN endpoint #2721

Merged
merged 1 commit into from
Apr 19, 2018
Merged

Update references to gcr.io to point to Azure CDN endpoint #2721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/kubernetes/k8s-developers.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cd ../../..
* Push your Docker image to Docker Hub:

```
docker tag gcr.io/google-containers/hyperkube-amd64:sometag dockerhubid/hyperkube-amd64:sometag
docker tag k8s-gcrio.azureedge.net/hyperkube-amd64:sometag dockerhubid/hyperkube-amd64:sometag
docker push dockerhubid/hyperkube-amd64:sometag
```

Expand Down
2 changes: 1 addition & 1 deletion extensions/prometheus-grafana-k8s/v1/prometheus_values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ kubeStateMetrics:
## kube-state-metrics container image
##
image:
repository: k8s.gcr.io/kube-state-metrics
repository: k8s-gcrio.azureedge.net/kube-state-metrics
tag: v1.2.0
pullPolicy: IfNotPresent

Expand Down
4 changes: 2 additions & 2 deletions jenkins/Jenkinsfile.azure.kubernetes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ node(env.NODE? env.NODE : 'slave') {
sh("docker login -u ${REGISTRY_USERNAME} -p ${REGISTRY_PASSWORD} ${REGISTRY_USERNAME}.azurecr.io")

// We retag the gcr image from hyperkube-amd64 to just hyperkube since we can use image tags for separate architectures
sh("cd /go/src/github.com/kubernetes/kubernetes && docker tag gcr.io/google-containers/hyperkube-amd64:${tag} ${REGISTRY_USERNAME}.azurecr.io/hyperkube:${tag}")
sh("cd /go/src/github.com/kubernetes/kubernetes && docker tag k8s-gcrio.azureedge.net/hyperkube-amd64:${tag} ${REGISTRY_USERNAME}.azurecr.io/hyperkube:${tag}")
sh("cd /go/src/github.com/kubernetes/kubernetes && docker push ${REGISTRY_USERNAME}.azurecr.io/hyperkube:${tag}")
}
}
}
}

}
}
}
2 changes: 1 addition & 1 deletion test/e2e/kubernetes/kubernetes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu
// Inspired by http://blog.kubernetes.io/2016/07/autoscaling-in-kubernetes.html
r := rand.New(rand.NewSource(time.Now().UnixNano()))
phpApacheName := fmt.Sprintf("php-apache-%s-%v", cfg.Name, r.Intn(99999))
phpApacheDeploy, err := deployment.CreateLinuxDeploy("gcr.io/google_containers/hpa-example", phpApacheName, "default", "--requests=cpu=50m,memory=50M")
phpApacheDeploy, err := deployment.CreateLinuxDeploy("k8s-gcrio.azureedge.net/hpa-example", phpApacheName, "default", "--requests=cpu=50m,memory=50M")
if err != nil {
fmt.Println(err)
}
Expand Down