Skip to content

Commit a7d689e

Browse files
author
Tittu Varghese
committed
Merge branch 'fix/imagepolicies' into 'main'
Charts feature addition See merge request opensource/falcon!5
2 parents a04f8d7 + 39ee1ec commit a7d689e

File tree

19 files changed

+355
-158
lines changed

19 files changed

+355
-158
lines changed

‎examples/fabric-ca/ica-initialpeerorg.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ca_server:
3636
container_port: 7051
3737
debug: true
3838
tls_enabled: true
39-
# You must create this secret outside of this chart for maximum security. Never commit CA user/pass into any charts.
39+
# You must create this secret outside of this chart for maximum security. Don't commit CA user/pass into any charts.
4040
# kubectl -n orderer create secret generic your-secret --from-literal=user=your-admin-user --from-literal=password=your-admin-password
4141
admin_secret: initialpeerorg-secret
4242

‎examples/fabric-ca/ica-orderer.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ca_server:
3434
container_port: 7051
3535
debug: true
3636
tls_enabled: true
37-
# You must create this secret outside of this chart for maximum security. Never commit CA user/pass into any charts.
37+
# You must create this secret outside of this chart for maximum security. Don't commit CA user/pass into any charts.
3838
# kubectl -n orderer create secret generic your-secret --from-literal=user=your-admin-user --from-literal=password=your-admin-password
3939
admin_secret: orderer-secret
4040

‎examples/fabric-ca/ica-org1.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ca_server:
3434
container_port: 7051
3535
debug: true
3636
tls_enabled: true
37-
# You must create this secret outside of this chart for maximum security. Never commit CA user/pass into any charts.
37+
# You must create this secret outside of this chart for maximum security. Don't commit CA user/pass into any charts.
3838
# kubectl -n orderer create secret generic your-secret --from-literal=user=your-admin-user --from-literal=password=your-admin-password
3939
admin_secret: org1-secret
4040

‎examples/fabric-ca/ica-org2.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ca_server:
3434
container_port: 7051
3535
debug: true
3636
tls_enabled: true
37-
# You must create this secret outside of this chart for maximum security. Never commit CA user/pass into any charts.
37+
# You must create this secret outside of this chart for maximum security. Don't commit CA user/pass into any charts.
3838
# kubectl -n orderer create secret generic your-secret --from-literal=user=your-admin-user --from-literal=password=your-admin-password
3939
admin_secret: org2-secret
4040

‎examples/fabric-ca/root-ca.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ca_server:
2828
container_port: 7051
2929
debug: true
3030
tls_enabled: true
31-
# You must create this secret outside of this chart for maximum security. Never commit CA user/pass into any charts.
31+
# You must create this secret outside of this chart for maximum security. Don't commit CA user/pass into any charts.
3232
# kubectl -n orderer create secret generic your-secret --from-literal=user=your-admin-user --from-literal=password=your-admin-password
3333
admin_secret: rca-secret
3434

‎examples/fabric-ca/tls-ca.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ca_server:
2828
container_port: 7051
2929
debug: true
3030
tls_enabled: true
31-
# You must create this secret outside of this chart for maximum security. Never commit CA user/pass into any charts.
31+
# You must create this secret outside of this chart for maximum security. Don't commit CA user/pass into any charts.
3232
# kubectl -n orderer create secret generic your-secret --from-literal=user=your-admin-user --from-literal=password=your-admin-password
3333
admin_secret: tlsca-secret
3434

‎examples/fabric-peer/initialpeerorg/values.yaml

+93-29
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ peers:
3333
- name: peer2
3434
identity_name: peer2-initialpeerorg
3535
identity_secret: peer2initialpeerorgSamplePassword
36-
3736

3837
global:
3938
hlf_domain: my-hlf-domain.com
4039
ica_endpoint: ica-initialpeerorg.my-hlf-domain.com:30000
4140
tlsca_endpoint: tls-ca.my-hlf-domain.com:30000
41+
storageClass: standard
4242
ingressClass: nginx
4343
ingressPort: 30000
4444
ingress:
@@ -58,10 +58,25 @@ global:
5858
couchServicePort: "5984"
5959
couchDataDir: /opt/couchdb/data
6060
couchDiskSize: 1G
61-
couchDbUser: couchDbSampleUser
62-
couchDbUserPass: couchDbSampleUserPassword
6361
couchPvcAccessMode: ReadWriteOnce
64-
62+
couchDbUser: "couchDbSampleUser"
63+
couchDbUserPass: couchDbSampleUserPassword
64+
couchResources: {}
65+
# couchStartupProbe: {}
66+
couchLivenessProbe:
67+
failureThreshold: 3
68+
periodSeconds: 10
69+
successThreshold: 1
70+
tcpSocket:
71+
port: 5984
72+
couchReadinessProbe:
73+
failureThreshold: 3
74+
periodSeconds: 10
75+
successThreshold: 1
76+
tcpSocket:
77+
port: 5984
78+
couchSecurityContext: {}
79+
6580
peerImageRegistry: docker.io
6681
peerImageRepo: hyperledger/fabric-peer
6782
peerImageTag: 2.4
@@ -76,36 +91,85 @@ global:
7691
- node
7792
- start
7893
core_peer_gossip_bootstrap: peer0-initialpeerorg.my-hlf-domain.com:30000
94+
core_ledger_state_couchdbconfig_requesttimeout: "180s"
95+
core_ledger_state_couchdbconfig_maxretries: "5"
96+
core_ledger_state_couchdbconfig_maxupdatebatchsize: "5000"
97+
core_ledger_state_couchdbconfig_internalquerylimit: "5000"
98+
core_ledger_state_couchdbconfig_totalquerylimit: "5000"
99+
core_ledger_state_couchdbconfig_couchdbaddress: "localhost:5984"
100+
peerSecurityContext: {}
101+
peerResources: {}
102+
# peerStartupProbe: {}
103+
peerLivenessProbe:
104+
failureThreshold: 3
105+
httpGet:
106+
path: /healthz
107+
port: 9443
108+
scheme: HTTP
109+
periodSeconds: 10
110+
successThreshold: 1
111+
peerReadinessProbe:
112+
failureThreshold: 3
113+
httpGet:
114+
path: /healthz
115+
port: 9443
116+
scheme: HTTP
117+
periodSeconds: 10
118+
successThreshold: 1
79119

