Skip to content

Commit 6155c06

Browse files
committed
🐛 Fix e2e test by using quay.io for images
Images are not autoamtically pulished to MCR to use quay.io instead.
1 parent 293b35e commit 6155c06

File tree

6 files changed

+16
-26
lines changed

6 files changed

+16
-26
lines changed

test/e2e/config/helm.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ intervals:
191191
default/wait-helmreleaseproxy-ready: ["10m", "10s"]
192192
default/wait-helm-release: ["10m", "10s"]
193193
default/wait-helm-release-deployed: ["10m", "10s"]
194+
default/wait-delete-helmreleaseproxy: ["3m", "10s"]
194195
node-drain/wait-deployment-available: ["3m", "10s"]
195196
node-drain/wait-control-plane: ["15m", "10s"]
196197
node-drain/wait-machine-deleted: ["2m", "10s"]

test/e2e/data/addons-helm/v1.5/bases/calico.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ spec:
88
cni: calico
99
repoURL: https://docs.tigera.io/calico/charts
1010
chartName: tigera-operator
11-
# version: ${CALICO_VERSION}
1211
releaseName: projectcalico
1312
namespace: tigera-operator
1413
valuesTemplate: |
@@ -18,14 +17,12 @@ spec:
1817
calicoNetwork:
1918
bgp: Disabled
2019
mtu: 1350
21-
ipPools:
2220
ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
2321
- cidr: {{ $cidr }}
2422
encapsulation: VXLAN{{end}}
25-
registry: mcr.microsoft.com/oss
23+
registry: quay.io/
2624
# Image and registry configuration for the tigera/operator pod.
2725
tigeraOperator:
28-
image: tigera/operator
29-
registry: mcr.microsoft.com/oss
26+
registry: quay.io
3027
calicoctl:
31-
image: mcr.microsoft.com/oss/calico/ctl
28+
image: quay.io/calico/ctl

test/e2e/data/addons-helm/v1.5/cluster-template.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,15 @@ spec:
1717
calicoNetwork:
1818
bgp: Disabled
1919
mtu: 1350
20-
ipPools:
2120
ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
2221
- cidr: {{ $cidr }}
2322
encapsulation: VXLAN{{end}}
24-
registry: mcr.microsoft.com/oss
23+
registry: quay.io/
2524
# Image and registry configuration for the tigera/operator pod.
2625
tigeraOperator:
27-
image: tigera/operator
28-
registry: mcr.microsoft.com/oss
26+
registry: quay.io
2927
calicoctl:
30-
image: mcr.microsoft.com/oss/calico/ctl
28+
image: quay.io/calico/ctl
3129
---
3230
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
3331
kind: KubeadmConfigTemplate

test/e2e/data/addons-helm/v1beta1/bases/calico.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,12 @@ spec:
1717
calicoNetwork:
1818
bgp: Disabled
1919
mtu: 1350
20-
ipPools:
2120
ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
2221
- cidr: {{ $cidr }}
2322
encapsulation: VXLAN{{end}}
24-
registry: mcr.microsoft.com/oss
23+
registry: quay.io/
2524
# Image and registry configuration for the tigera/operator pod.
2625
tigeraOperator:
27-
image: tigera/operator
28-
registry: mcr.microsoft.com/oss
26+
registry: quay.io
2927
calicoctl:
30-
image: mcr.microsoft.com/oss/calico/ctl
28+
image: quay.io/calico/ctl

test/e2e/data/addons-helm/v1beta1/cluster-template-upgrades.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,15 @@ spec:
1717
calicoNetwork:
1818
bgp: Disabled
1919
mtu: 1350
20-
ipPools:
2120
ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
2221
- cidr: {{ $cidr }}
2322
encapsulation: VXLAN{{end}}
24-
registry: mcr.microsoft.com/oss
23+
registry: quay.io/
2524
# Image and registry configuration for the tigera/operator pod.
2625
tigeraOperator:
27-
image: tigera/operator
28-
registry: mcr.microsoft.com/oss
26+
registry: quay.io
2927
calicoctl:
30-
image: mcr.microsoft.com/oss/calico/ctl
28+
image: quay.io/calico/ctl
3129
---
3230
apiVersion: cluster.x-k8s.io/v1beta1
3331
kind: Cluster

test/e2e/data/addons-helm/v1beta1/cluster-template.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,15 @@ spec:
1717
calicoNetwork:
1818
bgp: Disabled
1919
mtu: 1350
20-
ipPools:
2120
ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
2221
- cidr: {{ $cidr }}
2322
encapsulation: VXLAN{{end}}
24-
registry: mcr.microsoft.com/oss
23+
registry: quay.io/
2524
# Image and registry configuration for the tigera/operator pod.
2625
tigeraOperator:
27-
image: tigera/operator
28-
registry: mcr.microsoft.com/oss
26+
registry: quay.io
2927
calicoctl:
30-
image: mcr.microsoft.com/oss/calico/ctl
28+
image: quay.io/calico/ctl
3129
---
3230
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
3331
kind: KubeadmConfigTemplate

0 commit comments

Comments
 (0)