mirror of
https://github.com/hyperledger/fabric-samples.git
synced 2026-06-23 01:55:10 +00:00
Update the full-stack sample to use arm64 operator images
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
This commit is contained in:
parent
4109e741e4
commit
4429c4fc38
2 changed files with 16 additions and 73 deletions
|
|
@ -20,16 +20,8 @@ apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
name: fabric-operator
|
name: fabric-operator
|
||||||
labels:
|
|
||||||
release: "operator"
|
|
||||||
helm.sh/chart: "hlf"
|
|
||||||
app.kubernetes.io/name: "hlf"
|
|
||||||
app.kubernetes.io/instance: "hlf"
|
|
||||||
app.kubernetes.io/managed-by: "fabric-operator"
|
|
||||||
spec:
|
spec:
|
||||||
replicas: 1
|
replicas: 1
|
||||||
strategy:
|
|
||||||
type: "Recreate"
|
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
name: fabric-operator
|
name: fabric-operator
|
||||||
|
|
@ -37,70 +29,28 @@ spec:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
name: fabric-operator
|
name: fabric-operator
|
||||||
release: "operator"
|
|
||||||
helm.sh/chart: "hlf"
|
|
||||||
app.kubernetes.io/name: "hlf"
|
|
||||||
app.kubernetes.io/instance: "hlf"
|
|
||||||
app.kubernetes.io/managed-by: "fabric-operator"
|
|
||||||
annotations:
|
|
||||||
productName: "Hyperledger Fabric Operator"
|
|
||||||
productID: ""
|
|
||||||
productVersion: "1.0.0"
|
|
||||||
productChargedContainers: ""
|
|
||||||
productMetric: "VIRTUAL_PROCESSOR_CORE"
|
|
||||||
spec:
|
spec:
|
||||||
serviceAccountName: fabric-operator
|
serviceAccountName: fabric-operator
|
||||||
# hostIPC: false
|
# imagePullSecrets:
|
||||||
# hostNetwork: false
|
# - name: image-pull-secret
|
||||||
# hostPID: false
|
|
||||||
# affinity:
|
|
||||||
# nodeAffinity:
|
|
||||||
# requiredDuringSchedulingIgnoredDuringExecution:
|
|
||||||
# nodeSelectorTerms:
|
|
||||||
# - matchExpressions:
|
|
||||||
# - key: kubernetes.io/arch
|
|
||||||
# operator: In
|
|
||||||
# values:
|
|
||||||
# - amd64
|
|
||||||
# securityContext:
|
|
||||||
# runAsNonRoot: true
|
|
||||||
# runAsUser: 1001
|
|
||||||
# fsGroup: 2000
|
|
||||||
|
|
||||||
imagePullSecrets:
|
|
||||||
- name: image-pull-secret
|
|
||||||
|
|
||||||
containers:
|
containers:
|
||||||
- name: fabric-operator
|
- name: fabric-operator
|
||||||
image: ${FABRIC_OPERATOR_IMAGE}
|
image: ${FABRIC_OPERATOR_IMAGE}
|
||||||
imagePullPolicy: ${IMAGE_PULL_POLICY}
|
imagePullPolicy: ${IMAGE_PULL_POLICY}
|
||||||
|
|
||||||
command:
|
command:
|
||||||
- ibp-operator
|
- ibp-operator
|
||||||
# securityContext:
|
# livenessProbe:
|
||||||
# privileged: false
|
# tcpSocket:
|
||||||
# allowPrivilegeEscalation: false
|
# port: 8383
|
||||||
# readOnlyRootFilesystem: false
|
# initialDelaySeconds: 10
|
||||||
# runAsNonRoot: false
|
# timeoutSeconds: 5
|
||||||
# runAsUser: 1001
|
# failureThreshold: 5
|
||||||
# capabilities:
|
# readinessProbe:
|
||||||
# drop:
|
# tcpSocket:
|
||||||
# - ALL
|
# port: 8383
|
||||||
# add:
|
# initialDelaySeconds: 10
|
||||||
# - CHOWN
|
# timeoutSeconds: 5
|
||||||
# - FOWNER
|
# periodSeconds: 5
|
||||||
livenessProbe:
|
|
||||||
tcpSocket:
|
|
||||||
port: 8383
|
|
||||||
initialDelaySeconds: 10
|
|
||||||
timeoutSeconds: 5
|
|
||||||
failureThreshold: 5
|
|
||||||
readinessProbe:
|
|
||||||
tcpSocket:
|
|
||||||
port: 8383
|
|
||||||
initialDelaySeconds: 10
|
|
||||||
timeoutSeconds: 5
|
|
||||||
periodSeconds: 5
|
|
||||||
env:
|
env:
|
||||||
- name: WATCH_NAMESPACE
|
- name: WATCH_NAMESPACE
|
||||||
valueFrom:
|
valueFrom:
|
||||||
|
|
@ -114,10 +64,3 @@ spec:
|
||||||
value: "fabric-operator"
|
value: "fabric-operator"
|
||||||
- name: CLUSTERTYPE
|
- name: CLUSTERTYPE
|
||||||
value: K8S
|
value: K8S
|
||||||
resources:
|
|
||||||
requests:
|
|
||||||
cpu: 10m
|
|
||||||
memory: 10Mi
|
|
||||||
limits:
|
|
||||||
cpu: 100m
|
|
||||||
memory: 200Mi
|
|
||||||
|
|
|
||||||
|
|
@ -78,13 +78,13 @@ context CA_IMAGE_LABEL ${FABRIC_CA_VERSION}
|
||||||
#context PEER_IMAGE ${FABRIC_CONTAINER_REGISTRY}/fabric-peer
|
#context PEER_IMAGE ${FABRIC_CONTAINER_REGISTRY}/fabric-peer
|
||||||
#context PEER_IMAGE_LABEL ${FABRIC_VERSION}
|
#context PEER_IMAGE_LABEL ${FABRIC_VERSION}
|
||||||
context PEER_IMAGE ghcr.io/hyperledger-labs/k8s-fabric-peer
|
context PEER_IMAGE ghcr.io/hyperledger-labs/k8s-fabric-peer
|
||||||
context PEER_IMAGE_LABEL v0.7.2 # FROM fabric-peer 2.4
|
context PEER_IMAGE_LABEL v0.8.0
|
||||||
context ORDERER_IMAGE ${FABRIC_CONTAINER_REGISTRY}/fabric-orderer
|
context ORDERER_IMAGE ${FABRIC_CONTAINER_REGISTRY}/fabric-orderer
|
||||||
context ORDERER_IMAGE_LABEL ${FABRIC_VERSION}
|
context ORDERER_IMAGE_LABEL ${FABRIC_VERSION}
|
||||||
context TOOLS_IMAGE ${FABRIC_CONTAINER_REGISTRY}/fabric-tools
|
context TOOLS_IMAGE ${FABRIC_CONTAINER_REGISTRY}/fabric-tools
|
||||||
context TOOLS_IMAGE_LABEL ${FABRIC_VERSION}
|
context TOOLS_IMAGE_LABEL ${FABRIC_VERSION}
|
||||||
context OPERATOR_IMAGE ghcr.io/hyperledger-labs/fabric-operator
|
context OPERATOR_IMAGE ghcr.io/hyperledger-labs/fabric-operator
|
||||||
context OPERATOR_IMAGE_LABEL latest-amd64
|
context OPERATOR_IMAGE_LABEL 1.0.4
|
||||||
context INIT_IMAGE registry.access.redhat.com/ubi8/ubi-minimal
|
context INIT_IMAGE registry.access.redhat.com/ubi8/ubi-minimal
|
||||||
context INIT_IMAGE_LABEL latest
|
context INIT_IMAGE_LABEL latest
|
||||||
context GRPCWEB_IMAGE ghcr.io/hyperledger-labs/grpc-web
|
context GRPCWEB_IMAGE ghcr.io/hyperledger-labs/grpc-web
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue