Skip to content

Commit b19cd99

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #625 from stuggi/golang_1.21
bump to golang 1.21 and k8s to 1.29
2 parents 5c1abf5 + ff76863 commit b19cd99

16 files changed

+237
-109
lines changed

‎.ci-operator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: tools
33
namespace: openstack-k8s-operators
4-
tag: ci-build-root-golang-1.20-sdk-1.31
4+
tag: ci-build-root-golang-1.21-sdk-1.31

‎.github/workflows/build-glance-operator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: openstack-k8s-operators/openstack-k8s-operators-ci/.github/workflows/reusable-build-operator.yaml@main
1616
with:
1717
operator_name: glance
18-
go_version: 1.20.x
18+
go_version: 1.21.x
1919
operator_sdk_version: 1.31.0
2020
secrets:
2121
IMAGENAMESPACE: ${{ secrets.IMAGENAMESPACE }}

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ repos:
5656
entry: bashate --error . --ignore=E006,E040,E011,E020,E012
5757

5858
- repo: https://github.com/golangci/golangci-lint
59-
rev: v1.55.2
59+
rev: v1.59.1
6060
hooks:
6161
- id: golangci-lint-full
6262
args: ["-v"]

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GOLANG_BUILDER=registry.access.redhat.com/ubi9/go-toolset:1.20
1+
ARG GOLANG_BUILDER=registry.access.redhat.com/ubi9/go-toolset:1.21
22
ARG OPERATOR_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:latest
33

44
# Build the manager binary

‎Makefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ OPERATOR_SDK_VERSION ?= v1.31.0
5858
DEFAULT_IMG ?= quay.io/openstack-k8s-operators/glance-operator:latest
5959
IMG ?= $(DEFAULT_IMG)
6060
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
61-
ENVTEST_K8S_VERSION = 1.28.0
61+
ENVTEST_K8S_VERSION = 1.29
6262
GINKGO ?= $(LOCALBIN)/ginkgo
6363

6464
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
@@ -228,6 +228,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
228228
## Tool Versions
229229
KUSTOMIZE_VERSION ?= v3.8.7
230230
CONTROLLER_TOOLS_VERSION ?= v0.11.1
231+
GOTOOLCHAIN_VERSION ?= go1.21.0
231232

232233
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
233234
.PHONY: kustomize
@@ -363,7 +364,7 @@ golint: get-ci-tools
363364

364365
.PHONY: gowork
365366
gowork: ## Generate go.work file to support our multi module repository
366-
test -f go.work || go work init
367+
test -f go.work || GOTOOLCHAIN=$(GOTOOLCHAIN_VERSION) go work init
367368
go work use .
368369
go work use ./api
369370
go work sync

‎api/bases/glance.openstack.org_glanceapis.yaml‎

Lines changed: 39 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -326,18 +326,6 @@ spec:
326326
type: object
327327
resources:
328328
properties:
329-
claims:
330-
items:
331-
properties:
332-
name:
333-
type: string
334-
required:
335-
- name
336-
type: object
337-
type: array
338-
x-kubernetes-list-map-keys:
339-
- name
340-
x-kubernetes-list-type: map
341329
limits:
342330
additionalProperties:
343331
anyOf:
@@ -381,6 +369,8 @@ spec:
381369
x-kubernetes-map-type: atomic
382370
storageClassName:
383371
type: string
372+
volumeAttributesClassName:
373+
type: string
384374
volumeMode:
385375
type: string
386376
volumeName:
@@ -569,6 +559,43 @@ spec:
569559
sources:
570560
items:
571561
properties:
562+
clusterTrustBundle:
563+
properties:
564+
labelSelector:
565+
properties:
566+
matchExpressions:
567+
items:
568+
properties:
569+
key:
570+
type: string
571+
operator:
572+
type: string
573+
values:
574+
items:
575+
type: string
576+
type: array
577+
required:
578+
- key
579+
- operator
580+
type: object
581+
type: array
582+
matchLabels:
583+
additionalProperties:
584+
type: string
585+
type: object
586+
type: object
587+
x-kubernetes-map-type: atomic
588+
name:
589+
type: string
590+
optional:
591+
type: boolean
592+
path:
593+
type: string
594+
signerName:
595+
type: string
596+
required:
597+
- path
598+
type: object
572599
configMap:
573600
properties:
574601
items:

‎api/bases/glance.openstack.org_glances.yaml‎

