Skip to content

Commit fc2d026

Browse files
Update KubeadmConfigTemplate version and CAPI version (#282)
1 parent d3d1b85 commit fc2d026

20 files changed

+28
-28
lines changed

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ require (
1919
k8s.io/component-base v0.26.1
2020
k8s.io/klog/v2 v2.80.1
2121
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
22-
sigs.k8s.io/cluster-api v1.4.2
23-
sigs.k8s.io/cluster-api/test v1.4.2
22+
sigs.k8s.io/cluster-api v1.4.3
23+
sigs.k8s.io/cluster-api/test v1.4.3
2424
sigs.k8s.io/controller-runtime v0.14.5
2525
)
2626

@@ -41,7 +41,7 @@ require (
4141
github.com/coredns/caddy v1.1.0 // indirect
4242
github.com/coredns/corefile-migration v1.0.20 // indirect
4343
github.com/davecgh/go-spew v1.1.1 // indirect
44-
github.com/docker/distribution v2.8.1+incompatible // indirect
44+
github.com/docker/distribution v2.8.2+incompatible // indirect
4545
github.com/docker/docker v20.10.24+incompatible // indirect
4646
github.com/docker/go-connections v0.4.0 // indirect
4747
github.com/docker/go-units v0.4.0 // indirect
@@ -130,4 +130,4 @@ require (
130130
sigs.k8s.io/yaml v1.3.0 // indirect
131131
)
132132

133-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.2
133+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.3

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
107107
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
108108
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
109109
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
110-
github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
111-
github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
110+
github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
111+
github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
112112
github.com/docker/docker v20.10.24+incompatible h1:Ugvxm7a8+Gz6vqQYQQ2W7GYq5EUPaAiuPgIfVyI3dYE=
113113
github.com/docker/docker v20.10.24+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
114114
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
@@ -909,10 +909,10 @@ k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt
909909
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
910910
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
911911
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
912-
sigs.k8s.io/cluster-api v1.4.2 h1:hdIz0Ms2j7YaU1qBK5yF2R8ii0GcGb3jQ7EO6i3tAN8=
913-
sigs.k8s.io/cluster-api v1.4.2/go.mod h1:IIebZTsqyXU8CHbINV2zuMh0/wykqdr+vEXxQNeteEU=
914-
sigs.k8s.io/cluster-api/test v1.4.2 h1:uHFtn0SFOFOxIbdahLoYo4kz84yLqCmhbVLV4vsk1gQ=
915-
sigs.k8s.io/cluster-api/test v1.4.2/go.mod h1:/64ycj3YFMW1BGVtCtfwmlVAXGN0DFTZEkIClh68Svo=
912+
sigs.k8s.io/cluster-api v1.4.3 h1:QSeKr3qnWPtVp+EMQZQduKoi5WDwUhAtBRreEukkcy0=
913+
sigs.k8s.io/cluster-api v1.4.3/go.mod h1:/SeFds4NXJ+Gp2etqHyoNuO6yoxTfVq6Zmd2OGxd/qM=
914+
sigs.k8s.io/cluster-api/test v1.4.3 h1:xXhvOLp5zBKn2Yf4PQckFwxGxFrKgkgUI74ikU5Jh/c=
915+
sigs.k8s.io/cluster-api/test v1.4.3/go.mod h1:xGTJsJkbXMNmumhErEAH/e7GmnE2sGfm/rcOzJZSdbw=
916916
sigs.k8s.io/controller-runtime v0.14.5 h1:6xaWFqzT5KuAQ9ufgUaj1G/+C4Y1GRkhrxl+BJ9i+5s=
917917
sigs.k8s.io/controller-runtime v0.14.5/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
918918
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=

templates/cluster-template-alternative-region.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ spec:
104104
ssh_authorized_keys: "${OCI_SSH_KEY}"
105105
isPvEncryptionInTransitEnabled: ${OCI_NODE_PV_TRANSIT_ENCRYPTION=true}
106106
---
107-
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha4
107+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
108108
kind: KubeadmConfigTemplate
109109
metadata:
110110
name: "${CLUSTER_NAME}-md-0"

templates/cluster-template-antrea.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ spec:
318318
ssh_authorized_keys: "${OCI_SSH_KEY}"
319319
isPvEncryptionInTransitEnabled: ${OCI_NODE_PV_TRANSIT_ENCRYPTION=true}
320320
---
321-
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha4
321+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
322322
kind: KubeadmConfigTemplate
323323
metadata:
324324
name: "${CLUSTER_NAME}-md-0"

templates/cluster-template-arm-free-tier.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ spec:
129129
ssh_authorized_keys: "${OCI_SSH_KEY}"
130130
IsPvEncryptionInTransitEnabled: ${OCI_NODE_PV_TRANSIT_ENCRYPTION=true}
131131
---
132-
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha4
132+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
133133
kind: KubeadmConfigTemplate
134134
metadata:
135135
name: "${CLUSTER_NAME}-md-0"

templates/cluster-template-failure-domain-spread.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ spec:
103103
ssh_authorized_keys: "${OCI_SSH_KEY}"
104104
isPvEncryptionInTransitEnabled: ${OCI_NODE_PV_TRANSIT_ENCRYPTION=true}
105105
---
106-
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha4
106+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
107107
kind: KubeadmConfigTemplate
108108
metadata:
109109
name: "${CLUSTER_NAME}-md"

templates/cluster-template-healthcheck.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ spec:
110110
ssh_authorized_keys: "${OCI_SSH_KEY}"
111111
isPvEncryptionInTransitEnabled: ${OCI_NODE_PV_TRANSIT_ENCRYPTION=true}
112112
---
113-
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha4
113+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
114114
kind: KubeadmConfigTemplate
115115
metadata:
116116
name: "${CLUSTER_NAME}-md-0"

templates/cluster-template-local-vcn-peering.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ spec:
416416
ssh_authorized_keys: "${OCI_SSH_KEY}"
417417
isPvEncryptionInTransitEnabled: ${OCI_PV_TRANSIT_ENCRYPTION=true}
418418
---
419-
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha4
419+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
420420
kind: KubeadmConfigTemplate
421421
metadata:
422422
name: "${CLUSTER_NAME}-md-0"

templates/cluster-template-machinepool.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ spec:
130130
# placementDetails:
131131
# - availabilityDomain: 1
132132
---
133-
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha4
133+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
134134
kind: KubeadmConfig
135135
metadata:
136136
name: "${CLUSTER_NAME}-mp-0"

templates/cluster-template-oci-addons.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ spec:
103103
ssh_authorized_keys: "${OCI_SSH_KEY}"
104104
isPvEncryptionInTransitEnabled: ${OCI_NODE_PV_TRANSIT_ENCRYPTION=true}
105105
---
106-
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha4
106+
apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
107107
kind: KubeadmConfigTemplate
108108
metadata:
109109
name: "${CLUSTER_NAME}-md-0"

0 commit comments

Comments
 (0)