Skip to content

Commit

Permalink
test with top of capi v0.3.10-rc.1
Browse files Browse the repository at this point in the history
  • Loading branch information
nader-ziada committed Sep 30, 2020
1 parent 3ca83cf commit d1160b5
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST)
kubectl wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager-webhook

# Deploy CAPI
curl -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.10-rc.0/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
curl -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.10-rc.1/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -

# Deploy CAPZ
kind load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=capz
Expand Down
2 changes: 1 addition & 1 deletion Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ settings = {
"deploy_cert_manager": True,
"preload_images_for_kind": True,
"kind_cluster_name": "capz",
"capi_version": "v0.3.10-rc.0",
"capi_version": "v0.3.10-rc.1",
"cert_manager_version": "v0.16.1",
"kubernetes_version": "v1.18.8",
"aks_kubernetes_version": "v1.17.7"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ require (
k8s.io/klog v1.0.0
k8s.io/kubectl v0.17.11
k8s.io/utils v0.0.0-20200821003339-5e75c0163111
sigs.k8s.io/cluster-api v0.3.10-rc.0
sigs.k8s.io/cluster-api v0.3.10-rc.1
sigs.k8s.io/controller-runtime v0.5.11
)

Expand Down
4 changes: 4 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -779,6 +779,10 @@ modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs
modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
sigs.k8s.io/cluster-api v0.3.10-rc.0 h1:0TcwqaNbArWmap2awVdZBYOsZONnIav0LUepjejqGmI=
sigs.k8s.io/cluster-api v0.3.10-rc.0/go.mod h1:XBBDBiaczcyNlH4D7FNjSKc5bBofYRppfg0ZgaP2x1U=
sigs.k8s.io/cluster-api v0.3.10-rc.0.0.20200929175725-a0a8a75b1f02 h1:+uRyDdtGp9R1lMVzDeeciGehdghFfXOFYhn2LOETycI=
sigs.k8s.io/cluster-api v0.3.10-rc.0.0.20200929175725-a0a8a75b1f02/go.mod h1:XBBDBiaczcyNlH4D7FNjSKc5bBofYRppfg0ZgaP2x1U=
sigs.k8s.io/cluster-api v0.3.10-rc.1 h1:J7gK4h8GtWWDCOqcB5m8W6zSrO8jZJX95Y4jS2oIcfY=
sigs.k8s.io/cluster-api v0.3.10-rc.1/go.mod h1:XBBDBiaczcyNlH4D7FNjSKc5bBofYRppfg0ZgaP2x1U=
sigs.k8s.io/controller-runtime v0.5.11 h1:U/FjGJ61aR2T2mCrdlBCxEcWgLEwLmK6YZKf0NC0a24=
sigs.k8s.io/controller-runtime v0.5.11/go.mod h1:OTqxLuz7gVcrq+BHGUgedRu6b2VIKCEc7Pu4Jbwui0A=
sigs.k8s.io/kind v0.7.1-0.20200303021537-981bd80d3802 h1:L6/8hETA7jvdx3xBcbDifrIN2xaYHE7tA58n+Kdp2Zw=
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/config/azure-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ providers:
- name: cluster-api
type: CoreProvider
versions:
- name: v0.3.10-rc.0
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.10-rc.0/core-components.yaml
- name: v0.3.10-rc.1
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.10-rc.1/core-components.yaml
type: url
replacements:
- old: "imagePullPolicy: Always"
Expand All @@ -19,8 +19,8 @@ providers:
- name: kubeadm
type: BootstrapProvider
versions:
- name: v0.3.10-rc.0
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.10-rc.0/bootstrap-components.yaml
- name: v0.3.10-rc.1
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.10-rc.1/bootstrap-components.yaml
type: url
replacements:
- old: "imagePullPolicy: Always"
Expand All @@ -30,8 +30,8 @@ providers:
- name: kubeadm
type: ControlPlaneProvider
versions:
- name: v0.3.10-rc.0
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.10-rc.0/control-plane-components.yaml
- name: v0.3.10-rc.1
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.10-rc.1/control-plane-components.yaml
type: url
replacements:
- old: "imagePullPolicy: Always"
Expand Down

0 comments on commit d1160b5

Please sign in to comment.