Skip to content

Commit 494f80b

Browse files
authored
Merge pull request #77 from ntnn/bump-runtimes
Bump controller- and multicluster-runtime to v0.23.1
2 parents d3d372d + a115389 commit 494f80b

File tree

21 files changed

+531
-963
lines changed

21 files changed

+531
-963
lines changed

.prow.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ presubmits:
2121
preset-goproxy: "true"
2222
spec:
2323
containers:
24-
- image: ghcr.io/kcp-dev/infra/build:1.24.9-1
24+
- image: ghcr.io/kcp-dev/infra/build:1.25.6-1
2525
command:
2626
- make
2727
- verify
@@ -38,7 +38,7 @@ presubmits:
3838
preset-goproxy: "true"
3939
spec:
4040
containers:
41-
- image: ghcr.io/kcp-dev/infra/build:1.24.9-1
41+
- image: ghcr.io/kcp-dev/infra/build:1.25.6-1
4242
command:
4343
- make
4444
- lint
@@ -55,7 +55,7 @@ presubmits:
5555
preset-goproxy: "true"
5656
spec:
5757
containers:
58-
- image: ghcr.io/kcp-dev/infra/build:1.24.9-1
58+
- image: ghcr.io/kcp-dev/infra/build:1.25.6-1
5959
command:
6060
- make
6161
- test

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ clean-tools:
3737

3838
BOILERPLATE_VERSION ?= 0.3.0
3939
GOLANGCI_LINT_VERSION ?= 2.8.0
40-
KCP_VERSION ?= 0.28.1
40+
KCP_VERSION ?= 0.30.0
4141
WWHRD_VERSION ?= 06b99400ca6db678386ba5dc39bbbdcdadb664ff
4242
YQ_VERSION ?= 4.44.6
4343

apiexport/provider.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ func New(cfg *rest.Config, endpointSliceName string, options Options) (*Provider
122122

123123
GetVWs: func(obj client.Object) ([]string, error) {
124124
ess := obj.(*apisv1alpha1.APIExportEndpointSlice)
125-
var urls []string
126-
for _, endpoint := range ess.Status.APIExportEndpoints {
127-
urls = append(urls, endpoint.URL)
125+
urls := make([]string, len(ess.Status.APIExportEndpoints))
126+
for i, endpoint := range ess.Status.APIExportEndpoints {
127+
urls[i] = endpoint.URL
128128
}
129129
return urls, nil
130130
},

examples/apiexport/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ func main() {
108108
}
109109

110110
log.Info("Reconciling ConfigMap", "name", s.Name, "uuid", s.UID)
111-
recorder := cl.GetEventRecorderFor("kcp-configmap-controller")
112-
recorder.Eventf(s, corev1.EventTypeNormal, "ConfigMap Reconciled", "ConfigMap %s reconciled", s.Name)
111+
recorder := cl.GetEventRecorder("kcp-configmap-controller")
112+
recorder.Eventf(s, nil, corev1.EventTypeNormal, "normal", "ConfigMap Reconciled", "ConfigMap %s reconciled", s.Name)
113113

114114
return reconcile.Result{}, nil
115115
},

examples/logicalclusters/README.md

Lines changed: 0 additions & 73 deletions
This file was deleted.

examples/logicalclusters/go.mod

Lines changed: 0 additions & 89 deletions
This file was deleted.

0 commit comments

Comments
 (0)