fix:context

Author: tester-rep

.gitignore

@@ -1,3 +1,4 @@
 main
 /deploy
 .idea
+./release-app/release_app

Makefile

@@ -1,12 +1,18 @@
-BUILDX_BUILD_PUSH=docker buildx build --platform linux/amd64,linux/arm64 --output=type=registry --push
-
-build-push-image-%: ## build docker image
+build-image-%: ## build docker image
 	if [ "$*" = "latest" ];then \
-	$(BUILDX_BUILD_PUSH) -t openpitrix/release-app:latest . && \
+	docker build -t openpitrix/release-app:latest . ;\
 	elif [ "`echo "$*" | grep -E "^v[0-9]+\.[0-9]+\.[0-9]+"`" != "" ];then \
-	$(BUILDX_BUILD_PUSH) -t openpitrix/release-app:$* . && \
+	docker build -t openpitrix/release-app:$* . ;\
 	fi
 
+push-image-%: ## push docker image
+	@if [ "$*" = "latest" ];then \
+	docker push openpitrix/release-app:latest; \
+	elif [ "`echo "$*" | grep -E "^v[0-9]+\.[0-9]+\.[0-9]+"`" != "" ];then \
+	docker push openpitrix/release-app:$*; \
+	fi
+
+
 .PHONY: build
 build:
 	docker build -t openpitrix/release-app:latest .

go.mod

@@ -13,4 +13,4 @@ require (
 	openpitrix.io/openpitrix v0.4.1
 )
 
-replace openpitrix.io/openpitrix => openpitrix.io/openpitrix v0.4.1-0.20191016075209-5d9de76b4fea
+replace openpitrix.io/openpitrix => openpitrix.io/openpitrix v0.4.2

go.sum

@@ -111,3 +111,5 @@ openpitrix.io/openpitrix v0.4.1-0.20191015160942-0202761f0f49/go.mod h1:8rZSFeUp
 openpitrix.io/openpitrix v0.4.1-0.20191016075209-5d9de76b4fea/go.mod h1:8rZSFeUp2Np5kfKAXfRL/1HSh6BYywNCALt+ZnxFQ/4=
 openpitrix.io/openpitrix v0.4.1 h1:Hzcw143qia7QJVfA7qE/nQCgOag9+0XrIiw1oLxSxos=
 openpitrix.io/openpitrix v0.4.1/go.mod h1:8rZSFeUp2Np5kfKAXfRL/1HSh6BYywNCALt+ZnxFQ/4=
+openpitrix.io/openpitrix v0.4.2 h1:VpPfB703BTAH3vnNLElypz5UgxOAXAL03V0JIr7Dg0o=
+openpitrix.io/openpitrix v0.4.2/go.mod h1:8rZSFeUp2Np5kfKAXfRL/1HSh6BYywNCALt+ZnxFQ/4=

release-app-job.yaml

@@ -19,11 +19,20 @@ spec:
         version: v0.0.1
       name: hyperpitrix-release-app-job
     spec:
+      initContainers:
+      - name: wait-app-manager
+        image: busybox:1.28.4
+        imagePullPolicy: IfNotPresent
+        command: ['sh', '-c', 'until nc -z openpitrix-app-manager.${NAMESPACE}.svc 9102; do echo "waiting for app-manager"; sleep 2; done;']
+      - name: wait-attachment-manager
+        image: busybox:1.28.4
+        imagePullPolicy: IfNotPresent
+        command: ['sh', '-c', 'until nc -z openpitrix-attachment-manager.${NAMESPACE}.svc 9122; do echo "waiting for attachment-manager"; sleep 2; done;']
       containers:
       - command: ["release-app","-path","/data/helm-pkg/"]
         name: hyperpitrix-release-app-job
         imagePullPolicy: IfNotPresent
-        image: openpitrix/release-app
+        image: openpitrix/release-app:v0.4.2
       restartPolicy: OnFailure
       dnsPolicy: ClusterFirst
       schedulerName: default-scheduler

release-app/release_app

@@ -8,6 +8,8 @@ import (
 	"openpitrix.io/openpitrix/pkg/client/app"
 	"openpitrix.io/openpitrix/pkg/logger"
 	"openpitrix.io/openpitrix/pkg/pb"
+	"openpitrix.io/openpitrix/pkg/sender"
+	"openpitrix.io/openpitrix/pkg/util/ctxutil"
 	"openpitrix.io/openpitrix/pkg/util/pbutil"
 	"strings"
 )
@@ -19,7 +21,7 @@ func main() {
 
 	fileInfoList, err := ioutil.ReadDir(path)
 	if err != nil {
-		logger.Error(nil, "read dir path error: %s",err.Error())
+		logger.Error(nil, "read dir path error: %s", err.Error())
 	}
 
 	for _, f := range fileInfoList {
@@ -42,34 +44,40 @@ func main() {
 
 		createReq := &pb.CreateAppRequest{
 			VersionPackage: pbutil.ToProtoBytes(pkg),
-			Name:    pbutil.ToProtoString(appName),
+			Name:           pbutil.ToProtoString(appName),
 			VersionType:    pbutil.ToProtoString("helm"),
 		}
 
-		res, err := client.CreateApp(context.Background(), createReq)
+		ctxFunc := func() (ctx context.Context){
+			ctx = context.Background()
+			ctx = ctxutil.ContextWithSender(ctx, sender.GetSystemSender())
+			return
+		}
+		res, err := client.CreateApp(ctxFunc(), createReq)
 		if err != nil {
 			logger.Error(nil, "create app error: %s", err.Error())
 		} else {
 			submitReq := &pb.SubmitAppVersionRequest{
 				VersionId: res.VersionId,
 			}
-			_, err = client.SubmitAppVersion(context.Background(), submitReq)
+
+			_, err = client.SubmitAppVersion(ctxFunc(), submitReq)
 			if err != nil {
 				logger.Error(nil, "submit app error: %s", err.Error())
 			}
 
 			passReq := &pb.PassAppVersionRequest{
 				VersionId: res.VersionId,
 			}
-			_, err = client.AdminPassAppVersion(context.Background(), passReq)
+			_, err = client.AdminPassAppVersion(ctxFunc(), passReq)
 			if err != nil {
 				logger.Error(nil, "pass app error: %s", err.Error())
 			}
 
 			releaseReq := &pb.ReleaseAppVersionRequest{
 				VersionId: res.VersionId,
 			}
-			_, err = client.ReleaseAppVersion(context.Background(), releaseReq)
+			_, err = client.ReleaseAppVersion(ctxFunc(), releaseReq)
 			if err != nil {
 				logger.Error(nil, "release app error: %s", err.Error())
 			}