Skip to content

Commit 371c616

Browse files
adityajoshi12adityajoshi12
authored
added support for auto cert renewal in hlf-operator chart (#177)
Signed-off-by: adityajoshi12 <[email protected]>
1 parent 1e42c98 commit 371c616

18 files changed

+11402
-143
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ bin
2222
*.swp
2323
*.swo
2424
*~
25+
*.DS_Store
2526

2627
crypto-config
2728
keystore
@@ -33,4 +34,4 @@ dist/
3334
/hlf-operator
3435
/kubectl-hlf/hlf-operator
3536
node_modules
36-
istio-*
37+
istio-*

‎chart/hlf-operator/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.1.0
18+
version: 1.9.0
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

‎chart/hlf-operator/templates/crds/hlf.kungfusoftware.es_fabriccas.yaml

Lines changed: 1265 additions & 2 deletions
Large diffs are not rendered by default.

‎chart/hlf-operator/templates/crds/hlf.kungfusoftware.es_fabricchaincodes.yaml

Lines changed: 1200 additions & 0 deletions
Large diffs are not rendered by default.

‎chart/hlf-operator/templates/crds/hlf.kungfusoftware.es_fabricexplorers.yaml

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
2+
---
3+
apiVersion: apiextensions.k8s.io/v1
4+
kind: CustomResourceDefinition
5+
metadata:
6+
annotations:
7+
controller-gen.kubebuilder.io/version: v0.3.0
8+
creationTimestamp: null
9+
name: fabricexplorers.hlf.kungfusoftware.es
10+
spec:
11+
group: hlf.kungfusoftware.es
12+
names:
13+
kind: FabricExplorer
14+
listKind: FabricExplorerList
15+
plural: fabricexplorers
16+
shortNames:
17+
- explorer
18+
singular: explorer
19+
scope: Namespaced
20+
versions:
21+
- additionalPrinterColumns:
22+
- jsonPath: .status.status
23+
name: State
24+
type: string
25+
- jsonPath: .metadata.creationTimestamp
26+
name: Age
27+
type: date
28+
name: v1alpha1
29+
schema:
30+
openAPIV3Schema:
31+
description: FabricExplorer is the Schema for the hlfs API
32+
properties:
33+
apiVersion:
34+
description: 'APIVersion defines the versioned schema of this representation
35+
of an object. Servers should convert recognized schemas to the latest
36+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
37+
type: string
38+
kind:
39+
description: 'Kind is a string value representing the REST resource this
40+
object represents. Servers may infer this from the endpoint the client
41+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
42+
type: string
43+
metadata:
44+
type: object
45+
spec:
46+
description: FabricExplorerSpec defines the desired state of FabricExplorer
47+
properties:
48+
resources:
49+
description: ResourceRequirements describes the compute resource requirements.
50+
properties:
51+
limits:
52+
additionalProperties:
53+
anyOf:
54+
- type: integer
55+
- type: string
56+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
57+
x-kubernetes-int-or-string: true
58+
description: 'Limits describes the maximum amount of compute resources
59+
allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
60+
type: object
61+
requests:
62+
additionalProperties:
63+
anyOf:
64+
- type: integer
65+
- type: string
66+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
67+
x-kubernetes-int-or-string: true
68+
description: 'Requests describes the minimum amount of compute
69+
resources required. If Requests is omitted for a container,
70+
it defaults to Limits if that is explicitly specified, otherwise
71+
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
72+
type: object
73+
type: object
74+
required:
75+
- resources
76+
type: object
77+
status:
78+
description: FabricExplorerStatus defines the observed state of FabricExplorer
79+
properties:
80+
conditions:
81+
description: Conditions is a set of Condition instances.
82+
items:
83+
description: "Condition represents an observation of an object's
84+
state. Conditions are an extension mechanism intended to be used
85+
when the details of an observation are not a priori known or would
86+
not apply to all instances of a given Kind. \n Conditions should
87+
be added to explicitly convey properties that users and components
88+
care about rather than requiring those properties to be inferred
89+
from other observations. Once defined, the meaning of a Condition
90+
can not be changed arbitrarily - it becomes part of the API, and
91+
has the same backwards- and forwards-compatibility concerns of
92+
any other part of the API."
93+
properties:
94+
lastTransitionTime:
95+
format: date-time
96+
type: string
97+
message:
98+
type: string
99+
reason:
100+
description: ConditionReason is intended to be a one-word, CamelCase
101+
representation of the category of cause of the current status.
102+
It is intended to be used in concise output, such as one-line
103+
kubectl get output, and in summarizing occurrences of causes.
104+
type: string
105+
status:
106+
type: string
107+
type:
108+
description: "ConditionType is the type of the condition and
109+
is typically a CamelCased word or short phrase. \n Condition
110+
types should indicate state in the \"abnormal-true\" polarity.
111+
For example, if the condition indicates when a policy is invalid,
112+
the \"is valid\" case is probably the norm, so the condition
113+
should be called \"Invalid\"."
114+
type: string
115+
required:
116+
- status
117+
- type
118+
type: object
119+
type: array
120+
message:
121+
type: string
122+
status:
123+
description: Status of the FabricCA
124+
type: string
125+
required:
126+
- conditions
127+
- message
128+
- status
129+
type: object
130+
type: object
131+
served: true
132+
storage: true
133+
subresources:
134+
status: {}
135+
status:
136+
acceptedNames:
137+
kind: ""
138+
plural: ""
139+
conditions: []
140+
storedVersions: []

‎chart/hlf-operator/templates/crds/hlf.kungfusoftware.es_fabricfollowerchannels.yaml

Lines changed: 208 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,208 @@
1+
2+
---
3+
apiVersion: apiextensions.k8s.io/v1
4+
kind: CustomResourceDefinition
5+
metadata:
6+
annotations:
7+
controller-gen.kubebuilder.io/version: v0.3.0
8+
creationTimestamp: null
9+
name: fabricfollowerchannels.hlf.kungfusoftware.es
10+
spec:
11+
group: hlf.kungfusoftware.es
12+
names:
13+
kind: FabricFollowerChannel
14+
listKind: FabricFollowerChannelList
15+
plural: fabricfollowerchannels
16+
shortNames:
17+
- fabricfollowerchannel
18+
singular: fabricfollowerchannel
19+
scope: Cluster
20+
versions:
21+
- additionalPrinterColumns:
22+
- jsonPath: .status.status
23+
name: State
24+
type: string
25+
- jsonPath: .metadata.creationTimestamp
26+
name: Age
27+
type: date
28+
name: v1alpha1
29+
schema:
30+
openAPIV3Schema:
31+
description: FabricFollowerChannel is the Schema for the hlfs API
32+
properties:
33+
apiVersion:
34+
description: 'APIVersion defines the versioned schema of this representation
35+
of an object. Servers should convert recognized schemas to the latest
36+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
37+
type: string
38+
kind:
39+
description: 'Kind is a string value representing the REST resource this
40+
object represents. Servers may infer this from the endpoint the client
41+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
42+
type: string
43+
metadata:
44+
type: object
45+
spec:
46+
description: FabricFollowerChannelSpec defines the desired state of FabricFollowerChannel
47+
properties:
48+
anchorPeers:
49+
description: Anchor peers defined for the current organization
50+
items:
51+
properties:
52+
host:
53+
description: Host of the anchor peer
54+
type: string
55+
port:
56+
description: Port of the anchor peer
57+
type: integer
58+
required:
59+
- host
60+
- port
61+
type: object
62+
type: array
63+
externalPeersToJoin:
64+
description: Peers to join the channel
65+
items:
66+
properties:
67+
tlsCACert:
68+
description: FabricPeer TLS CA certificate of the peer
69+
type: string
70+
url:
71+
description: FabricPeer URL of the peer
72+
type: string
73+
required:
74+
- tlsCACert
75+
- url
76+
type: object
77+
type: array
78+
hlfIdentity:
79+
description: Identity to use to interact with the peers and the orderers
80+
properties:
81+
secretKey:
82+
description: Key inside the secret that holds the private key
83+
and certificate to interact with the network
84+
type: string
85+
secretName:
86+
description: Secret name
87+
type: string
88+
secretNamespace:
89+
default: default
90+
description: Secret namespace
91+
type: string
92+
required:
93+
- secretKey
94+
- secretName
95+
- secretNamespace
96+
type: object
97+
mspId:
98+
description: MSP ID of the organization to join the channel
99+
type: string
100+
name:
101+
description: Name of the channel
102+
type: string
103+
orderers:
104+
description: Orderers to fetch the configuration block from
105+
items:
106+
properties:
107+
certificate:
108+
description: TLS Certificate of the orderer node
109+
type: string
110+
url:
111+
description: 'URL of the orderer, e.g.: "grpcs://xxxxx:443"'
112+
type: string
113+
required:
114+
- certificate
115+
- url
116+
type: object
117+
type: array
118+
peersToJoin:
119+
description: Peers to join the channel
120+
items:
121+
properties:
122+
name:
123+
description: FabricPeer Name of the peer inside the kubernetes
124+
cluster
125+
type: string
126+
namespace:
127+
description: FabricPeer Namespace of the peer inside the kubernetes
128+
cluster
129+
type: string
130+
required:
131+
- name
132+
- namespace
133+
type: object
134+
type: array
135+
required:
136+
- anchorPeers
137+
- externalPeersToJoin
138+
- hlfIdentity
139+
- mspId
140+
- name
141+
- orderers
142+
- peersToJoin
143+
type: object
144+
status:
145+
description: FabricFollowerChannelStatus defines the observed state of
146+
FabricFollowerChannel
147+
properties:
148+
conditions:
149+
description: Conditions is a set of Condition instances.
150+
items:
151+
description: "Condition represents an observation of an object's
152+
state. Conditions are an extension mechanism intended to be used
153+
when the details of an observation are not a priori known or would
154+
not apply to all instances of a given Kind. \n Conditions should
155+
be added to explicitly convey properties that users and components
156+
care about rather than requiring those properties to be inferred
157+
from other observations. Once defined, the meaning of a Condition
158+
can not be changed arbitrarily - it becomes part of the API, and
159+
has the same backwards- and forwards-compatibility concerns of
160+
any other part of the API."
161+
properties:
162+
lastTransitionTime:
163+
format: date-time
164+
type: string
165+
message:
166+
type: string
167+
reason:
168+
description: ConditionReason is intended to be a one-word, CamelCase
169+
representation of the category of cause of the current status.
170+
It is intended to be used in concise output, such as one-line
171+
kubectl get output, and in summarizing occurrences of causes.
172+
type: string
173+
status:
174+
type: string
175+
type:
176+
description: "ConditionType is the type of the condition and
177+
is typically a CamelCased word or short phrase. \n Condition
178+
types should indicate state in the \"abnormal-true\" polarity.
179+
For example, if the condition indicates when a policy is invalid,
180+
the \"is valid\" case is probably the norm, so the condition
181+
should be called \"Invalid\"."
182+
type: string
183+
required:
184+
- status
185+
- type
186+
type: object
187+
type: array
188+
message:
189+
type: string
190+
status:
191+
description: Status of the FabricCA
192+
type: string
193+
required:
194+
- conditions
195+
- message
196+
- status
197+
type: object
198+
type: object
199+
served: true
200+
storage: true
201+
subresources:
202+
status: {}
203+
status:
204+
acceptedNames:
205+
kind: ""
206+
plural: ""
207+
conditions: []
208+
storedVersions: []

0 commit comments

Comments
 (0)