Lines changed: 39 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -325,18 +325,6 @@ spec:
325325
type: object
326326
resources:
327327
properties:
328-
claims:
329-
items:
330-
properties:
331-
name:
332-
type: string
333-
required:
334-
- name
335-
type: object
336-
type: array
337-
x-kubernetes-list-map-keys:
338-
- name
339-
x-kubernetes-list-type: map
340328
limits:
341329
additionalProperties:
342330
anyOf:
@@ -380,6 +368,8 @@ spec:
380368
x-kubernetes-map-type: atomic
381369
storageClassName:
382370
type: string
371+
volumeAttributesClassName:
372+
type: string
383373
volumeMode:
384374
type: string
385375
volumeName:
@@ -568,6 +558,43 @@ spec:
568558
sources:
569559
items:
570560
properties:
561+
clusterTrustBundle:
562+
properties:
563+
labelSelector:
564+
properties:
565+
matchExpressions:
566+
items:
567+
properties:
568+
key:
569+
type: string
570+
operator:
571+
type: string
572+
values:
573+
items:
574+
type: string
575+
type: array
576+
required:
577+
- key
578+
- operator
579+
type: object
580+
type: array
581+
matchLabels:
582+
additionalProperties:
583+
type: string
584+
type: object
585+
type: object
586+
x-kubernetes-map-type: atomic
587+
name:
588+
type: string
589+
optional:
590+
type: boolean
591+
path:
592+
type: string
593+
signerName:
594+
type: string
595+
required:
596+
- path
597+
type: object
571598
configMap:
572599
properties:
573600
items:

‎api/go.mod‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module github.com/openstack-k8s-operators/glance-operator/api
22

3-
go 1.20
3+
go 1.21
44

55
require (
66
github.com/google/go-cmp v0.6.0
77
github.com/openstack-k8s-operators/lib-common/modules/common v0.4.1-0.20240905123813-174296c09ec6
88
github.com/openstack-k8s-operators/lib-common/modules/storage v0.4.1-0.20240905123813-174296c09ec6
9-
k8s.io/api v0.28.13
10-
k8s.io/apimachinery v0.28.13
11-
sigs.k8s.io/controller-runtime v0.16.6
9+
k8s.io/api v0.29.9
10+
k8s.io/apimachinery v0.29.9
11+
sigs.k8s.io/controller-runtime v0.17.6
1212
)
1313

1414
require (
@@ -19,7 +19,6 @@ require (
1919
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
2020
github.com/fsnotify/fsnotify v1.7.0 // indirect
2121
github.com/go-logr/logr v1.4.2 // indirect
22-
github.com/go-logr/zapr v1.3.0 // indirect
2322
github.com/go-openapi/jsonpointer v0.20.2 // indirect
2423
github.com/go-openapi/jsonreference v0.20.4 // indirect
2524
github.com/go-openapi/swag v0.22.9 // indirect
@@ -43,7 +42,6 @@ require (
4342
github.com/prometheus/common v0.46.0 // indirect
4443
github.com/prometheus/procfs v0.12.0 // indirect
4544
github.com/spf13/pflag v1.0.5 // indirect
46-
go.uber.org/goleak v1.3.0 // indirect
4745
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
4846
golang.org/x/net v0.28.0 // indirect
4947
golang.org/x/oauth2 v0.16.0 // indirect
@@ -57,9 +55,9 @@ require (
5755
gopkg.in/inf.v0 v0.9.1 // indirect
5856
gopkg.in/yaml.v2 v2.4.0 // indirect
5957
gopkg.in/yaml.v3 v3.0.1 // indirect
60-
k8s.io/apiextensions-apiserver v0.28.13 // indirect
61-
k8s.io/client-go v0.28.13 // indirect
62-
k8s.io/component-base v0.28.13 // indirect
58+
k8s.io/apiextensions-apiserver v0.29.2 // indirect
59+
k8s.io/client-go v0.29.9 // indirect
60+
k8s.io/component-base v0.29.2 // indirect
6361
k8s.io/klog/v2 v2.120.1 // indirect
6462
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
6563
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
@@ -68,6 +66,6 @@ require (
6866
sigs.k8s.io/yaml v1.4.0 // indirect
6967
)
7068

71-
// mschuppert: map to latest commit from release-4.13 tag
69+
// mschuppert: map to latest commit from release-4.16 tag
7270
// must consistent within modules and service operators
73-
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 //allow-merging
71+
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094 //allow-merging

0 commit comments

Comments
 (0)