github/flagger
1
0
Fork 0
mirror of https://github.com/fluxcd/flagger.git synced 2026-04-15 06:57:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

change CanaryAnalysis to Analysis left in tests

Browse Source
This commit is contained in:
mathetake
2020-03-10 11:25:57 +09:00
parent 8242e7691a
commit 1f6160148c
11 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/flagger/crd.yaml
+1 -1
View File
@@ -529,7 +529,7 @@ spec:
description: Mirror traffic to canary
type: boolean
mirrorWeight:
description: Weight of traffic to be mirrored when
description: Percentage of traffic to be mirrored
type: number
match:
description: A/B testing match conditions
charts/flagger/crds/crd.yaml
+1 -1
View File
@@ -529,7 +529,7 @@ spec:
description: Mirror traffic to canary
type: boolean
mirrorWeight:
description: Weight of traffic to be mirrored when
description: Percentage of traffic to be mirrored
type: number
match:
description: A/B testing match conditions
kustomize/base/flagger/crd.yaml
+1 -1
View File
@@ -529,7 +529,7 @@ spec:
description: Mirror traffic to canary
type: boolean
mirrorWeight:
description: Weight of traffic to be mirrored when
description: Percentage of traffic to be mirrored
type: number
match:
description: A/B testing match conditions
pkg/canary/deployment_fixture_test.go
+1 -1
View File
@@ -207,7 +207,7 @@ func newDeploymentControllerTestCanary() *flaggerv1.Canary {
Kind: "HorizontalPodAutoscaler",
}, Service: flaggerv1.CanaryService{
Port: 9898,
}, CanaryAnalysis: &flaggerv1.CanaryAnalysis{
}, Analysis: &flaggerv1.CanaryAnalysis{
Threshold: 10,
StepWeight: 10,
MaxWeight: 50,
pkg/controller/scheduler_daemonset_fixture_test.go
+3 -3
View File
@@ -249,7 +249,7 @@ func newDaemonSetTestCanary() *flaggerv1.Canary {
Kind: "DaemonSet",
}, Service: flaggerv1.CanaryService{
Port: 9898,
}, CanaryAnalysis: &flaggerv1.CanaryAnalysis{
}, Analysis: &flaggerv1.CanaryAnalysis{
Threshold: 10,
StepWeight: 10,
MaxWeight: 50,
@@ -288,7 +288,7 @@ func newDaemonSetTestCanary() *flaggerv1.Canary {
func newDaemonSetTestCanaryMirror() *flaggerv1.Canary {
cd := newDaemonSetTestCanary()
cd.Spec.CanaryAnalysis.Mirror = true
cd.Spec.Analysis.Mirror = true
return cd
}
@@ -306,7 +306,7 @@ func newDaemonSetTestCanaryAB() *flaggerv1.Canary {
Kind: "DaemonSet",
}, Service: flaggerv1.CanaryService{
Port: 9898,
}, CanaryAnalysis: &flaggerv1.CanaryAnalysis{
}, Analysis: &flaggerv1.CanaryAnalysis{
Threshold: 10,
Iterations: 10,
Match: []istiov1alpha3.HTTPMatchRequest{
pkg/controller/scheduler_daemonset_test.go
+2 -2
View File
@@ -55,7 +55,7 @@ func TestScheduler_DaemonSetRollback(t *testing.T) {
require.NoError(t, err)
cd := c.DeepCopy()
cd.Spec.CanaryAnalysis.Metrics = append(c.Spec.CanaryAnalysis.Metrics, flaggerv1.CanaryMetric{
cd.Spec.Analysis.Metrics = append(c.Spec.Analysis.Metrics, flaggerv1.CanaryMetric{
Name: "fail",
Interval: "1m",
ThresholdRange: &flaggerv1.CanaryThresholdRange{
@@ -437,7 +437,7 @@ func TestScheduler_DaemonSetAlerts(t *testing.T) {
defer ts.Close()
canary := newDaemonSetTestCanary()
canary.Spec.CanaryAnalysis.Alerts = []flaggerv1.CanaryAlert{
canary.Spec.Analysis.Alerts = []flaggerv1.CanaryAlert{
{
Name: "slack-dev",
Severity: "info",
pkg/controller/scheduler_deployment_fixture_test.go
+3 -3
View File
@@ -256,7 +256,7 @@ func newDeploymentTestCanary() *flaggerv1.Canary {
Kind: "HorizontalPodAutoscaler",
}, Service: flaggerv1.CanaryService{
Port: 9898,
}, CanaryAnalysis: &flaggerv1.CanaryAnalysis{
}, Analysis: &flaggerv1.CanaryAnalysis{
Threshold: 10,
StepWeight: 10,
MaxWeight: 50,
@@ -295,7 +295,7 @@ func newDeploymentTestCanary() *flaggerv1.Canary {
func newDeploymentTestCanaryMirror() *flaggerv1.Canary {
cd := newDeploymentTestCanary()
cd.Spec.CanaryAnalysis.Mirror = true
cd.Spec.Analysis.Mirror = true
return cd
}
@@ -318,7 +318,7 @@ func newDeploymentTestCanaryAB() *flaggerv1.Canary {
Kind: "HorizontalPodAutoscaler",
}, Service: flaggerv1.CanaryService{
Port: 9898,
}, CanaryAnalysis: &flaggerv1.CanaryAnalysis{
}, Analysis: &flaggerv1.CanaryAnalysis{
Threshold: 10,
Iterations: 10,
Match: []istiov1alpha3.HTTPMatchRequest{
pkg/controller/scheduler_deployment_test.go
+2 -2
View File
@@ -55,7 +55,7 @@ func TestScheduler_DeploymentRollback(t *testing.T) {
c, err := mocks.flaggerClient.FlaggerV1beta1().Canaries("default").Get("podinfo", metav1.GetOptions{})
require.NoError(t, err)
cd := c.DeepCopy()
cd.Spec.CanaryAnalysis.Metrics = append(c.Spec.CanaryAnalysis.Metrics, flaggerv1.CanaryMetric{
cd.Spec.Analysis.Metrics = append(c.Spec.Analysis.Metrics, flaggerv1.CanaryMetric{
Name: "fail",
Interval: "1m",
ThresholdRange: &flaggerv1.CanaryThresholdRange{
@@ -519,7 +519,7 @@ func TestScheduler_DeploymentAlerts(t *testing.T) {
defer ts.Close()
canary := newDeploymentTestCanary()
canary.Spec.CanaryAnalysis.Alerts = []flaggerv1.CanaryAlert{
canary.Spec.Analysis.Alerts = []flaggerv1.CanaryAlert{
{
Name: "slack-dev",
Severity: "info",
pkg/controller/scheduler_svc_test.go
+1 -1
View File
@@ -98,7 +98,7 @@ func newTestServiceCanary() *flaggerv1.Canary {
Service: flaggerv1.CanaryService{
Port: 9898,
},
CanaryAnalysis: &flaggerv1.CanaryAnalysis{
Analysis: &flaggerv1.CanaryAnalysis{
Threshold: 10,
StepWeight: 10,
MaxWeight: 50,
pkg/router/contour_test.go
+4 -4
View File
@@ -57,8 +57,8 @@ func TestContourRouter_Reconcile(t *testing.T) {
require.NoError(t, err)
cdClone = cd.DeepCopy()
cdClone.Spec.CanaryAnalysis.Iterations = 5
cdClone.Spec.CanaryAnalysis.Match = newTestABTest().Spec.CanaryAnalysis.Match
cdClone.Spec.Analysis.Iterations = 5
cdClone.Spec.Analysis.Match = newTestABTest().Spec.Analysis.Match
canary, err = mocks.flaggerClient.FlaggerV1beta1().Canaries("default").Update(cdClone)
require.NoError(t, err)
@@ -104,8 +104,8 @@ func TestContourRouter_Routes(t *testing.T) {
// test update to A/B
cdClone := cd.DeepCopy()
cdClone.Spec.CanaryAnalysis.Iterations = 5
cdClone.Spec.CanaryAnalysis.Match = newTestABTest().Spec.CanaryAnalysis.Match
cdClone.Spec.Analysis.Iterations = 5
cdClone.Spec.Analysis.Match = newTestABTest().Spec.Analysis.Match
canary, err := mocks.flaggerClient.FlaggerV1beta1().Canaries("default").Update(cdClone)
require.NoError(t, err)
pkg/router/router_test.go
+5 -5
View File
@@ -112,7 +112,7 @@ func newTestCanary() *flaggerv1.Canary {
"public-gateway.istio",
"mesh",
},
}, CanaryAnalysis: &flaggerv1.CanaryAnalysis{
}, Analysis: &flaggerv1.CanaryAnalysis{
Threshold: 10,
StepWeight: 10,
MaxWeight: 50,
@@ -158,7 +158,7 @@ func newTestCanaryAppMesh() *flaggerv1.Canary {
PerTryTimeout: "gateway-error",
RetryOn: "5s",
},
}, CanaryAnalysis: &flaggerv1.CanaryAnalysis{
}, Analysis: &flaggerv1.CanaryAnalysis{
Threshold: 10,
StepWeight: 10,
MaxWeight: 50,
@@ -203,7 +203,7 @@ func newTestSMICanary() *flaggerv1.Canary {
},
PortDiscovery: true,
},
CanaryAnalysis: &flaggerv1.CanaryAnalysis{
Analysis: &flaggerv1.CanaryAnalysis{
Threshold: 10,
StepWeight: 10,
MaxWeight: 50,
@@ -247,7 +247,7 @@ func newTestABTest() *flaggerv1.Canary {
Service: flaggerv1.CanaryService{
Port: 9898,
MeshName: "global",
}, CanaryAnalysis: &flaggerv1.CanaryAnalysis{
}, Analysis: &flaggerv1.CanaryAnalysis{
Threshold: 10,
Iterations: 2,
Match: []istiov1alpha3.HTTPMatchRequest{
@@ -397,7 +397,7 @@ func newTestCanaryIngress() *flaggerv1.Canary {
},
Service: flaggerv1.CanaryService{
Port: 9898,
}, CanaryAnalysis: &flaggerv1.CanaryAnalysis{
}, Analysis: &flaggerv1.CanaryAnalysis{
Threshold: 10,
StepWeight: 10,
MaxWeight: 50,