[create-pull-request] automated change

chronosphereio · Oct 20, 2023 · d764a21 · d764a21
1 parent 16d00d2
commit d764a21
Show file tree

Hide file tree

Showing 5 changed files with 108 additions and 34 deletions.
diff --git a/spec/open-api.yml b/spec/open-api.yml
@@ -198,6 +198,14 @@ components:
         - failed
         - running
         - ok
+    PipelinePortKind:
+      type: string
+      description: The kind/type of the service associated to this port.
+      default: LoadBalancer
+      enum:
+        - LoadBalancer
+        - ClusterIP
+        - NodePort
     PipelinePortProtocol:
       type: string
       description: Valid protocol types defined for a pipelines.
@@ -1564,6 +1572,8 @@ components:
         protocol:
           type: string
           example: tcp
+        kind:
+          $ref: "#/components/schemas/PipelinePortKind"
         frontendPort:
           type: integer
           format: int32
@@ -1598,6 +1608,7 @@ components:
       required:
         - id
         - protocol
+        - kind
         - frontendPort
         - backendPort
         - endpoint
@@ -2083,6 +2094,8 @@ components:
           type: integer
           format: int32
           minimum: 0
+        healthCheckPipelinePortKind:
+          $ref: "#/components/schemas/PipelinePortKind"
         metadata:
           type: object
           nullable: true
@@ -2104,6 +2117,7 @@ components:
         - version
         - addHealthCheckPipeline
         - healthCheckPipelinePort
+        - healthCheckPipelinePortKind
     UpdateAggregator:
       description: Update aggregator request body.
       type: object
@@ -2349,6 +2363,14 @@ components:
           nullable: true
           default: null
           additionalProperties: true
+        portKind:
+          type: string
+          description: Kind of service for the service/ports created under this pipeline.
+          default: LoadBalancer
+          enum:
+            - LoadBalancer
+            - ClusterIP
+            - NodePort
       required:
         - name
         - replicasCount
@@ -2358,6 +2380,7 @@ components:
         - files
         - resourceProfile
         - skipConfigValidation
+        - portKind
     UpdatePipeline:
       description: Update pipeline request body.
       type: object
@@ -2475,7 +2498,16 @@ components:
             - STARTED
             - SCALING
             - CHECKS_OK
-            - CHECKS_FAILED
+            - CHECKS_FAILED            -
+        portKind:
+          type: string
+          description: Kind of service for the service/ports created for this pipeline.
+          default: null
+          nullable: true
+          enum:
+            - LoadBalancer
+            - ClusterIP
+            - NodePort
         events:
           type: array
           nullable: true
@@ -2701,11 +2733,14 @@ components:
           minimum: 0
         endpoint:
           type: string
+        kind:
+          $ref: "#/components/schemas/PipelinePortKind"
       required:
         - protocol
         - frontendPort
         - backendPort
         - endpoint
+        - kind
     UpdatePipelinePort:
       description: Update pipeline port request body.
       type: object
@@ -2729,6 +2764,15 @@ components:
           type: string
           nullable: true
           default: null
+        kind:
+          type: string
+          description: The kind/type of the service associated to this port.
+          default: null
+          nullable: true
+          enum:
+            - LoadBalancer
+            - ClusterIP
+            - NodePort
     ValidatingConfig:
       description: Validating configuration request body.
       type: object
@@ -3002,6 +3046,10 @@ components:
         id:
           type: string
           format: uuid
+        kind:
+          type: string
+          default: null
+          nullable: true
         pluginID:
           type: string
           nullable: true

diff --git a/types/core_instance.go b/types/core_instance.go
@@ -7,7 +7,7 @@ import (
 )
 
 const (
-	DefaultCoreInstanceVersion = "v0.1.12"
+	DefaultCoreInstanceVersion = "v2.0-dev"
 )
 
 // CoreInstance model.
