Merge pull request #95 from Kuadrant/go-1.20

go 1.20; controller-runtime v0.14.6

.github/workflows/build-images-base.yaml

@@ -76,10 +76,10 @@ jobs:
  name: Build Bundle
  runs-on: ubuntu-latest
  steps:
- - name: Set up Go 1.19.x
+ - name: Set up Go 1.20.x
  uses: actions/setup-go@v4
  with:
- go-version: 1.19.x
+ go-version: 1.20.x
  id: go
  - name: Check out code
  uses: actions/checkout@v3
@@ -119,10 +119,10 @@ jobs:
  needs: [build, build-bundle]
  runs-on: ubuntu-latest
  steps:
- - name: Set up Go 1.19.x
+ - name: Set up Go 1.20.x
  uses: actions/setup-go@v4
  with:
- go-version: 1.19.x
+ go-version: 1.20.x
  id: go
  - name: Check out code
  uses: actions/checkout@v3

.github/workflows/test.yaml

@@ -13,10 +13,10 @@ jobs:
  name: Test
  runs-on: ubuntu-latest
  steps:
- - name: Set up Go 1.19.x
+ - name: Set up Go 1.20.x
  uses: actions/setup-go@v4
  with:
- go-version: 1.19.x
+ go-version: 1.20.x
  id: go
  - uses: actions/checkout@v3
  - name: Run the tests
@@ -32,10 +32,10 @@ jobs:
  name: Verify manifests
  runs-on: ubuntu-latest
  steps:
- - name: Set up Go 1.19.x
+ - name: Set up Go 1.20.x
  uses: actions/setup-go@v4
  with:
- go-version: 1.19.x
+ go-version: 1.20.x
  id: go
  - uses: actions/checkout@v3
  - name: Verify manifests
@@ -44,10 +44,10 @@ jobs:
  name: Verify bundle
  runs-on: ubuntu-latest
  steps:
- - name: Set up Go 1.19.x
+ - name: Set up Go 1.20.x
  uses: actions/setup-go@v4
  with:
- go-version: 1.19.x
+ go-version: 1.20.x
  id: go
  - name: Check out code
  uses: actions/checkout@v3
@@ -58,24 +58,41 @@ jobs:
  name: Verify fmt
  runs-on: ubuntu-latest
  steps:
- - name: Set up Go 1.19.x
+ - name: Set up Go 1.20.x
  uses: actions/setup-go@v4
  with:
- go-version: 1.19.x
+ go-version: 1.20.x
  id: go
  - name: Check out code
  uses: actions/checkout@v3
  - name: Run make verify-fmt
  run: |
  make verify-fmt
+ verify-tidy:
+ name: Verify tidy
+ runs-on: ubuntu-latest
+ steps:
+ - name: Set up Go 1.20.x
+ uses: actions/setup-go@v4
+ with:
+ go-version: 1.20.x
+ id: go
+ - name: Check out code
+ uses: actions/checkout@v3
+ - name: Run go mod tidy
+ run: |
+ go mod tidy
+ - name: Run make verify-tidy
+ run: |
+ make verify-tidy
  lint:
  name: Lint
  runs-on: ubuntu-latest
  steps:
- - name: Set up Go 1.19.x
+ - name: Set up Go 1.20.x
  uses: actions/setup-go@v4
  with:
- go-version: 1.19.x
+ go-version: 1.20.x
  id: go
  - name: Check out code
  uses: actions/checkout@v3

.gitignore

@@ -6,6 +6,7 @@
 *.so
 *.dylib
 bin
+limitador-operator
 
 # Test binary, build with `go test -c`
 *.test
@@ -30,4 +31,4 @@ testbin
 /catalog/limitador-operator-catalog.Dockerfile
 
 # Vendor dependencies
-vendor
+vendor

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.19 as builder
+FROM golang:1.20 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

Makefile

@@ -104,7 +104,7 @@ all: build
 ##@ Tools
 
 OPERATOR_SDK = $(PROJECT_PATH)/bin/operator-sdk
-OPERATOR_SDK_VERSION = v1.22.0
+OPERATOR_SDK_VERSION = v1.28.1
 $(OPERATOR_SDK):
  ./utils/install-operator-sdk.sh $(OPERATOR_SDK) $(OPERATOR_SDK_VERSION)
 
@@ -163,7 +163,7 @@ act: $(ACT) ## Download act locally if necessary.
 
 GOLANGCI-LINT = $(PROJECT_PATH)/bin/golangci-lint
 $(GOLANGCI-LINT):
- curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(PROJECT_PATH)/bin v1.50.1
+ curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(PROJECT_PATH)/bin v1.54.2
 
 .PHONY: golangci-lint
 golangci-lint: $(GOLANGCI-LINT) ## Download golangci-lint locally if necessary.
@@ -278,6 +278,18 @@ bundle: $(OPM) $(YQ) manifests kustomize operator-sdk ## Generate bundle manifes
  $(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle -q --overwrite --version $(BUNDLE_VERSION) $(BUNDLE_METADATA_OPTS)
  # Validate bundle manifests
  $(OPERATOR_SDK) bundle validate ./bundle
+ $(MAKE) bundle-ignore-createdAt
+
+.PHONY: bundle-ignore-createdAt
+bundle-ignore-createdAt:
+ # Since operator-sdk 1.26.0, `make bundle` changes the `createdAt` field from the bundle
+ # even if it is patched:
+ # https://github.com/operator-framework/operator-sdk/pull/6136
+ # This code checks if only the createdAt field. If is the only change, it is ignored.
+ # Else, it will do nothing.
+ # https://github.com/operator-framework/operator-sdk/issues/6285#issuecomment-1415350333
+ # https://github.com/operator-framework/operator-sdk/issues/6285#issuecomment-1532150678
+ git diff --quiet -I'^ createdAt: ' ./bundle && git checkout ./bundle || true
 
 .PHONY: bundle-build
 bundle-build: ## Build the bundle image.

bundle.Dockerfile

@@ -6,7 +6,7 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=limitador-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=alpha
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.22.0
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.28.1
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 

bundle/manifests/limitador-operator.clusterserviceversion.yaml

@@ -36,7 +36,8 @@ metadata:
  capabilities: Basic Install
  categories: Integration & Delivery
  containerImage: quay.io/kuadrant/limitador-operator:latest
- operators.operatorframework.io/builder: operator-sdk-v1.22.0
+ createdAt: "2023-09-01T15:47:50Z"
+ operators.operatorframework.io/builder: operator-sdk-v1.28.1
  operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
  repository: https://github.com/Kuadrant/limitador-operator
  support: kuadrant

bundle/manifests/limitador.kuadrant.io_limitadors.yaml

@@ -109,6 +109,26 @@ spec:
  resourceRequirements:
  description: ResourceRequirements describes the compute resource requirements.
  properties:
+ claims:
+ description: "Claims lists the names of resources, defined in
+ spec.resourceClaims, that are used by this container. \n This
+ is an alpha field and requires enabling the DynamicResourceAllocation
+ feature gate. \n This field is immutable."
+ items:
+ description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+ properties:
+ name:
+ description: Name must match the name of one entry in pod.spec.resourceClaims
+ of the Pod where this field is used. It makes that resource
+ available inside a container.
+ type: string
+ required:
+ - name
+ type: object
+ type: array
+ x-kubernetes-list-map-keys:
+ - name
+ x-kubernetes-list-type: map
  limits:
  additionalProperties:
  anyOf:
@@ -139,32 +159,33 @@ spec:
  redis:
  properties:
  configSecretRef:
- description: 'ObjectReference contains enough information
+ description: "ObjectReference contains enough information
  to let you inspect or modify the referred object. --- New
  uses of this type are discouraged because of difficulty
- describing its usage when embedded in APIs. 1. Ignored fields. It
- includes many fields which are not generally honored. For
- instance, ResourceVersion and FieldPath are both very rarely
- valid in actual usage. 2. Invalid usage help. It is impossible
- to add specific help for individual usage. In most embedded
- usages, there are particular restrictions like, "must refer
- only to types A and B" or "UID not honored" or "name must
- be restricted". Those cannot be well described when embedded.
- 3. Inconsistent validation. Because the usages are different,
- the validation rules are different by usage, which makes
- it hard for users to predict what will happen. 4. The fields
- are both imprecise and overly precise. Kind is not a precise
- mapping to a URL. This can produce ambiguity during interpretation
- and require a REST mapping. In most cases, the dependency
- is on the group,resource tuple and the version of the actual
+ describing its usage when embedded in APIs. 1. Ignored fields.
+ \ It includes many fields which are not generally honored.
+ \ For instance, ResourceVersion and FieldPath are both very
+ rarely valid in actual usage. 2. Invalid usage help. It
+ is impossible to add specific help for individual usage.
+ \ In most embedded usages, there are particular restrictions
+ like, \"must refer only to types A and B\" or \"UID not
+ honored\" or \"name must be restricted\". Those cannot be
+ well described when embedded. 3. Inconsistent validation.
+ \ Because the usages are different, the validation rules
+ are different by usage, which makes it hard for users to
+ predict what will happen. 4. The fields are both imprecise
+ and overly precise. Kind is not a precise mapping to a
+ URL. This can produce ambiguity during interpretation and
+ require a REST mapping. In most cases, the dependency is
+ on the group,resource tuple and the version of the actual
  struct is irrelevant. 5. We cannot easily change it. Because
  this type is embedded in many locations, updates to this
- type will affect numerous schemas. Don''t make new APIs
- embed an underspecified API type they do not control. Instead
- of using this type, create a locally provided and used type
- that is well-focused on your reference. For example, ServiceReferences
- for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
- .'
+ type will affect numerous schemas. Don't make new APIs
+ embed an underspecified API type they do not control. \n
+ Instead of using this type, create a locally provided and
+ used type that is well-focused on your reference. For example,
+ ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+ ."
  properties:
  apiVersion:
  description: API version of the referent.
@@ -205,32 +226,33 @@ spec:
  redis-cached:
  properties:
  configSecretRef:
- description: 'ObjectReference contains enough information
+ description: "ObjectReference contains enough information
  to let you inspect or modify the referred object. --- New
  uses of this type are discouraged because of difficulty
- describing its usage when embedded in APIs. 1. Ignored fields. It
- includes many fields which are not generally honored. For
- instance, ResourceVersion and FieldPath are both very rarely
- valid in actual usage. 2. Invalid usage help. It is impossible
- to add specific help for individual usage. In most embedded
- usages, there are particular restrictions like, "must refer
- only to types A and B" or "UID not honored" or "name must
- be restricted". Those cannot be well described when embedded.
- 3. Inconsistent validation. Because the usages are different,
- the validation rules are different by usage, which makes
- it hard for users to predict what will happen. 4. The fields
- are both imprecise and overly precise. Kind is not a precise
- mapping to a URL. This can produce ambiguity during interpretation
- and require a REST mapping. In most cases, the dependency
- is on the group,resource tuple and the version of the actual
+ describing its usage when embedded in APIs. 1. Ignored fields.
+ \ It includes many fields which are not generally honored.
+ \ For instance, ResourceVersion and FieldPath are both very
+ rarely valid in actual usage. 2. Invalid usage help. It
+ is impossible to add specific help for individual usage.
+ \ In most embedded usages, there are particular restrictions
+ like, \"must refer only to types A and B\" or \"UID not
+ honored\" or \"name must be restricted\". Those cannot be
+ well described when embedded. 3. Inconsistent validation.
+ \ Because the usages are different, the validation rules
+ are different by usage, which makes it hard for users to
+ predict what will happen. 4. The fields are both imprecise
+ and overly precise. Kind is not a precise mapping to a
+ URL. This can produce ambiguity during interpretation and
+ require a REST mapping. In most cases, the dependency is
+ on the group,resource tuple and the version of the actual
  struct is irrelevant. 5. We cannot easily change it. Because
  this type is embedded in many locations, updates to this
- type will affect numerous schemas. Don''t make new APIs
- embed an underspecified API type they do not control. Instead
- of using this type, create a locally provided and used type
- that is well-focused on your reference. For example, ServiceReferences
- for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
- .'
+ type will affect numerous schemas. Don't make new APIs
+ embed an underspecified API type they do not control. \n
+ Instead of using this type, create a locally provided and
+ used type that is well-focused on your reference. For example,
+ ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
+ ."
  properties:
  apiVersion:
  description: API version of the referent.
@@ -301,8 +323,8 @@ spec:
  description: "Condition contains details for one aspect of the current
  state of this API Resource. --- This struct is intended for direct
  use as an array at the field path .status.conditions. For example,
- type FooStatus struct{ // Represents the observations of a foo's
- current state. // Known .status.conditions.type are: \"Available\",
+ \n type FooStatus struct{ // Represents the observations of a
+ foo's current state. // Known .status.conditions.type are: \"Available\",
  \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
  // +listType=map // +listMapKey=type Conditions []metav1.Condition
  `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"

bundle/metadata/annotations.yaml

@@ -5,7 +5,7 @@ annotations:
  operators.operatorframework.io.bundle.metadata.v1: metadata/
  operators.operatorframework.io.bundle.package.v1: limitador-operator
  operators.operatorframework.io.bundle.channels.v1: alpha
- operators.operatorframework.io.metrics.builder: operator-sdk-v1.22.0
+ operators.operatorframework.io.metrics.builder: operator-sdk-v1.28.1
  operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
  operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3