go 1.21

Author: dviejokfs

.github/workflows/goreleaser-beta.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.18
+          go-version: 1.21
       -
         name: Docker Login
         uses: docker/login-action@v1

.github/workflows/goreleaser.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.18
+          go-version: 1.21
       -
         name: Docker Login
         uses: docker/login-action@v1

.github/workflows/test-kubectl-plugin.yml

@@ -8,7 +8,7 @@ jobs:
   kubectl-hlf:
     strategy:
       matrix:
-        go-version: [ 1.18.x ]
+        go-version: [ 1.21.x ]
         os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}
     env:

.github/workflows/test.yml

@@ -7,7 +7,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [ 1.18.x ]
+        go-version: [ 1.21.x ]
         os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}
     steps:

config/crd/bases/hlf.kungfusoftware.es_fabricmainchannels.yaml

@@ -179,6 +179,7 @@ spec:
                             server_tls_cert:
                               type: string
                           type: object
+                        nullable: true
                         type: array
                       etcdRaft:
                         nullable: true
@@ -299,7 +300,6 @@ spec:
                     required:
                     - batchTimeout
                     - capabilities
-                    - consenterMapping
                     - ordererType
                     - state
                     type: object

go.sum

@@ -484,7 +484,6 @@ github.com/hyperledger/fabric-lib-go v1.0.0 h1:UL1w7c9LvHZUSkIvHTDGklxFv2kTeva1Q
 github.com/hyperledger/fabric-lib-go v1.0.0/go.mod h1:H362nMlunurmHwkYqR5uHL2UDWbQdbfz74n8kbCFsqc=
 github.com/hyperledger/fabric-protos-go v0.0.0-20210911123859-041d13f0980c/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0=
 github.com/hyperledger/fabric-protos-go v0.0.0-20211118165945-23d738fc3553/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0=
-github.com/hyperledger/fabric-protos-go v0.3.0 h1:MXxy44WTMENOh5TI8+PCK2x6pMj47Go2vFRKDHB2PZs=
 github.com/hyperledger/fabric-protos-go v0.3.0/go.mod h1:WWnyWP40P2roPmmvxsUXSvVI/CF6vwY1K1UFidnKBys=
 github.com/hyperledger/fabric-protos-go v0.3.1-0.20230524072835-b03edb47a905 h1:Q7AqBmlqKRq7LAFzZhmGEu01tFgppXCm0rfLwzeqOw8=
 github.com/hyperledger/fabric-protos-go v0.3.1-0.20230524072835-b03edb47a905/go.mod h1:WWnyWP40P2roPmmvxsUXSvVI/CF6vwY1K1UFidnKBys=
@@ -538,12 +537,6 @@ github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uia
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
 github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA9iw=
 github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk=
-github.com/kfsoftware/fabric-config v0.0.0-20231011154251-e61bb40ee086 h1:zboxmgFTsZaghqsmGC0z6eXrmAGeVLfMs/1om5OfTFQ=
-github.com/kfsoftware/fabric-config v0.0.0-20231011154251-e61bb40ee086/go.mod h1:1ZfjDrsuMoM4IPKezQgTByy2vXUj8bgTXaOXaGXK5O4=
-github.com/kfsoftware/fabric-config v0.0.0-20240118173542-2c762ed17d0c h1:1IL8laUw8SWPr1CWfisKczihAZwY0F7p69eI/L3owso=
-github.com/kfsoftware/fabric-config v0.0.0-20240118173542-2c762ed17d0c/go.mod h1:1ZfjDrsuMoM4IPKezQgTByy2vXUj8bgTXaOXaGXK5O4=
-github.com/kfsoftware/fabric-config v0.0.0-20240118174340-d0ca879ab321 h1:WNLitFlI21cedFpC0cWKRZgABhZbAK6ndxkezDlt3rA=
-github.com/kfsoftware/fabric-config v0.0.0-20240118174340-d0ca879ab321/go.mod h1:1ZfjDrsuMoM4IPKezQgTByy2vXUj8bgTXaOXaGXK5O4=
 github.com/kfsoftware/fabric-config v0.0.0-20240118175815-ef1a1564900a h1:4o9kHzPdSU4Jzj8GpDYxmy3xZ45GEM0DKLtP862gf2c=
 github.com/kfsoftware/fabric-config v0.0.0-20240118175815-ef1a1564900a/go.mod h1:1ZfjDrsuMoM4IPKezQgTByy2vXUj8bgTXaOXaGXK5O4=
 github.com/kfsoftware/fabric-sdk-go v0.0.0-20240114221414-98466038585d h1:HcMV8Lve3QkZUIWYHP+rVIR4xtTdDPooj7Id0IdBj0o=