Merge pull request #29 from cita-cloud/23-add-pullpolicy-parameter-in…

…-all-in-one-and-chain feat: add pullPolicy parameter in all-in-one and chain
cita-cloud · Mar 25, 2022 · 9a1fecf · 9a1fecf
2 parents d7a41d0 + 3acbd95
commit 9a1fecf
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 4 deletions.
diff --git a/api/allinone/allinone.pb.go b/api/allinone/allinone.pb.go
diff --git a/api/allinone/allinone.proto b/api/allinone/allinone.proto
@@ -26,6 +26,7 @@ message AllInOneCreateRequest {
   string logLevel = 19;
   string version = 20;
   string adminAddress = 21;
+  string pullPolicy = 22;
 }
 
 message AllInOneCreateResponse {

diff --git a/api/chain/chain.pb.go b/api/chain/chain.pb.go
diff --git a/api/chain/chain.proto b/api/chain/chain.proto
@@ -23,6 +23,7 @@ message Chain {
   string controllerImage = 14;
   string kmsImage = 15;
   string version = 16;
+  string pullPolicy = 17;
 }
 
 enum ConsensusType {

diff --git a/cli/command/allinone.go b/cli/command/allinone.go
@@ -19,6 +19,8 @@ package command
 import (
 	"time"
 
+	corev1 "k8s.io/api/core/v1"
+
 	citacloudv1 "github.com/cita-cloud/cita-cloud-operator/api/v1"
 	pb "github.com/cita-cloud/operator-proxy/api/allinone"
 	chainpb "github.com/cita-cloud/operator-proxy/api/chain"
@@ -71,6 +73,7 @@ func NewAllInOneCreateCommand() *cobra.Command {
 	cc.Flags().Int32VarP(&allInOneCreateRequest.NodeCount, "nodeCount", "", 3, "The node count for chain start.")
 	cc.Flags().StringVarP(&allInOneCreateRequest.Version, "version", "v", citacloudv1.LATEST_VERSION, "The chain's main version.")
 	cc.Flags().StringVarP(&allInOneCreateRequest.AdminAddress, "adminAddress", "a", "", "The chain's admin address.")
+	cc.Flags().StringVarP(&allInOneCreateRequest.PullPolicy, "pullPolicy", "", string(corev1.PullIfNotPresent), "The pull image policy (IfNotPresent/Always).")
 	return cc
 }
 

diff --git a/cli/command/chain.go b/cli/command/chain.go
@@ -19,6 +19,7 @@ package command
 import (
 	"errors"
 	citacloudv1 "github.com/cita-cloud/cita-cloud-operator/api/v1"
+	corev1 "k8s.io/api/core/v1"
 	"time"
 
 	"github.com/spf13/cobra"
@@ -75,6 +76,7 @@ func NewChainInitCommand() *cobra.Command {
 	cc.Flags().StringVarP(&initChainRequest.ControllerImage, "controllerImage", "", "", "The chain's controller image.")
 	cc.Flags().StringVarP(&initChainRequest.KmsImage, "kmsImage", "", "", "The chain's kms image.")
 	cc.Flags().StringVarP(&initChainRequest.Version, "version", "v", citacloudv1.LATEST_VERSION, "The chain's main version.")
+	cc.Flags().StringVarP(&initChainRequest.PullPolicy, "pullPolicy", "", string(corev1.PullIfNotPresent), "The pull image policy (IfNotPresent/Always).")
 
 	return cc
 }

diff --git a/server/service/allinone/all_in_one_service.go b/server/service/allinone/all_in_one_service.go
@@ -69,6 +69,7 @@ func (a allInOneServer) Create(ctx context.Context, request *pb.AllInOneCreateRe
 		ControllerImage: request.GetControllerImage(),
 		KmsImage:        request.GetKmsImage(),
 		Version:         request.GetVersion(),
+		PullPolicy:      request.GetPullPolicy(),
 	}
 	_, err := chainsvc.NewChainServer().Init(ctx, initChainReq)
 	if err != nil {

diff --git a/server/service/chain/chain_service.go b/server/service/chain/chain_service.go
@@ -21,6 +21,7 @@ import (
 	"github.com/cita-cloud/operator-proxy/pkg/utils"
 	"github.com/golang/protobuf/ptypes/empty"
 	"google.golang.org/protobuf/types/known/emptypb"
+	corev1 "k8s.io/api/core/v1"
 	"time"
 
 	"google.golang.org/grpc/codes"
@@ -90,6 +91,7 @@ func (c chainServer) setDefault(request *pb.Chain) (*citacloudv1.ChainConfig, er
 	// merge
 	chainConfig.MergeFromDefaultImageInfo(defaultImageInfo)
 
+	chainConfig.Spec.PullPolicy = corev1.PullPolicy(request.PullPolicy)
 	return chainConfig, nil
 }