Skip to content

Commit d81b448

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #349 from shiftstack/merge-bot-main
Merge https://github.com/kubernetes-sigs/cluster-api-provider-openstack:release-0.11 into main
2 parents ed87205 + 91869b8 commit d81b448

File tree

725 files changed

+46903
-12373
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

725 files changed

+46903
-12373
lines changed

‎.github/workflows/pr-dependabot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
id: vars
2525
run: echo "go_version=$(make go-version)" >> $GITHUB_OUTPUT
2626
- name: Set up Go
27-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # tag=v5.1.0
27+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # tag=v5.2.0
2828
with:
2929
go-version: ${{ steps.vars.outputs.go_version }}
3030
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # tag=v4.2.0

‎.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Calculate go version
2424
run: echo "go_version=$(make go-version)" >> $GITHUB_ENV
2525
- name: Set up Go
26-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # tag=v5.1.0
26+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # tag=v5.2.0
2727
with:
2828
go-version: ${{ env.go_version }}
2929
- name: generate release artifacts
@@ -37,7 +37,7 @@ jobs:
3737
env:
3838
GH_TOKEN: ${{ github.token }}
3939
- name: Release
40-
uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # tag=v2.1.0
40+
uses: softprops/action-gh-release@c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda # tag=v2.2.1
4141
with:
4242
draft: true
4343
files: out/*

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,9 @@ e2e-image: docker-build
209209

210210
# Pull all the images references in test/e2e/data/e2e_conf.yaml
211211
test-e2e-image-prerequisites:
212-
docker pull registry.k8s.io/cluster-api/cluster-api-controller:v1.8.6
213-
docker pull registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.6
214-
docker pull registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.6
212+
docker pull registry.k8s.io/cluster-api/cluster-api-controller:v1.8.8
213+
docker pull registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.8
214+
docker pull registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.8
215215

216216
CONFORMANCE_E2E_ARGS ?= -kubetest.config-file=$(KUBETEST_CONF_PATH)
217217
CONFORMANCE_E2E_ARGS += $(E2E_ARGS)

‎OWNERS_ALIASES

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ aliases:
2020
- vincepri
2121
cluster-api-openstack-maintainers:
2222
- emilienm
23-
- jichenjc
2423
- lentzi90
2524
- mdbooth
2625
cluster-api-openstack-reviewers:
26+
cluster-api-openstack-emeritus-maintainers:
27+
- jichenjc

‎cloudbuild-nightly.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ options:
44
substitution_option: ALLOW_LOOSE
55
machineType: 'N1_HIGHCPU_8'
66
steps:
7-
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20220609-2e4c91eb7e'
7+
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20241229-5dc092c636'
88
entrypoint: make
99
env:
1010
- DOCKER_CLI_EXPERIMENTAL=enabled

‎cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ options:
44
substitution_option: ALLOW_LOOSE
55
machineType: 'N1_HIGHCPU_8'
66
steps:
7-
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20220609-2e4c91eb7e'
7+
- name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20241229-5dc092c636'
88
entrypoint: make
99
env:
1010
- DOCKER_CLI_EXPERIMENTAL=enabled

‎controllers/openstackcluster_controller.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -627,11 +627,15 @@ func resolveLoadBalancerNetwork(openStackCluster *infrav1.OpenStackCluster, netw
627627
for _, s := range lbSpec.Subnets {
628628
matchFound := false
629629
for _, subnetID := range lbNet.Subnets {
630-
if s.ID != nil && subnetID == *s.ID {
630+
subnet, err := networkingService.GetSubnetByParam(&s)
631+
if s.ID != nil && subnetID == *s.ID && err == nil {
631632
matchFound = true
632633
lbNetStatus.Subnets = append(
633634
lbNetStatus.Subnets, infrav1.Subnet{
634-
ID: *s.ID,
635+
ID: subnet.ID,
636+
Name: subnet.Name,
637+
CIDR: subnet.CIDR,
638+
Tags: subnet.Tags,
635639
})
636640
}
637641
}
@@ -640,6 +644,8 @@ func resolveLoadBalancerNetwork(openStackCluster *infrav1.OpenStackCluster, netw
640644
return fmt.Errorf("no subnet match was found in the specified network (specified subnet: %v, available subnets: %v)", s, lbNet.Subnets)
641645
}
642646
}
647+
648+
openStackCluster.Status.APIServerLoadBalancer.LoadBalancerNetwork = lbNetStatus
643649
}
644650
}
645651

‎controllers/openstackserver_controller.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -602,6 +602,7 @@ func (r *OpenStackServerReconciler) getOrCreateIPAddressClaimForFloatingAddress(
602602
},
603603
},
604604
Finalizers: []string{infrav1.IPClaimMachineFinalizer},
605+
Labels: map[string]string{},
605606
},
606607
Spec: ipamv1.IPAddressClaimSpec{
607608
PoolRef: *poolRef,

‎go.mod

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,29 @@ require (
88
github.com/google/go-cmp v0.6.0
99
github.com/google/gofuzz v1.2.0
1010
github.com/google/uuid v1.6.0
11-
github.com/gophercloud/gophercloud/v2 v2.3.0
11+
github.com/gophercloud/gophercloud/v2 v2.4.0
1212
github.com/gophercloud/utils/v2 v2.0.0-20240812072210-8ce1fc0f2894
1313
github.com/hashicorp/go-version v1.7.0
1414
github.com/k-orc/openstack-resource-controller v0.0.0-00010101000000-000000000000
15-
github.com/onsi/ginkgo/v2 v2.22.0
16-
github.com/onsi/gomega v1.36.0
15+
github.com/onsi/ginkgo/v2 v2.22.2
16+
github.com/onsi/gomega v1.36.2
1717
github.com/prometheus/client_golang v1.20.5
1818
github.com/spf13/pflag v1.0.5
1919
github.com/ulikunitz/xz v0.5.12
2020
go.uber.org/mock v0.5.0
21-
golang.org/x/crypto v0.30.0
21+
golang.org/x/crypto v0.32.0
2222
golang.org/x/text v0.21.0
2323
gopkg.in/ini.v1 v1.67.0
24-
k8s.io/api v0.30.7
25-
k8s.io/apiextensions-apiserver v0.30.7
26-
k8s.io/apimachinery v0.30.7
27-
k8s.io/client-go v0.30.7
28-
k8s.io/component-base v0.30.7
24+
k8s.io/api v0.30.8
25+
k8s.io/apiextensions-apiserver v0.30.8
26+
k8s.io/apimachinery v0.30.8
27+
k8s.io/client-go v0.30.8
28+
k8s.io/component-base v0.30.8
2929
k8s.io/klog/v2 v2.130.1
3030
k8s.io/utils v0.0.0-20231127182322-b307cd553661
31-
sigs.k8s.io/cluster-api v1.8.6
32-
sigs.k8s.io/cluster-api/test v1.8.6
33-
sigs.k8s.io/controller-runtime v0.18.6
31+
sigs.k8s.io/cluster-api v1.8.8
32+
sigs.k8s.io/cluster-api/test v1.8.8
33+
sigs.k8s.io/controller-runtime v0.18.7
3434
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
3535
sigs.k8s.io/yaml v1.4.0
3636
)
@@ -78,7 +78,7 @@ require (
7878
github.com/google/gnostic-models v0.6.8 // indirect
7979
github.com/google/go-github/v53 v53.2.0 // indirect
8080
github.com/google/go-querystring v1.1.0 // indirect
81-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
81+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
8282
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
8383
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
8484
github.com/hashicorp/hcl v1.0.0 // indirect
@@ -89,7 +89,7 @@ require (
8989
github.com/json-iterator/go v1.1.12 // indirect
9090
github.com/klauspost/compress v1.17.9 // indirect
9191
github.com/kylelemons/godebug v1.1.0 // indirect
92-
github.com/magiconair/properties v1.8.7 // indirect
92+
github.com/magiconair/properties v1.8.8 // indirect
9393
github.com/mailru/easyjson v0.7.7 // indirect
9494
github.com/mattn/go-isatty v0.0.20 // indirect
9595
github.com/mitchellh/copystructure v1.2.0 // indirect
@@ -130,22 +130,22 @@ require (
130130
go.uber.org/multierr v1.11.0 // indirect
131131
go.uber.org/zap v1.27.0 // indirect
132132
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
133-
golang.org/x/net v0.30.0 // indirect
133+
golang.org/x/net v0.33.0 // indirect
134134
golang.org/x/oauth2 v0.21.0 // indirect
135135
golang.org/x/sync v0.10.0 // indirect
136-
golang.org/x/sys v0.28.0 // indirect
137-
golang.org/x/term v0.27.0 // indirect
136+
golang.org/x/sys v0.29.0 // indirect
137+
golang.org/x/term v0.28.0 // indirect
138138
golang.org/x/time v0.5.0 // indirect
139-
golang.org/x/tools v0.26.0 // indirect
139+
golang.org/x/tools v0.28.0 // indirect
140140
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
141141
google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect
142142
google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect
143143
google.golang.org/grpc v1.62.2 // indirect
144-
google.golang.org/protobuf v1.35.1 // indirect
144+
google.golang.org/protobuf v1.36.1 // indirect
145145
gopkg.in/inf.v0 v0.9.1 // indirect
146146
gopkg.in/yaml.v2 v2.4.0 // indirect
147147
gopkg.in/yaml.v3 v3.0.1 // indirect
148-
k8s.io/apiserver v0.30.7 // indirect
148+
k8s.io/apiserver v0.30.8 // indirect
149149
k8s.io/cluster-bootstrap v0.30.3 // indirect
150150
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
151151
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0 // indirect

0 commit comments

Comments
 (0)