Skip to content

Commit

Permalink
Merge 6f6ba63 into 5e4a104
Browse files Browse the repository at this point in the history
  • Loading branch information
@dviejokfs
dviejokfs authored Sep 2, 2022
2 parents 5e4a104 + 6f6ba63 commit 8c96534
Show file tree
Hide file tree
Showing 6 changed files with 860 additions and 5 deletions.
2 changes: 1 addition & 1 deletion chart/hlf-operator/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.7.0
version: 1.8.0-beta4

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
182 changes: 182 additions & 0 deletions chart/hlf-operator/templates/crds/hlf.kungfusoftware.es_fabriccas.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,21 @@ spec:
type: object
ca:
properties:
affiliations:
items:
properties:
departments:
items:
type: string
type: array
name:
type: string
required:
- departments
- name
type: object
nullable: true
type: array
bccsp:
properties:
default:
Expand Down Expand Up @@ -836,6 +851,82 @@ spec:
- identities
- max_enrollments
type: object
signing:
nullable: true
properties:
default:
properties:
expiry:
default: 8760h
type: string
usage:
default:
- digital signature
items:
type: string
type: array
required:
- expiry
- usage
type: object
profiles:
properties:
ca:
properties:
caconstraint:
properties:
isCA:
default: true
type: boolean
maxPathLen:
default: 0
type: integer
required:
- isCA
- maxPathLen
type: object
expiry:
default: 43800h
type: string
usage:
default:
- cert sign
- crl sign
items:
type: string
type: array
required:
- caconstraint
- expiry
- usage
type: object
tls:
properties:
expiry:
default: 8760h
type: string
usage:
default:
- signing
- key encipherment
- server auth
- client auth
- key agreement
items:
type: string
type: array
required:
- expiry
- usage
type: object
required:
- ca
- tls
type: object
required:
- default
- profiles
type: object
subject:
properties:
C:
Expand Down Expand Up @@ -1291,6 +1382,21 @@ spec:
type: object
tlsCA:
properties:
affiliations:
items:
properties:
departments:
items:
type: string
type: array
name:
type: string
required:
- departments
- name
type: object
nullable: true
type: array
bccsp:
properties:
default:
Expand Down Expand Up @@ -1488,6 +1594,82 @@ spec:
- identities
- max_enrollments
type: object
signing:
nullable: true
properties:
default:
properties:
expiry:
default: 8760h
type: string
usage:
default:
- digital signature
items:
type: string
type: array
required:
- expiry
- usage
type: object
profiles:
properties:
ca:
properties:
caconstraint:
properties:
isCA:
default: true
type: boolean
maxPathLen:
default: 0
type: integer
required:
- isCA
- maxPathLen
type: object
expiry:
default: 43800h
type: string
usage:
default:
- cert sign
- crl sign
items:
type: string
type: array
required:
- caconstraint
- expiry
- usage
type: object
tls:
properties:
expiry:
default: 8760h
type: string
usage:
default:
- signing
- key encipherment
- server auth
- client auth
- key agreement
items:
type: string
type: array
required:
- expiry
- usage
type: object
required:
- ca
- tls
type: object
required:
- default
- profiles
type: object
subject:
properties:
C:
Expand Down
174 changes: 174 additions & 0 deletions chart/hlf-operator/templates/crds/hlf.kungfusoftware.es_fabricfollowerchannels.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.3.0
creationTimestamp: null
name: fabricfollowerchannels.hlf.kungfusoftware.es
spec:
group: hlf.kungfusoftware.es
names:
kind: FabricFollowerChannel
listKind: FabricFollowerChannelList
plural: fabricfollowerchannels
shortNames:
- fabricfollowerchannel
singular: fabricfollowerchannel
scope: Cluster
versions:
- additionalPrinterColumns:
- jsonPath: .status.status
name: State
type: string
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1alpha1
schema:
openAPIV3Schema:
description: FabricFollowerChannel 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: FabricFollowerChannelSpec defines the desired state of FabricFollowerChannel
properties:
anchorPeers:
items:
properties:
host:
type: string
port:
type: integer
required:
- host
- port
type: object
type: array
hlfIdentity:
properties:
secretKey:
type: string
secretName:
type: string
secretNamespace:
default: default
type: string
required:
- secretKey
- secretName
- secretNamespace
type: object
mspId:
type: string
name:
type: string
orderers:
items:
properties:
certificate:
type: string
url:
type: string
required:
- certificate
- url
type: object
type: array
peersToJoin:
items:
properties:
name:
type: string
namespace:
type: string
required:
- name
- namespace
type: object
type: array
required:
- anchorPeers
- hlfIdentity
- mspId
- name
- orderers
- peersToJoin
type: object
status:
description: FabricFollowerChannelStatus defines the observed state of
FabricFollowerChannel
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
- type
type: object
type: array
message:
type: string
status:
description: Status of the FabricCA
type: string
required:
- conditions
- message
- status
type: object
type: object
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Loading

0 comments on commit 8c96534

Please sign in to comment.