Merge pull request #97 from Abirdcfly/addhealthz

Fix #82
bestchains · Feb 10, 2023 · fb2cb50 · fb2cb50
2 parents ddaa07c + 8492eb7
commit fb2cb50
Show file tree

Hide file tree

Showing 5 changed files with 235 additions and 83 deletions.
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -72,16 +72,24 @@ spec:
           livenessProbe:
             failureThreshold: 5
             initialDelaySeconds: 10
-            tcpSocket:
-              port: 8383
+            httpGet:
+              path: /healthz
+              port: 8081
             timeoutSeconds: 5
           name: operator
           readinessProbe:
             initialDelaySeconds: 10
             periodSeconds: 5
-            tcpSocket:
-              port: 8383
+            httpGet:
+              path: /readyz
+              port: 8081
             timeoutSeconds: 5
+          startupProbe:
+            httpGet:
+              path: /readyz
+              port: 8081
+            failureThreshold: 100
+            periodSeconds: 5
           resources:
             limits:
               cpu: "2"

diff --git a/config/samples/example-test.sh b/config/samples/example-test.sh
@@ -129,32 +129,20 @@ EOF
 kind create cluster --name=${KindName} --wait=${Timeout} --config=${KindConfigPath} --image=kindest/node:$KindVersion
 workerNode1IP=$(kubectl get nodes ${KindName}-worker --no-headers=true -o wide | awk '{print $6}')
 workerNode2IP=$(kubectl get nodes ${KindName}-worker2 --no-headers=true -o wide | awk '{print $6}')
-if [[ $? -ne 0 ]]; then
-	exit $?
-fi
 
 info "2. install component in kubernetes..."
 git clone https://github.com/bestchains/installer.git ${InstallDirPath}
-if [[ $? -ne 0 ]]; then
-	exit $?
-fi
 
 info "2.1 install u4a-component..."
 kubectl create ns u4a-system
 sed -i -e "s/<replaced-ingress-node-name>/${KindName}-worker/g" ${InstallDirPath}/u4a-component/charts/cluster-component/values.yaml
 helm install --wait --timeout=${HelmTimeout} cluster-component -n u4a-system ${InstallDirPath}/u4a-component/charts/cluster-component
-if [[ $? -ne 0 ]]; then
-	exit $?
-fi
 
 info "2.2 install u4a services"
 sed -i -e "s/<replaced-ingress-nginx-ip>/${workerNode1IP}/g" ${InstallDirPath}/u4a-component/values.yaml
 sed -i -e "s/<replaced-oidc-proxy-node-name>/${KindName}-worker2/g" ${InstallDirPath}/u4a-component/values.yaml
 sed -i -e "s/<replaced-k8s-ip-with-oidc-enabled>/${workerNode2IP}/g" ${InstallDirPath}/u4a-component/values.yaml
 helm install --wait --timeout=${HelmTimeout} u4a-component -n u4a-system ${InstallDirPath}/u4a-component
-if [[ $? -ne 0 ]]; then
-	exit $?
-fi
 
 info "2.3 install fabric-operator"
 #TODO change this image's tag
@@ -165,8 +153,7 @@ export IMG=hyperledgerk8s/fabric-operator:example-e2e
 export IMAGE_PULL_POLICY=IfNotPresent
 make deploy
 kubectl set env -n operator-system deployment/operator-controller-manager OPERATOR_INGRESS_DOMAIN=${workerNode1IP}.nip.io
-#TODO delete sleep after finish https://github.com/bestchains/fabric-operator/issues/82
-sleep 30
+kubectl wait deploy -n operator-system operator-controller-manager --for condition=Available=True
 
 info "3. create user and get user's token"
 info "3.1 create all test users"

diff --git a/go.mod b/go.mod
@@ -22,15 +22,15 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/viper v1.7.0
 	github.com/vrischmann/envconfig v1.3.0
