Skip to content

Commit

Permalink
Update controller-gen and upgrade libraries
Browse files Browse the repository at this point in the history
Signed-off-by: David VIEJO <[email protected]>
  • Loading branch information
dviejokfs committed Oct 14, 2024
1 parent d23f91a commit 0ffcd61
Show file tree
Hide file tree
Showing 129 changed files with 1,316 additions and 10,190 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-kubectl-plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Install operator CRDs
run: |
go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.4
make generate manifests install
- name: Install Istio
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

- name: Install operator
run: |
go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.4
make generate manifests install
- name: Test
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
### Install controller-gen

```bash
go install sigs.k8s.io/controller-tools/cmd/controller-gen@latest
go install sigs.k8s.io/controller-tools/cmd/controller-gen@0.16.4
```


Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
# Image URL to use all building/pushing image targets
IMG ?= controller:latest
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
CRD_OPTIONS ?= "crd:crdVersions=v1"
CRD_OPTIONS ?= "crd:maxDescLen=0,generateEmbeddedObjectMeta=true"

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
ifeq (,$(shell go env GOBIN))
Expand Down Expand Up @@ -96,7 +96,7 @@ ifeq (, $(shell which controller-gen))
CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
cd $$CONTROLLER_GEN_TMP_DIR ;\
go mod init tmp ;\
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0 ;\
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.4 ;\
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
}
CONTROLLER_GEN=$(GOBIN)/controller-gen
Expand Down
820 changes: 65 additions & 755 deletions config/crd/bases/hlf.kungfusoftware.es_fabriccas.yaml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.3.0
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.16.4
name: fabricchaincodeapproves.hlf.kungfusoftware.es
spec:
group: hlf.kungfusoftware.es
Expand All @@ -28,31 +26,20 @@ spec:
name: v1alpha1
schema:
openAPIV3Schema:
description: FabricChaincodeApprove is the Schema for the hlfs API
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'
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'
type: string
metadata:
type: object
spec:
description: FabricChaincodeApproveSpec defines the desired state of FabricChaincodeApprove
properties:
chaincodeName:
description: ChaincodeName is the name of the chaincode
type: string
channelName:
description: ChannelName is the name of the channel
type: string
endorsementPolicy:
description: EndorsementPolicy specifies the endorsement policy
type: string
externalOrderers:
items:
Expand All @@ -79,18 +66,13 @@ spec:
type: object
type: array
hlfIdentity:
description: HLFIdentity specifies the identity to use for the operation
properties:
secretKey:
description: Key inside the secret that holds the private key
and certificate to interact with the network
type: string
secretName:
description: Secret name
type: string
secretNamespace:
default: default
description: Secret namespace
type: string
required:
- secretKey
Expand All @@ -101,11 +83,8 @@ spec:
nullable: true
type: boolean
mspID:
description: MSPID is the MSP ID of the organization approving the
chaincode
type: string
orderers:
description: Orderers is a list of orderers to use for the transaction
items:
properties:
name:
Expand All @@ -118,11 +97,8 @@ spec:
type: object
type: array
packageId:
description: PackageID is the ID of the chaincode package
type: string
pdc:
description: PrivateDataCollections is a list of private data collection
configurations
items:
properties:
blockToLive:
Expand All @@ -145,14 +121,10 @@ spec:
memberOnlyWrite:
type: boolean
name:
description: Define the structure for private data collections
here This is a placeholder and should be expanded based on
your specific requirements
type: string
policy:
type: string
requiredPeerCount:
description: add default
format: int32
nullable: true
type: integer
Expand All @@ -165,7 +137,6 @@ spec:
type: object
type: array
peers:
description: Peers is a list of peers to approve the chaincode
items:
properties:
name:
Expand All @@ -178,11 +149,9 @@ spec:
type: object
type: array
sequence:
description: Sequence is the sequence number of the chaincode definition
format: int64
type: integer
version:
description: Version is the version of the chaincode
type: string
required:
- chaincodeName
Expand All @@ -199,43 +168,20 @@ spec:
- version
type: object
status:
description: FabricChaincodeApproveStatus defines the observed state of
FabricChaincodeApprove
properties:
conditions:
description: Conditions is a set of Condition instances.
items:
description: "Condition represents an observation of an object's
state. Conditions are an extension mechanism intended to be used
when the details of an observation are not a priori known or would
not apply to all instances of a given Kind. \n Conditions should
be added to explicitly convey properties that users and components
care about rather than requiring those properties to be inferred
from other observations. Once defined, the meaning of a Condition
can not be changed arbitrarily - it becomes part of the API, and
has the same backwards- and forwards-compatibility concerns of
any other part of the API."
properties:
lastTransitionTime:
format: date-time
type: string
message:
type: string
reason:
description: ConditionReason is intended to be a one-word, CamelCase
representation of the category of cause of the current status.
It is intended to be used in concise output, such as one-line
kubectl get output, and in summarizing occurrences of causes.
type: string
status:
type: string
type:
description: "ConditionType is the type of the condition and
is typically a CamelCased word or short phrase. \n Condition
types should indicate state in the \"abnormal-true\" polarity.
For example, if the condition indicates when a policy is invalid,
the \"is valid\" case is probably the norm, so the condition
should be called \"Invalid\"."
type: string
required:
- status
Expand All @@ -245,7 +191,6 @@ spec:
message:
type: string
status:
description: Status of the FabricChaincodeApprove
type: string
transactionID:
nullable: true
Expand All @@ -260,9 +205,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Loading

0 comments on commit 0ffcd61

Please sign in to comment.