Skip to content

Commit

Permalink
Fix inconsistent CI pipeline (#732)
Browse files Browse the repository at this point in the history
* replace k8s.gcr.io with registry.k8s.io

* replace cx41 with cx42 machines
  • Loading branch information
amitsagtani97 authored Sep 12, 2024
1 parent 2e86366 commit 219af1e
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions ansible/files/registry/images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ registry_name="localhost"
images=$(cat $SCRIPT_DIR/list_of_docker_images.txt)
quay=$(cat $SCRIPT_DIR/list_of_docker_images.txt | grep "^quay.io" | awk -F quay.io/ '{print $2}' | grep -v '^$' )
gcr=$(cat $SCRIPT_DIR/list_of_docker_images.txt | grep "^gcr.io" | awk -F gcr.io/ '{print $2}' | grep -v '^$')
k8sgcr=$(cat $SCRIPT_DIR/list_of_docker_images.txt | grep "^k8s.gcr.io" | awk -F k8s.gcr.io/ '{print $2}' | grep -v '^$')
registryk8s=$(cat $SCRIPT_DIR/list_of_docker_images.txt | grep "^registry.k8s.io" | awk -F registry.k8s.io/ '{print $2}' | grep -v '^$')
hub=$(cat $SCRIPT_DIR/list_of_docker_images.txt | grep -v gcr.io | grep -v quay.io)


Expand All @@ -26,8 +26,8 @@ for image in ${quay[@]}; do
mirror
done;

prefix=k8s.gcr.io/
for image in ${k8sgcr[@]}; do
prefix=registry.k8s.io/
for image in ${registryk8s[@]}; do
mirror
done;

Expand Down
6 changes: 3 additions & 3 deletions ansible/files/registry/list_of_docker_images.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ gcr.io/google_containers/pause-amd64:3.1
gcr.io/kubernetes-helm/tiller:v2.11.0
gcr.io/kubernetes-helm/tiller:v2.13.1
grafana/grafana:5.0.0
k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.4.0
k8s.gcr.io/defaultbackend:1.4
k8s.gcr.io/k8s-dns-node-cache:1.15.1
registry.k8s.io/cluster-proportional-autoscaler-amd64:1.4.0
registry.k8s.io/defaultbackend:1.4
registry.k8s.io/k8s-dns-node-cache:1.15.1
lachlanevenson/k8s-helm:v2.13.1
localstack/localstack:0.8.7
mesosphere/aws-cli:1.14.5
Expand Down
2 changes: 1 addition & 1 deletion ansible/files/registry/mk-sub-certificate
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ set -ex
echo $cn > dns_name

ALLDOMAINS=""
for ONEREGISTRYIN in quay.io k8s.gcr.io gcr.io docker.caching.proxy.internal registry-1.docker.io auth.docker.io ${REGISTRIES}; do
for ONEREGISTRYIN in quay.io registry.k8s.io gcr.io docker.caching.proxy.internal registry-1.docker.io auth.docker.io ${REGISTRIES}; do
ONEREGISTRY=$(echo ${ONEREGISTRYIN} | xargs) # Remove whitespace
echo "Adding certificate for registry: $ONEREGISTRY"
ALLDOMAINS="${ALLDOMAINS},DNS:${ONEREGISTRY}"
Expand Down
2 changes: 1 addition & 1 deletion ansible/registry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
with_items:
- "{{ registry_dns_name }}"
- quay.io
- k8s.gcr.io
- registry.k8s.io
- gcr.io
- docker.caching.proxy.internal
- registry-1.docker.io
Expand Down
4 changes: 2 additions & 2 deletions terraform/examples/create-infrastructure.tf
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ resource "hcloud_server" "node" {
count = 3
name = "node${count.index}"
image = "ubuntu-22.04"
server_type = "cx41"
server_type = "cx42"
ssh_keys = ["hetznerssh-key"]
# Nuremberg (for choices see `hcloud datacenter list`)
location = "nbg1"
Expand All @@ -31,7 +31,7 @@ resource "hcloud_server" "etcd" {
count = 3
name = "etcd${count.index}"
image = "ubuntu-22.04"
server_type = "cx41"
server_type = "cx42"
ssh_keys = ["hetznerssh-key"]

# Nuremberg (for choices see `hcloud datacenter list`)
Expand Down
6 changes: 3 additions & 3 deletions terraform/examples/wire-server-deploy-offline-hetzner/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ resource "hcloud_server" "adminhost" {
name = "adminhost-${random_pet.adminhost.id}"
image = "ubuntu-22.04"
ssh_keys = local.ssh_keys
server_type = "cx41"
server_type = "cx42"
user_data = <<-EOF
#cloud-config
apt:
Expand Down Expand Up @@ -98,7 +98,7 @@ resource "hcloud_server" "assethost" {
name = "assethost-${random_pet.assethost.id}"
image = "ubuntu-22.04"
ssh_keys = local.ssh_keys
server_type = "cx41"
server_type = "cx42"
user_data = local.disable_network_cfg
}

Expand Down Expand Up @@ -139,7 +139,7 @@ resource "hcloud_server" "kubenode" {
name = "kubenode-${random_pet.kubenode[count.index].id}"
image = "ubuntu-22.04"
ssh_keys = local.ssh_keys
server_type = "cx41"
server_type = "cx42"
user_data = local.disable_network_cfg
}

Expand Down

0 comments on commit 219af1e

Please sign in to comment.