80120
dindImageRegistry: docker.io
81121
dindImageRepo: npcioss/dind
82122
dindImageTag: dind-20-10-16
83123
dindDataDir: /var/lib/docker
84-
storageClass: standard
85124
dindDiskSize: 5G
86125
dindPvcAccessMode: ReadWriteOnce
126+
dindDocker_tls_certdir: ""
127+
dindSecurityContext:
128+
privileged: true
129+
dindResources: {}
130+
# dindStartupProbe: {}
131+
dindLivenessProbe:
132+
failureThreshold: 3
133+
periodSeconds: 10
134+
successThreshold: 1
135+
tcpSocket:
136+
port: 2375
137+
dindReadinessProbe:
138+
failureThreshold: 3
139+
periodSeconds: 10
140+
successThreshold: 1
141+
tcpSocket:
142+
port: 2375
87143

88-
89-
podAnnotations: {}
90-
podSecurityContext: {}
91-
# fsGroup: 2000
92-
securityContext: {}
93-
# capabilities:
94-
# drop:
95-
# - ALL
96-
# readOnlyRootFilesystem: true
97-
# runAsNonRoot: true
98-
# runAsUser: 1000
99-
100-
resources: {}
101-
# limits:
102-
# cpu: 100m
103-
# memory: 128Mi
104-
# requests:
105-
# cpu: 100m
106-
# memory: 128Mi
107-
108-
autoscaling:
109-
nodeSelector: {}
110-
tolerations: []
111-
affinity: {}
144+
additonalEnvironmentVars:
145+
# couchDb:
146+
# - name: EXTRA_ENV_COUCHDB
147+
# value: Extra_couch_env_value
148+
# dind:
149+
# - name: EXTRA_ENV_DIND
150+
# value: Extra_dind_env_value
151+
peer:
152+
- name: CORE_LEDGER_HISTORY_ENABLEHISTORYDATABASE
153+
value: "false"
154+
- name: CORE_PEER_GOSSIP_MAXBLOCKCOUNTTOSTORE
155+
value: "20"
156+
- name: CORE_PEER_GOSSIP_MAXPROPAGATIONBURSTSIZE
157+
value: "20"
158+
- name: FABRIC_LOGGING_SPEC
159+
value: INFO
160+
- name: CORE_PEER_CHAINCODELISTENADDRESS
161+
value: localhost:7052
162+
- name: CORE_PEER_GOSSIP_USELEADERELECTION
163+
value: "false"
164+
- name: CORE_PEER_GOSSIP_ORGLEADER
165+
value: "true"
166+
- name: CORE_PEER_PROFILE_ENABLED
167+
value: "true"
168+
- name: CORE_PEER_TLS_ENABLED
169+
value: "true"
170+
- name: CORE_VM_ENDPOINT
171+
value: http://localhost:2375
172+
- name: DOCKER_HOST
173+
value: tcp://localhost:2375
174+
- name: CORE_OPERATIONS_LISTENADDRESS
175+
value: 0.0.0.0:9443

‎examples/fabric-peer/org1/values.yaml