@@ -156,16 +156,17 @@ type MetadataGCP struct {
 
 // CreateCoreInstance request payload for creating a new core instance.
 type CreateCoreInstance struct {
-	Name                    string               `json:"name"`
-	Version                 string               `json:"version"`
-	AddHealthCheckPipeline  bool                 `json:"addHealthCheckPipeline"`
-	HealthCheckPipelinePort uint                 `json:"healthCheckPipelinePort"`
-	ClusterLogging          bool                 `json:"clusterLogging"`
-	Tags                    []string             `json:"tags"`
-	Image                   *string              `json:"image"`
-	Metadata                CoreInstanceMetadata `json:"metadata"`
-	EnvironmentID           string               `json:"environmentID"`
-	SkipServiceCreation     bool                 `json:"skipServiceCreation"`
+	Name                        string               `json:"name"`
+	Version                     string               `json:"version"`
+	AddHealthCheckPipeline      bool                 `json:"addHealthCheckPipeline"`
+	HealthCheckPipelinePort     uint                 `json:"healthCheckPipelinePort"`
+	HealthCheckPipelinePortKind PipelinePortKind     `json:"healthCheckPipelinePortKind"`
+	ClusterLogging              bool                 `json:"clusterLogging"`
+	Tags                        []string             `json:"tags"`
+	Image                       *string              `json:"image"`
+	Metadata                    CoreInstanceMetadata `json:"metadata"`
+	EnvironmentID               string               `json:"environmentID"`
+	SkipServiceCreation         bool                 `json:"skipServiceCreation"`
 
 	id           string
 	signingKey   []byte

diff --git a/types/errs/pipeline_port.go b/types/errs/pipeline_port.go
@@ -7,6 +7,7 @@ const (
 	InvalidPipelinePortProtocol = InvalidArgumentError("invalid pipeline port protocol")
 	InvalidPipelinePortNumber   = InvalidArgumentError("invalid pipeline port number")
 	InvalidPipelinePortEndpoint = InvalidArgumentError("invalid pipeline port endpoint")
+	InvalidPipelinePortKind     = InvalidArgumentError("invalid pipeline port type")
 	PipelinePortNotFound        = NotFoundError("pipeline port not found")
 	PipelinePortInUse           = ConflictError("pipeline port already in use")
 )

diff --git a/types/pipeline.go b/types/pipeline.go
@@ -141,6 +141,9 @@ type CreatePipeline struct {
 	// will be executed.
 	WaitForChecksBeforeDeploying bool `json:"waitForChecksBeforeDeploying"`
 
+	// The default portKind to be used for input ports that belongs to this pipeline.
+	PortKind PipelinePortKind `json:"portKind"`
+
 	status PipelineStatusKind
 	// Internal denotes that this pipeline was created by the system.
 	// That's the case for the "health-check-*" automated pipeline
@@ -251,6 +254,7 @@ type UpdatePipeline struct {
 	Status             *PipelineStatusKind `json:"status"`
 	ConfigFormat       *ConfigFormat       `json:"configFormat"`
 	DeploymentStrategy *DeploymentStrategy `json:"deploymentStrategy"`
+	PortKind           *PipelinePortKind   `json:"portKind"`
 	ReplicasCount      *uint               `json:"replicasCount"`
 	RawConfig          *string             `json:"rawConfig"`
 	ResourceProfile    *string             `json:"resourceProfile"`

diff --git a/types/pipeline_port.go b/types/pipeline_port.go
@@ -16,18 +16,33 @@ var AllPipelinePortProtocols = [...]PipelinePortProtocol{
 	PipelineProtocolUDP,
 }
 
+type PipelinePortKind string
+
+const (
+	PipelinePortKindClusterIP    PipelinePortKind = "ClusterIP"
+	PipelinePortKindLoadBalancer PipelinePortKind = "LoadBalancer"
+	PipelinePortKindNodePort     PipelinePortKind = "NodePort"
+)
+
+var AllValidPipelinePortKinds = [...]PipelinePortKind{
+	PipelinePortKindClusterIP,
+	PipelinePortKindLoadBalancer,
+	PipelinePortKindNodePort,
+}
+
 // PipelinePort model.
 type PipelinePort struct {
-	ID           string    `json:"id" yaml:"id"`
-	Protocol     string    `json:"protocol" yaml:"protocol"`
-	FrontendPort uint      `json:"frontendPort" yaml:"frontendPort"`
-	BackendPort  uint      `json:"backendPort" yaml:"backendPort"`
-	Endpoint     string    `json:"endpoint" yaml:"endpoint"`
-	PluginID     *string   `json:"pluginID" yaml:"pluginID"`
-	PluginName   *string   `json:"pluginName" yaml:"pluginName"`
-	PluginAlias  *string   `json:"pluginAlias" yaml:"pluginAlias"`
-	CreatedAt    time.Time `json:"createdAt" yaml:"createdAt"`
-	UpdatedAt    time.Time `json:"updatedAt" yaml:"updatedAt"`
+	ID           string           `json:"id" yaml:"id"`
+	Protocol     string           `json:"protocol" yaml:"protocol"`
+	FrontendPort uint             `json:"frontendPort" yaml:"frontendPort"`
+	BackendPort  uint             `json:"backendPort" yaml:"backendPort"`
+	Kind         PipelinePortKind `json:"kind" yaml:"kind"`
+	Endpoint     string           `json:"endpoint" yaml:"endpoint"`
+	PluginID     *string          `json:"pluginID" yaml:"pluginID"`
+	PluginName   *string          `json:"pluginName" yaml:"pluginName"`
+	PluginAlias  *string          `json:"pluginAlias" yaml:"pluginAlias"`
+	CreatedAt    time.Time        `json:"createdAt" yaml:"createdAt"`
+	UpdatedAt    time.Time        `json:"updatedAt" yaml:"updatedAt"`
 }
 
 // PipelinePorts paginated list.
@@ -38,14 +53,14 @@ type PipelinePorts struct {
 
 // CreatePipelinePort request payload for creating a pipeline port.
 type CreatePipelinePort struct {
-	Protocol     string `json:"protocol"`
-	FrontendPort uint   `json:"frontendPort"`
-	BackendPort  uint   `json:"backendPort"`
-	Endpoint     string `json:"endpoint"`
-
-	pluginID    *string
-	pluginName  *string
-	pluginAlias *string
+	Protocol     string           `json:"protocol"`
+	FrontendPort uint             `json:"frontendPort"`
+	BackendPort  uint             `json:"backendPort"`
+	Endpoint     string           `json:"endpoint"`
+	Kind         PipelinePortKind `json:"kind"`
+	pluginID     *string
+	pluginName   *string
+	pluginAlias  *string
 }
 
 func CreatePipelinePortWithOpts(base CreatePipelinePort, pluginID, pluginName, pluginAlias *string) CreatePipelinePort {
@@ -63,6 +78,10 @@ func (in *CreatePipelinePort) SetPluginName(pluginName string) {
 	in.pluginName = &pluginName
 }
 
+func (in *CreatePipelinePort) SetPortKind(kind PipelinePortKind) {
+	in.Kind = kind
+}
+
 func (in *CreatePipelinePort) SetPluginAlias(pluginAlias string) {
 	in.pluginAlias = &pluginAlias
 }
@@ -96,8 +115,9 @@ type PipelinePortsParams struct {
 
 // UpdatePipelinePort request payload for updating a pipeline port.
 type UpdatePipelinePort struct {
-	Protocol     *string `json:"protocol"`
-	FrontendPort *uint   `json:"frontendPort"`
-	BackendPort  *uint   `json:"backendPort"`
-	Endpoint     *string `json:"endpoint"`
+	Protocol     *string           `json:"protocol"`
+	FrontendPort *uint             `json:"frontendPort"`
+	BackendPort  *uint             `json:"backendPort"`
+	Endpoint     *string           `json:"endpoint"`
+	Kind         *PipelinePortKind `json:"kind"`
 }