Skip to content

🐛 Fix e2e test by using quay.io for images #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 21, 2024
+16 −26
Merged

🐛 Fix e2e test by using quay.io for images #239

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
1 change: 1 addition & 0 deletions test/e2e/config/helm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ intervals:
default/wait-helmreleaseproxy-ready: ["10m", "10s"]
default/wait-helm-release: ["10m", "10s"]
default/wait-helm-release-deployed: ["10m", "10s"]
default/wait-delete-helmreleaseproxy: ["3m", "10s"]
node-drain/wait-deployment-available: ["3m", "10s"]
node-drain/wait-control-plane: ["15m", "10s"]
node-drain/wait-machine-deleted: ["2m", "10s"]
Expand Down
9 changes: 3 additions & 6 deletions test/e2e/data/addons-helm/v1.5/bases/calico.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ spec:
cni: calico
repoURL: https://docs.tigera.io/calico/charts
chartName: tigera-operator
# version: ${CALICO_VERSION}
releaseName: projectcalico
namespace: tigera-operator
valuesTemplate: |
Expand All @@ -18,14 +17,12 @@ spec:
calicoNetwork:
bgp: Disabled
mtu: 1350
ipPools:
ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
- cidr: {{ $cidr }}
encapsulation: VXLAN{{end}}
registry: mcr.microsoft.com/oss
registry: quay.io/
# Image and registry configuration for the tigera/operator pod.
tigeraOperator:
image: tigera/operator
registry: mcr.microsoft.com/oss
registry: quay.io
calicoctl:
image: mcr.microsoft.com/oss/calico/ctl
image: quay.io/calico/ctl
8 changes: 3 additions & 5 deletions test/e2e/data/addons-helm/v1.5/cluster-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,15 @@ spec:
calicoNetwork:
bgp: Disabled
mtu: 1350
ipPools:
ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
- cidr: {{ $cidr }}
encapsulation: VXLAN{{end}}
registry: mcr.microsoft.com/oss
registry: quay.io/
# Image and registry configuration for the tigera/operator pod.
tigeraOperator:
image: tigera/operator
registry: mcr.microsoft.com/oss
registry: quay.io
calicoctl:
image: mcr.microsoft.com/oss/calico/ctl
image: quay.io/calico/ctl
---
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
kind: KubeadmConfigTemplate
Expand Down
8 changes: 3 additions & 5 deletions test/e2e/data/addons-helm/v1beta1/bases/calico.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,12 @@ spec:
calicoNetwork:
bgp: Disabled
mtu: 1350
ipPools:
ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
- cidr: {{ $cidr }}
encapsulation: VXLAN{{end}}
registry: mcr.microsoft.com/oss
registry: quay.io/
# Image and registry configuration for the tigera/operator pod.
tigeraOperator:
image: tigera/operator
registry: mcr.microsoft.com/oss
registry: quay.io
calicoctl:
image: mcr.microsoft.com/oss/calico/ctl
image: quay.io/calico/ctl
8 changes: 3 additions & 5 deletions test/e2e/data/addons-helm/v1beta1/cluster-template-upgrades.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,15 @@ spec:
calicoNetwork:
bgp: Disabled
mtu: 1350
ipPools:
ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
- cidr: {{ $cidr }}
encapsulation: VXLAN{{end}}
registry: mcr.microsoft.com/oss
registry: quay.io/
# Image and registry configuration for the tigera/operator pod.
tigeraOperator:
image: tigera/operator
registry: mcr.microsoft.com/oss
registry: quay.io
calicoctl:
image: mcr.microsoft.com/oss/calico/ctl
image: quay.io/calico/ctl
---
apiVersion: cluster.x-k8s.io/v1beta1
kind: Cluster
Expand Down
8 changes: 3 additions & 5 deletions test/e2e/data/addons-helm/v1beta1/cluster-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,15 @@ spec:
calicoNetwork:
bgp: Disabled
mtu: 1350
ipPools:
ipPools:{{range $i, $cidr := .Cluster.spec.clusterNetwork.pods.cidrBlocks }}
- cidr: {{ $cidr }}
encapsulation: VXLAN{{end}}
registry: mcr.microsoft.com/oss
registry: quay.io/
# Image and registry configuration for the tigera/operator pod.
tigeraOperator:
image: tigera/operator
registry: mcr.microsoft.com/oss
registry: quay.io
calicoctl:
image: mcr.microsoft.com/oss/calico/ctl
image: quay.io/calico/ctl
---
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
kind: KubeadmConfigTemplate
Expand Down