+93-27
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ global:
3838
hlf_domain: my-hlf-domain.com
3939
ica_endpoint: ica-org1.my-hlf-domain.com:30000
4040
tlsca_endpoint: tls-ca.my-hlf-domain.com:30000
41+
storageClass: standard
4142
ingressClass: nginx
4243
ingressPort: 30000
4344
ingress:
@@ -57,10 +58,25 @@ global:
5758
couchServicePort: "5984"
5859
couchDataDir: /opt/couchdb/data
5960
couchDiskSize: 1G
60-
couchDbUser: <your-user-name-here>
61-
couchDbUserPass: <your-user-password-here>
61+
couchDbUser: "couchDbSampleUser"
62+
couchDbUserPass: couchDbSampleUserPassword
6263
couchPvcAccessMode: ReadWriteOnce
63-
64+
couchSecurityContext: {}
65+
couchResources: {}
66+
#couchStartupProbe: {}
67+
couchLivenessProbe:
68+
failureThreshold: 3
69+
periodSeconds: 10
70+
successThreshold: 1
71+
tcpSocket:
72+
port: 5984
73+
couchReadinessProbe:
74+
failureThreshold: 3
75+
periodSeconds: 10
76+
successThreshold: 1
77+
tcpSocket:
78+
port: 5984
79+
6480
peerImageRegistry: docker.io
6581
peerImageRepo: hyperledger/fabric-peer
6682
peerImageTag: 2.4
@@ -70,41 +86,91 @@ global:
7086
peerServicePort: "30002"
7187
peerDiskSize: 1G
7288
peerPvcAccessMode: ReadWriteOnce
89+
peerSecurityContext: {}
7390
peerArgs:
7491
- peer
7592
- node
7693
- start
7794
core_peer_gossip_bootstrap: peer0-org1.my-hlf-domain.com:30000
95+
core_ledger_state_couchdbconfig_requesttimeout: "180s"
96+
core_ledger_state_couchdbconfig_maxretries: "5"
97+
core_ledger_state_couchdbconfig_maxupdatebatchsize: "5000"
98+
core_ledger_state_couchdbconfig_internalquerylimit: "5000"
99+
core_ledger_state_couchdbconfig_totalquerylimit: "5000"
100+
core_ledger_state_couchdbconfig_couchdbaddress: "localhost:5984"
101+
peerResources: {}
102+
#peerStartupProbe: {}
103+
peerLivenessProbe:
104+
failureThreshold: 3
105+
httpGet:
106+
path: /healthz
107+
port: 9443
108+
scheme: HTTP
109+
periodSeconds: 10
110+
successThreshold: 1
111+
peerReadinessProbe:
112+
failureThreshold: 3
113+
httpGet:
114+
path: /healthz
115+
port: 9443
116+
scheme: HTTP
117+
periodSeconds: 10
118+
successThreshold: 1
78119

79120
dindImageRegistry: docker.io
80121
dindImageRepo: npcioss/dind
81122
dindImageTag: dind-20-10-16
82123
dindDataDir: /var/lib/docker
83-
storageClass: standard
84124
dindDiskSize: 5G
85125
dindPvcAccessMode: ReadWriteOnce
126+
dindDocker_tls_certdir: ""
127+
dindSecurityContext:
128+
privileged: true
129+
dindResources: {}
130+
#dindStartupProbe: {}
131+
dindLivenessProbe:
132+
failureThreshold: 3
133+
periodSeconds: 10
134+
successThreshold: 1
135+
tcpSocket:
136+
port: 2375
137+
dindReadinessProbe:
138+
failureThreshold: 3
139+
periodSeconds: 10
140+
successThreshold: 1
141+
tcpSocket:
142+
port: 2375
86143

144+
additonalEnvironmentVars:
145+
# couchDb:
146+
# - name: EXTRA_ENV_COUCHDB
147+
# value: Extra_couch_env_value
148+
# dind:
149+
# - name: EXTRA_ENV_DIND
150+
# value: Extra_dind_env_value
151+
peer:
152+
- name: CORE_LEDGER_HISTORY_ENABLEHISTORYDATABASE
153+
value: "false"
154+
- name: CORE_PEER_GOSSIP_MAXBLOCKCOUNTTOSTORE
155+
value: "20"
156+
- name: CORE_PEER_GOSSIP_MAXPROPAGATIONBURSTSIZE
157+
value: "20"
158+
- name: FABRIC_LOGGING_SPEC
159+
value: INFO
160+
- name: CORE_PEER_CHAINCODELISTENADDRESS
161+
value: localhost:7052
162+
- name: CORE_PEER_GOSSIP_USELEADERELECTION
163+
value: "false"
164+
- name: CORE_PEER_GOSSIP_ORGLEADER
165+
value: "true"
166+
- name: CORE_PEER_PROFILE_ENABLED
167+
value: "true"
168+
- name: CORE_PEER_TLS_ENABLED
169+
value: "true"
170+
- name: CORE_VM_ENDPOINT
171+
value: http://localhost:2375
172+
- name: DOCKER_HOST
173+
value: tcp://localhost:2375
174+
- name: CORE_OPERATIONS_LISTENADDRESS
175+
value: 0.0.0.0:9443
87176

88-
podAnnotations: {}
89-
podSecurityContext: {}
90-
# fsGroup: 2000
91-
securityContext: {}
92-
# capabilities:
93-
# drop:
94-
# - ALL
95-
# readOnlyRootFilesystem: true
96-
# runAsNonRoot: true
97-
# runAsUser: 1000
98-
99-
resources: {}
100-
# limits:
101-
# cpu: 100m
102-
# memory: 128Mi
103-
# requests:
104-
# cpu: 100m
105-
# memory: 128Mi
106-
107-
autoscaling:
108-
nodeSelector: {}
109-
tolerations: []
110-
affinity: {}

0 commit comments

Comments
 (0)