Skip to content

feat: trap ERR and format shell #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 10, 2023
Merged

feat: trap ERR and format shell #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 28 additions & 22 deletions scripts/e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,54 +16,60 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

function debug() {
kubectl describe po -A
kubectl get po -A
exit 1
}
trap debug ERR
# step 1. create namespace
kubectl create namespace u4a-system;
kubectl create namespace u4a-system

# step 2. get node name and node ip
ingressNode="kind-worker"
kubeProxyNode="kind-worker2"
ingressNodeIP=$(kubectl get node ${ingressNode} -owide | grep -v "NAME"|awk '{print $6}')
kubeProxyNodeIP=$(kubectl get node ${kubeProxyNode} -owide | grep -v "NAME"|awk '{print $6}')
kubectl get node -owide;
ingressNodeIP=$(kubectl get node ${ingressNode} -owide | grep -v "NAME" | awk '{print $6}')
kubeProxyNodeIP=$(kubectl get node ${kubeProxyNode} -owide | grep -v "NAME" | awk '{print $6}')
kubectl get node -owide
echo "ingressNodeIp ${ingressNodeIP}"
echo "kubeProxyNodeIP ${kubeProxyNodeIP}"

# step 3. repalce nginx and proxy node name
cat u4a-component/charts/cluster-component/values.yaml|sed "s/<replaced-ingress-node-name>/${ingressNode}/g" \
> u4a-component/charts/cluster-component/values1.yaml
cat u4a-component/charts/cluster-component/values.yaml | sed "s/<replaced-ingress-node-name>/${ingressNode}/g" \
>u4a-component/charts/cluster-component/values1.yaml

# step 4. install cluster-compoent
helm -nu4a-system install cluster-component --wait -f u4a-component/charts/cluster-component/values1.yaml u4a-component/charts/cluster-component
helm -nu4a-system install cluster-component --wait -f u4a-component/charts/cluster-component/values1.yaml u4a-component/charts/cluster-component

echo "deploy cluster component succeffsully"
kubectl get po -nu4a-system -owide

# step 5. replace nginx and proxy node name
cat u4a-component/values.yaml|sed "s/<replaced-ingress-nginx-ip>/${ingressNodeIP}/g"| \
sed "s/<replaced-oidc-proxy-node-name>/${kubeProxyNode}/g"| \
sed "s/<replaced-k8s-ip-with-oidc-enabled>/${kubeProxyNodeIP}/g" \
> u4a-component/values1.yaml
cat u4a-component/values.yaml | sed "s/<replaced-ingress-nginx-ip>/${ingressNodeIP}/g" |
sed "s/<replaced-oidc-proxy-node-name>/${kubeProxyNode}/g" |
sed "s/<replaced-k8s-ip-with-oidc-enabled>/${kubeProxyNodeIP}/g" \
>u4a-component/values1.yaml

helm -nu4a-system install u4a-component --wait -f u4a-component/values1.yaml u4a-component

# step 6. install u4a component

echo "deploy u4a component successfully"
kubectl get po -nu4a-system -owide

# step 7. replace iam server and get oidc-server client secret
secret=$(kubectl get cm oidc-server -nu4a-system -oyaml|grep secret|head -n1|awk '{print $2}')
secret=$(kubectl get cm oidc-server -nu4a-system -oyaml | grep secret | head -n1 | awk '{print $2}')

cat fabric-operator/values.yaml| sed "s/<replaced-ingress-nginx-ip>/${ingressNodeIP}/g" |\
sed "s/<replaced-iam-server>/https:\/\/oidc-server.u4a-system.svc/g" |\
sed "s/<replace-with-k8s-oidc-proxy-url>/https:\/\/${kubeProxyNodeIP}/g" |\
sed "s/<replace-with-oidc-server-url>/https:\/\/portal.${ingressNodeIP}.nip.io\/oidc/g" |\
sed "s/<replace-with-oidc-client-id>/bff-client/g"| \
sed "s/<replace-with-oidc-client-secret>/${secret}/g" \
> fabric-operator/values1.yaml
cat fabric-operator/values.yaml | sed "s/<replaced-ingress-nginx-ip>/${ingressNodeIP}/g" |
sed "s/<replaced-iam-server>/https:\/\/oidc-server.u4a-system.svc/g" |
sed "s/<replace-with-k8s-oidc-proxy-url>/https:\/\/${kubeProxyNodeIP}/g" |
sed "s/<replace-with-oidc-server-url>/https:\/\/portal.${ingressNodeIP}.nip.io\/oidc/g" |
sed "s/<replace-with-oidc-client-id>/bff-client/g" |
sed "s/<replace-with-oidc-client-secret>/${secret}/g" \
>fabric-operator/values1.yaml

# step 8. install fabric operator
kubectl create namespace baas-system;
helm -nbaas-system install fabric -f fabric-operator/values1.yaml --wait fabric-operator;
kubectl create namespace baas-system
helm -nbaas-system install fabric -f fabric-operator/values1.yaml --wait fabric-operator
echo "deploy fabric-operator successfully"
kubectl get po -nbaas-system
15 changes: 7 additions & 8 deletions scripts/kind.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,15 @@ function kind_up_cluster {

function pre_load_image() {
pre_load_images=(hyperledgerk8s/ubi-minimal:latest hyperledgerk8s/fabric-ca:iam-20230131
hyperledgerk8s/fabric-peer:2.4.7 hyperledgerk8s/fabric-peer:2.4.7
hyperledgerk8s/couchdb:3.2.2 hyperledgerk8s/fabric-orderer:2.4.7
hyperledgerk8s/fabric-console:latest hyperledgerk8s/grpc-web:latest)
for image in ${pre_load_images[*]}
do
hyperledgerk8s/fabric-peer:2.4.7 hyperledgerk8s/fabric-peer:2.4.7
hyperledgerk8s/couchdb:3.2.2 hyperledgerk8s/fabric-orderer:2.4.7
hyperledgerk8s/fabric-console:latest hyperledgerk8s/grpc-web:latest)
for image in ${pre_load_images[*]}; do
docker pull $image
kind load docker-image $image
done
}


export K8S_VERSION=v1.24; kind_up_cluster
pre_load_image
export K8S_VERSION=v1.24
kind_up_cluster
pre_load_image