Skip to content

Commit cfdfd9a

Browse files
shoaebjindanishoaebjindani
authored
Merge branch 'main' into fabric_dep_tests
2 parents 64c445a + 120399a commit cfdfd9a

11 files changed

Lines changed: 393 additions & 304 deletions

File tree

‎.github/workflows/integration-tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ env:
2828
KUBECONFIG_PATH: /tmp/kubeconfig.yaml
2929
OPERATOR_NAMESPACE: inttest
3030
DOCKERCONFIGJSON: ${{ secrets.DOCKERCONFIGJSON }}
31-
GO_VER: "1.21"
31+
GO_VER: "1.22"
3232

3333
jobs:
3434
suite:

‎.github/workflows/release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
tags: [v1.*]
88

99
env:
10-
GO_VER: "1.21"
10+
GO_VER: "1.22"
1111
GO_TAGS: ""
1212
REGISTRY: ghcr.io
1313
IMAGE_NAME: ${{ github.repository }}

‎.github/workflows/unit-tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626
workflow_dispatch:
2727

2828
env:
29-
GO_VER: "1.21"
29+
GO_VER: "1.22"
3030

3131
jobs:
3232
make-checks:

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ IMAGE ?= ghcr.io/hyperledger-labs/fabric-operator
2020

2121
TAG ?= $(shell git rev-parse --short HEAD)
2222
ARCH ?= $(shell go env GOARCH)
23-
GO_VER ?= "1.21.11" # Go version bound by latest Go support in image ubi8/go-toolset
23+
GO_VER ?= "1.22.5"
2424
OS = $(shell go env GOOS)
2525
BUILD_DATE = $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
2626

@@ -170,7 +170,7 @@ ifeq (, $(shell which controller-gen))
170170
CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
171171
cd $$CONTROLLER_GEN_TMP_DIR ;\
172172
go mod init tmp ;\
173-
go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0 ;\
173+
go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.15.0 ;\
174174
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
175175
}
176176
CONTROLLER_GEN=$(GOBIN)/controller-gen

‎config/crd/bases/ibp.com_ibpcas.yaml‎

Lines changed: 47 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.15.0
87
name: ibpcas.ibp.com
98
spec:
109
group: ibp.com
@@ -18,19 +17,24 @@ spec:
1817
- name: v1beta1
1918
schema:
2019
openAPIV3Schema:
21-
description: 'Certificate Authorities issue certificates for all the identities
22-
to transact on the network. Warning: CA deployment using this tile is not
23-
supported. Please use the IBP Console to deploy a CA.'
20+
description: |-
21+
Certificate Authorities issue certificates for all the identities to transact on the network.
22+
Warning: CA deployment using this tile is not supported. Please use the IBP Console to deploy a CA.
2423
properties:
2524
apiVersion:
26-
description: 'APIVersion defines the versioned schema of this representation
27-
of an object. Servers should convert recognized schemas to the latest
28-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
25+
description: |-
26+
APIVersion defines the versioned schema of this representation of an object.
27+
Servers should convert recognized schemas to the latest internal value, and
28+
may reject unrecognized values.
29+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2930
type: string
3031
kind:
31-
description: 'Kind is a string value representing the REST resource this
32-
object represents. Servers may infer this from the endpoint the client
33-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
32+
description: |-
33+
Kind is a string value representing the REST resource this object represents.
34+
Servers may infer this from the endpoint the client submits requests to.
35+
Cannot be updated.
36+
In CamelCase.
37+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3438
type: string
3539
metadata:
3640
type: object
@@ -190,8 +194,9 @@ spec:
190194
- type: string
191195
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
192196
x-kubernetes-int-or-string: true
193-
description: 'Limits describes the maximum amount of compute
194-
resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
197+
description: |-
198+
Limits describes the maximum amount of compute resources allowed.
199+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
195200
type: object
196201
requests:
197202
additionalProperties:
@@ -200,10 +205,11 @@ spec:
200205
- type: string
201206
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
202207
x-kubernetes-int-or-string: true
203-
description: 'Requests describes the minimum amount of compute
204-
resources required. If Requests is omitted for a container,
205-
it defaults to Limits if that is explicitly specified, otherwise
206-
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
208+
description: |-
209+
Requests describes the minimum amount of compute resources required.
210+
If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
211+
otherwise to an implementation-defined value.
212+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
207213
type: object
208214
type: object
209215
enrollJob:
@@ -217,8 +223,9 @@ spec:
217223
- type: string
218224
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
219225
x-kubernetes-int-or-string: true
220-
description: 'Limits describes the maximum amount of compute
221-
resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
226+
description: |-
227+
Limits describes the maximum amount of compute resources allowed.
228+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
222229
type: object
223230
requests:
224231
additionalProperties:
@@ -227,10 +234,11 @@ spec:
227234
- type: string
228235
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
229236
x-kubernetes-int-or-string: true
230-
description: 'Requests describes the minimum amount of compute
231-
resources required. If Requests is omitted for a container,
232-
it defaults to Limits if that is explicitly specified, otherwise
233-
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
237+
description: |-
238+
Requests describes the minimum amount of compute resources required.
239+
If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
240+
otherwise to an implementation-defined value.
241+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
234242
type: object
235243
type: object
236244
hsmDaemon:
@@ -244,8 +252,9 @@ spec:
244252
- type: string
245253
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
246254
x-kubernetes-int-or-string: true
247-
description: 'Limits describes the maximum amount of compute
248-
resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
255+
description: |-
256+
Limits describes the maximum amount of compute resources allowed.
257+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
249258
type: object
250259
requests:
251260
additionalProperties:
@@ -254,10 +263,11 @@ spec:
254263
- type: string
255264
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
256265
x-kubernetes-int-or-string: true
257-
description: 'Requests describes the minimum amount of compute
258-
resources required. If Requests is omitted for a container,
259-
it defaults to Limits if that is explicitly specified, otherwise
260-
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
266+
description: |-
267+
Requests describes the minimum amount of compute resources required.
268+
If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
269+
otherwise to an implementation-defined value.
270+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
261271
type: object
262272
type: object
263273
init:
@@ -270,8 +280,9 @@ spec:
270280
- type: string
271281
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
272282
x-kubernetes-int-or-string: true
273-
description: 'Limits describes the maximum amount of compute
274-
resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
283+
description: |-
284+
Limits describes the maximum amount of compute resources allowed.
285+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
275286
type: object
276287
requests:
277288
additionalProperties:
@@ -280,10 +291,11 @@ spec:
280291
- type: string
281292
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
282293
x-kubernetes-int-or-string: true
283-
description: 'Requests describes the minimum amount of compute
284-
resources required. If Requests is omitted for a container,
285-
it defaults to Limits if that is explicitly specified, otherwise
286-
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
294+
description: |-
295+
Requests describes the minimum amount of compute resources required.
296+
If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
297+
otherwise to an implementation-defined value.
298+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
287299
type: object
288300
type: object
289301
type: object
@@ -364,9 +376,3 @@ spec:
364376
storage: true
365377
subresources:
366378
status: {}
367-
status:
368-
acceptedNames:
369-
kind: ""
370-
plural: ""
371-
conditions: []
372-
storedVersions: []

0 commit comments

Comments
 (0)