-	go.uber.org/zap v1.17.0
+	go.uber.org/zap v1.19.0
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.21.5
-	k8s.io/apiextensions-apiserver v0.21.5
-	k8s.io/apimachinery v0.21.5
-	k8s.io/client-go v0.21.5
-	k8s.io/code-generator v0.21.5
-	k8s.io/utils v0.0.0-20210527160623-6fdb442a123b
-	sigs.k8s.io/controller-runtime v0.9.0
+	k8s.io/api v0.22.2
+	k8s.io/apiextensions-apiserver v0.22.2
+	k8s.io/apimachinery v0.22.2
+	k8s.io/client-go v0.22.2
+	k8s.io/code-generator v0.22.2
+	k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a
+	sigs.k8s.io/controller-runtime v0.10.3
 	sigs.k8s.io/yaml v1.2.0
 )
 
@@ -43,6 +43,7 @@ require (
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
 	github.com/Shopify/sarama v1.30.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
 	github.com/consensys/gnark-crypto v0.6.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
@@ -57,13 +58,12 @@ require (
 	github.com/go-kit/kit v0.10.0 // indirect
 	github.com/go-logfmt/logfmt v0.5.0 // indirect
 	github.com/go-logr/zapr v0.4.0 // indirect
-	github.com/go-openapi/jsonpointer v0.19.3 // indirect
-	github.com/go-openapi/jsonreference v0.19.3 // indirect
-	github.com/go-openapi/spec v0.19.5 // indirect
-	github.com/go-openapi/swag v0.19.5 // indirect
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
+	github.com/go-openapi/jsonreference v0.19.5 // indirect
+	github.com/go-openapi/swag v0.19.14 // indirect
 	github.com/go-sql-driver/mysql v1.5.0 // indirect
 	github.com/go-stack/stack v1.8.1 // indirect
-	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/mock v1.4.3 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
@@ -77,7 +77,6 @@ require (
 	github.com/grantae/certinfo v0.0.0-20170412194111-59d56a35515b // indirect
 	github.com/hashicorp/go-uuid v1.0.2 // indirect
 	github.com/hashicorp/go-version v1.2.0 // indirect
-	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hyperledger/fabric-amcl v0.0.0-20210603140002-2670f91851c8 // indirect
 	github.com/hyperledger/fabric-config v0.0.5 // indirect
@@ -90,11 +89,12 @@ require (
 	github.com/jinzhu/copier v0.3.5 // indirect
 	github.com/jmhodges/clock v0.0.0-20160418191101-880ee4c33548 // indirect
 	github.com/jmoiron/sqlx v1.3.4 // indirect
-	github.com/json-iterator/go v1.1.10 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.11 // indirect
 	github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46 // indirect
 	github.com/klauspost/compress v1.13.6 // indirect
 	github.com/magiconair/properties v1.8.5 // indirect
-	github.com/mailru/easyjson v0.7.0 // indirect
+	github.com/mailru/easyjson v0.7.6 // indirect
 	github.com/mattn/go-sqlite3 v1.14.9 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
 	github.com/miekg/pkcs11 v1.0.3 // indirect
@@ -109,8 +109,8 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_golang v1.11.0 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.10.0 // indirect
-	github.com/prometheus/procfs v0.2.0 // indirect
+	github.com/prometheus/common v0.26.0 // indirect
+	github.com/prometheus/procfs v0.6.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/spf13/afero v1.6.0 // indirect
 	github.com/spf13/cast v1.3.1 // indirect
@@ -131,23 +131,23 @@ require (
 	golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
+	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
 	golang.org/x/tools v0.1.10 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
-	google.golang.org/grpc v1.31.0 // indirect
+	google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
+	google.golang.org/grpc v1.38.0 // indirect
 	google.golang.org/protobuf v1.26.0 // indirect
 	gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.51.0 // indirect
 	gopkg.in/ldap.v2 v2.5.1 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	k8s.io/component-base v0.21.5 // indirect
+	k8s.io/component-base v0.22.2 // indirect
 	k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 // indirect
-	k8s.io/klog/v2 v2.8.0 // indirect
-	k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 // indirect
+	k8s.io/klog/v2 v2.9.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
 )
 
@@ -156,5 +156,4 @@ replace (
 	github.com/gorilla/handlers => github.com/gorilla/handlers v1.4.0 // Needed for fabric-ca
 	github.com/gorilla/mux => github.com/gorilla/mux v1.7.3 // Needed for fabric-ca
 	github.com/hyperledger/fabric => github.com/hyperledger/fabric v0.0.0-20191027202024-115c7a2205a6
-	github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.0 // Needed for fabric-ca
 )