From 67a636690691cfb98c5449866a5ced89f44c4c51 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Sun, 6 Oct 2019 10:04:21 +0300 Subject: [PATCH] Add service.targetPort field to Canary CRD --- artifacts/flagger/crd.yaml | 5 +++++ charts/flagger/templates/crd.yaml | 5 +++++ kustomize/base/flagger/crd.yaml | 5 +++++ pkg/apis/flagger/v1alpha3/types.go | 10 ++++++---- pkg/apis/flagger/v1alpha3/zz_generated.deepcopy.go | 1 + 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/artifacts/flagger/crd.yaml b/artifacts/flagger/crd.yaml index fbf0c9a6..3adf4e07 100644 --- a/artifacts/flagger/crd.yaml +++ b/artifacts/flagger/crd.yaml @@ -118,6 +118,11 @@ spec: portName: description: Container port name type: string + targetPort: + description: Container target port name + anyOf: + - type: string + - type: number portDiscovery: description: Enable port dicovery type: boolean diff --git a/charts/flagger/templates/crd.yaml b/charts/flagger/templates/crd.yaml index 561e4fa1..e6bc20b9 100644 --- a/charts/flagger/templates/crd.yaml +++ b/charts/flagger/templates/crd.yaml @@ -119,6 +119,11 @@ spec: portName: description: Container port name type: string + targetPort: + description: Container target port name + anyOf: + - type: string + - type: number portDiscovery: description: Enable port dicovery type: boolean diff --git a/kustomize/base/flagger/crd.yaml b/kustomize/base/flagger/crd.yaml index fbf0c9a6..3adf4e07 100644 --- a/kustomize/base/flagger/crd.yaml +++ b/kustomize/base/flagger/crd.yaml @@ -118,6 +118,11 @@ spec: portName: description: Container port name type: string + targetPort: + description: Container target port name + anyOf: + - type: string + - type: number portDiscovery: description: Enable port dicovery type: boolean diff --git a/pkg/apis/flagger/v1alpha3/types.go b/pkg/apis/flagger/v1alpha3/types.go index d8ce519b..aad554f9 100644 --- a/pkg/apis/flagger/v1alpha3/types.go +++ b/pkg/apis/flagger/v1alpha3/types.go @@ -17,6 +17,7 @@ limitations under the License. package v1alpha3 import ( + "k8s.io/apimachinery/pkg/util/intstr" "time" istiov1alpha3 "github.com/weaveworks/flagger/pkg/apis/istio/v1alpha3" @@ -88,10 +89,11 @@ type CanaryList struct { // CanaryService is used to create ClusterIP services // and Istio Virtual Service type CanaryService struct { - Port int32 `json:"port"` - PortName string `json:"portName,omitempty"` - PortDiscovery bool `json:"portDiscovery"` - Timeout string `json:"timeout,omitempty"` + Port int32 `json:"port"` + PortName string `json:"portName,omitempty"` + TargetPort intstr.IntOrString `json:"targetPort,omitempty"` + PortDiscovery bool `json:"portDiscovery"` + Timeout string `json:"timeout,omitempty"` // Istio Gateways []string `json:"gateways,omitempty"` Hosts []string `json:"hosts,omitempty"` diff --git a/pkg/apis/flagger/v1alpha3/zz_generated.deepcopy.go b/pkg/apis/flagger/v1alpha3/zz_generated.deepcopy.go index 79e7d71d..55f12a94 100644 --- a/pkg/apis/flagger/v1alpha3/zz_generated.deepcopy.go +++ b/pkg/apis/flagger/v1alpha3/zz_generated.deepcopy.go @@ -159,6 +159,7 @@ func (in *CanaryMetric) DeepCopy() *CanaryMetric { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CanaryService) DeepCopyInto(out *CanaryService) { *out = *in + out.TargetPort = in.TargetPort if in.Gateways != nil { in, out := &in.Gateways, &out.Gateways *out = make([]string, len(*in))