Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

THREESCALE-11281 - bump to go 1.22 #1045

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

THREESCALE-11281 - bump to go 1.22 #1045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf67c0e
THREESCALE-11281 - bump to go 1.22
valerymo Dec 17, 2024
4767ff3
THREESCALE-11281 - go 1.22 - controller-gen v0.14.0
valerymo Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ commands:
jobs:
install-operator:
docker:
- image: cimg/go:1.20
- image: cimg/go:1.22
working_directory: ~/project/3scale-operator
steps:
- setup_remote_docker:
Expand All @@ -113,7 +113,7 @@ jobs:

build-operator-image-only:
docker:
- image: cimg/go:1.20
- image: cimg/go:1.22
working_directory: ~/project/3scale-operator
steps:
- setup_remote_docker:
Expand Down Expand Up @@ -170,7 +170,7 @@ jobs:

run-unit-tests:
docker:
- image: cimg/go:1.20
- image: cimg/go:1.22
resource_class: large
steps:
- unit-tests
Expand All @@ -180,22 +180,22 @@ jobs:

test-crds:
docker:
- image: cimg/go:1.20
- image: cimg/go:1.22
steps:
- checkout
- install-dependencies
- run: make test-crds

test-manifests-version:
docker:
- image: cimg/go:1.20
- image: cimg/go:1.22
steps:
- checkout
- install-dependencies
- run: make test-manifests-version
license-check:
docker:
- image: cimg/go:1.20
- image: cimg/go:1.22
steps:
- run:
name: Installing ruby
Expand Down Expand Up @@ -223,7 +223,7 @@ jobs:

unit-tests-coverage:
docker:
- image: cimg/go:1.20
- image: cimg/go:1.22
resource_class: large
steps:
- unit-tests
Expand All @@ -235,7 +235,7 @@ jobs:

bundle-validate:
docker:
- image: cimg/go:1.20
- image: cimg/go:1.22
steps:
- checkout
- install-operator-sdk
Expand All @@ -244,15 +244,15 @@ jobs:

assets-validate:
docker:
- image: cimg/go:1.20
- image: cimg/go:1.22
steps:
- checkout
- install-operator-sdk
- run: make assets-update-test

prometheusrules-validate:
docker:
- image: cimg/go:1.20
- image: cimg/go:1.22
steps:
- checkout
- run: make prometheusrules-update-test
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.20.14 as builder
FROM golang:1.22.0 as builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ run: generate fmt vet manifests
# download controller-gen if necessary
CONTROLLER_GEN=$(PROJECT_PATH)/bin/controller-gen
$(CONTROLLER_GEN):
$(call go-bin-install,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.2)
$(call go-bin-install,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0)

.PHONY: controller-gen
controller-gen: $(CONTROLLER_GEN)
Expand Down
1 change: 0 additions & 1 deletion apis/apps/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion apis/capabilities/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion apis/capabilities/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 32 additions & 9 deletions bundle/manifests/apps.3scale.net_apimanagerbackups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.2
controller-gen.kubebuilder.io/version: v0.14.0
creationTimestamp: null
labels:
app: 3scale-api-management
Expand All @@ -22,10 +22,19 @@ spec:
description: APIManagerBackup represents an APIManager backup
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand All @@ -39,23 +48,32 @@ spec:
description: PersistentVolumeClaim as backup data destination configuration
properties:
resources:
description: Resources configuration for the backup data PersistentVolumeClaim. Ignored when VolumeName field is set
description: |-
Resources configuration for the backup data PersistentVolumeClaim.
Ignored when VolumeName field is set
properties:
requests:
anyOf:
- type: integer
- type: string
description: 'Storage Resource requests to be used on the PersistentVolumeClaim. To learn more about resource requests see: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
description: |-
Storage Resource requests to be used on the PersistentVolumeClaim.
To learn more about resource requests see:
https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
required:
- requests
type: object
storageClass:
description: Storage class to be used by the PersistentVolumeClaim. Ignored when VolumeName field is set
description: |-
Storage class to be used by the PersistentVolumeClaim. Ignored
when VolumeName field is set
type: string
volumeName:
description: Name of an existing PersistentVolume to be bound to the backup data PersistentVolumeClaim
description: |-
Name of an existing PersistentVolume to be bound to the
backup data PersistentVolumeClaim
type: string
type: object
type: object
Expand All @@ -69,7 +87,9 @@ spec:
description: Name of the APIManager from which the backup has been performed
type: string
backupPersistentVolumeClaimName:
description: Name of the backup data PersistentVolumeClaim. Only set when PersistentVolumeClaim is used as the backup data destination
description: |-
Name of the backup data PersistentVolumeClaim. Only set when
PersistentVolumeClaim is used as the backup data destination
type: string
completed:
description: Set to true when backup has been completed
Expand All @@ -79,7 +99,10 @@ spec:
format: date-time
type: string
mainStepsCompleted:
description: Set to true when main steps have been completed. At this point backup still cannot be considered fully completed due to some remaining post-backup tasks are pending (cleanup, ...)
description: |-
Set to true when main steps have been completed. At this point
backup still cannot be considered fully completed due to some remaining
post-backup tasks are pending (cleanup, ...)
type: boolean
startTime:
description: Backup start time. It is represented in RFC3339 form and is in UTC.
Expand Down
42 changes: 33 additions & 9 deletions bundle/manifests/apps.3scale.net_apimanagerrestores.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.2
controller-gen.kubebuilder.io/version: v0.14.0
creationTimestamp: null
labels:
app: 3scale-api-management
Expand All @@ -22,30 +22,48 @@ spec:
description: APIManagerRestore represents an APIManager restore
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
spec:
description: APIManagerRestoreSpec defines the desired state of APIManagerRestore
properties:
restoreSource:
description: APIManagerRestoreSource defines the backup data restore source configurability. It is a union type. Only one of the fields can be set
description: |-
APIManagerRestoreSource defines the backup data restore source
configurability. It is a union type. Only one of the fields can be
set
properties:
persistentVolumeClaim:
description: Restore data soure configuration
properties:
claimSource:
description: PersistentVolumeClaim source of an existing PersistentVolumeClaim. See
description: |-
PersistentVolumeClaim source of an existing PersistentVolumeClaim.
See
properties:
claimName:
description: 'claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims'
description: |-
claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume.
More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
type: string
readOnly:
description: readOnly Will force the ReadOnly setting in VolumeMounts. Default false.
description: |-
readOnly Will force the ReadOnly setting in VolumeMounts.
Default false.
type: boolean
required:
- claimName
Expand All @@ -64,7 +82,10 @@ spec:
description: Name of the APIManager to be restored
properties:
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
description: |-
Name of the referent.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?
type: string
type: object
x-kubernetes-map-type: atomic
Expand All @@ -76,7 +97,10 @@ spec:
format: date-time
type: string
mainStepsCompleted:
description: Set to true when main steps have been completed. At this point restore still cannot be considered fully completed due to some remaining post-backup tasks are pending (cleanup, ...)
description: |-
Set to true when main steps have been completed. At this point
restore still cannot be considered fully completed due to some remaining
post-backup tasks are pending (cleanup, ...)
type: boolean
startTime:
description: Restore start time. It is represented in RFC3339 form and is in UTC.
Expand Down
Loading