-
Notifications
You must be signed in to change notification settings - Fork 71
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update bevel to 1.10.0 in sample ci test
Signed-off-by: dzikowski <[email protected]>
- Loading branch information
Showing
1 changed file
with
21 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -60,14 +60,17 @@ jobs: | |
| export PATH=$HOME/.krew/bin:$PATH | ||
| kubectl krew install hlf | ||
| helm repo add kfs "https://kfsoftware.github.io/hlf-helm-charts" --force-update | ||
| helm install hlf-operator --version=1.9.2 kfs/hlf-operator | ||
| helm install hlf-operator --version=1.10.0 kfs/hlf-operator | ||
| kubectl hlf | ||
| - name: Install operator CRDs | ||
| run: | | ||
| go install sigs.k8s.io/controller-tools/cmd/[email protected] | ||
| make generate manifests install | ||
| - name: Install Istio | ||
| run: | | ||
| curl -L https://istio.io/downloadIstio | ISTIO_VERSION=1.16.1 TARGET_ARCH=x86_64 sh - | ||
| mv $PWD/istio-1.16.1 $HOME/.istio | ||
| export PATH="$HOME/.istio/bin:$PATH" | ||
| curl -L https://istio.io/downloadIstio | ISTIO_VERSION=1.20.0 TARGET_ARCH=x86_64 sh - | ||
| export PATH="$PATH:$PWD/istio-1.20.0/bin" | ||
| kubectl create namespace istio-system | ||
| istioctl operator init | ||
|
|
@@ -143,6 +146,7 @@ jobs: | |
| run: | | ||
| CLUSTER_IP=$(kubectl -n istio-system get svc istio-ingressgateway -o json | jq -r .spec.clusterIP) | ||
| echo "CLUSTER_IP=${CLUSTER_IP}" | ||
| kubectl apply -f - <<EOF | ||
| kind: ConfigMap | ||
| apiVersion: v1 | ||
|
|
@@ -156,9 +160,8 @@ jobs: | |
| health { | ||
| lameduck 5s | ||
| } | ||
| rewrite name regex (.*)\.localho\.st host.ingress.internal | ||
| rewrite name regex (.*)\.localho\.st istio-ingressgateway.istio-system.svc.cluster.local | ||
| hosts { | ||
| ${CLUSTER_IP} host.ingress.internal | ||
| fallthrough | ||
| } | ||
| ready | ||
|
|
@@ -185,10 +188,10 @@ jobs: | |
| export PATH="$HOME/.krew/bin:$HOME/.istio/bin:$PATH" | ||
| kubectl hlf | ||
| export PEER_IMAGE=hyperledger/fabric-peer | ||
| export PEER_VERSION=2.5.0 | ||
| export PEER_VERSION=2.5.5 | ||
| export CA_IMAGE=hyperledger/fabric-ca | ||
| export CA_VERSION=1.5.6 | ||
| export CA_VERSION=1.5.7 | ||
| kubectl hlf ca create --image=$CA_IMAGE --version=$CA_VERSION --storage-class=standard --capacity=2Gi --name=org1-ca \ | ||
| --enroll-id=enroll --hosts=org1-ca.localho.st --enroll-pw=enrollpw | ||
|
|
@@ -208,10 +211,10 @@ jobs: | |
| run: | | ||
| export PATH="$HOME/.krew/bin:$HOME/.istio/bin:$PATH" | ||
| export ORDERER_IMAGE=hyperledger/fabric-orderer | ||
| export ORDERER_VERSION=2.5.0 | ||
| export ORDERER_VERSION=2.5.5 | ||
| export CA_IMAGE=hyperledger/fabric-ca | ||
| export CA_VERSION=1.5.6 | ||
| export CA_VERSION=1.5.7 | ||
| kubectl hlf ca create --image=$CA_IMAGE --version=$CA_VERSION --storage-class=standard --capacity=2Gi --name=ord-ca \ | ||
| --enroll-id=enroll --enroll-pw=enrollpw --hosts=ord-ca.localho.st | ||
|
|
@@ -221,7 +224,7 @@ jobs: | |
| --type=orderer --enroll-id enroll --enroll-secret=enrollpw --mspid=OrdererMSP | ||
| kubectl hlf ordnode create --image=$ORDERER_IMAGE --version=$ORDERER_VERSION \ | ||
| --storage-class=standard --enroll-id=orderer --mspid=OrdererMSP --hosts=orderer0-ord.localho.st \ | ||
| --storage-class=standard --enroll-id=orderer --mspid=OrdererMSP --hosts=orderer0-ord.localho.st --admin-hosts=admin-orderer0-ord.localho.st \ | ||
| --enroll-pw=ordererpw --capacity=2Gi --name=ord-node1 --ca-name=ord-ca.default | ||
| kubectl wait --timeout=180s --for=condition=Running fabricorderernodes.hlf.kungfusoftware.es --all | ||
| - name: Prepare Connection string for Orderer Node | ||
|
|
@@ -274,12 +277,12 @@ jobs: | |
| --admin-peer-orgs=Org1MSP \ | ||
| --secret-name=wallet \ | ||
| --secret-ns=default \ | ||
| --consenters=ord-node1.default:7050 \ | ||
| --consenters=orderer0-ord.localho.st:7050 \ | ||
| --consenter-certificates=./orderer-cert.pem \ | ||
| --identities="OrdererMSP;admin-tls-ordservice.yaml" \ | ||
| --identities="Org1MSP;peer-org1.yaml" | ||
| kubectl wait --timeout=180s --for=condition=Created fabricmainchannels.hlf.kungfusoftware.es --all | ||
| kubectl wait --timeout=180s --for=condition=RUNNING fabricmainchannels.hlf.kungfusoftware.es --all | ||
| - name: Join peers to channel | ||
|
|
@@ -291,14 +294,14 @@ jobs: | |
| --mspid=Org1MSP \ | ||
| --name="demo-org1msp" \ | ||
| --orderer-certificates="./orderer-cert.pem" \ | ||
| --orderer-urls="grpcs://ord-node1.default:7050" \ | ||
| --orderer-urls="grpcs://orderer0-ord.localho.st:443" \ | ||
| --anchor-peers="org1-peer0:7051" \ | ||
| --peers="org1-peer0.default" \ | ||
| --secret-name=wallet \ | ||
| --secret-ns=default \ | ||
| --secret-key="peer-org1.yaml" | ||
| kubectl wait --timeout=180s --for=condition=Created fabricfollowerchannels.hlf.kungfusoftware.es --all | ||
| kubectl wait --timeout=180s --for=condition=RUNNING fabricfollowerchannels.hlf.kungfusoftware.es --all | ||
| - name: Get channel | ||
| run: | | ||
| export PATH="$HOME/.krew/bin:$HOME/.istio/bin:$PATH" | ||
|
|
@@ -376,14 +379,17 @@ jobs: | |
| export PATH="$HOME/.krew/bin:$HOME/.istio/bin:$PATH" | ||
| kubectl get nodes -o=wide | ||
| kubectl get pods -o=wide -A | ||
| kubectl get service -o=wide -A | ||
| kubectl get crds | ||
| kubectl get fabricpeers.hlf.kungfusoftware.es -A -o=custom-columns='NAME:metadata.name,NAMESPACE:metadata.namespace,STATE:status.status,MESSAGE:status.message' | ||
| kubectl get fabricorderernodes.hlf.kungfusoftware.es -A -o=custom-columns='NAME:metadata.name,NAMESPACE:metadata.namespace,STATE:status.status,MESSAGE:status.message' | ||
| kubectl get fabriccas.hlf.kungfusoftware.es -A -o=custom-columns='NAME:metadata.name,NAMESPACE:metadata.namespace,STATE:status.status,MESSAGE:status.message' | ||
| kubectl get fabricmainchannels.hlf.kungfusoftware.es -A -o=custom-columns='NAME:metadata.name,NAMESPACE:metadata.namespace,STATE:status.status,MESSAGE:status.message' | ||
| kubectl get fabricfollowerchannels.hlf.kungfusoftware.es -A -o=custom-columns='NAME:metadata.name,NAMESPACE:metadata.namespace,STATE:status.status,MESSAGE:status.message' | ||
| kubectl get configmap coredns -n kube-system -o yaml | ||
| kubectl get fabricmainchannels -o yaml | ||
| kubectl get fabricfollowerchannels -o yaml | ||
| POD=$(kubectl get pod -l 'release in (org1-peer0)' -o jsonpath="{.items[0].metadata.name}") | ||
| kubectl logs $POD -c peer | ||
|
|
||