revert changes. only enable service if weighted or template service n…

…ot nil Signed-off-by: Alex Eftimie <[email protected]>
argoproj · Nov 4, 2022 · fcbb31a · fcbb31a
1 parent b262cd1
commit fcbb31a
Show file tree

Hide file tree

Showing 15 changed files with 587 additions and 485 deletions.
diff --git a/manifests/crds/rollout-crd.yaml b/manifests/crds/rollout-crd.yaml
@@ -561,13 +561,16 @@ spec:
                                               type: string
                                             type: object
                                         type: object
+                                      service:
+                                        type: object
                                       specRef:
                                         type: string
                                       weight:
                                         format: int32
                                         type: integer
                                     required:
                                     - name
+                                    - service
                                     - specRef
                                     type: object
                                   type: array

diff --git a/manifests/install.yaml b/manifests/install.yaml
@@ -11571,13 +11571,16 @@ spec:
                                               type: string
                                             type: object
                                         type: object
+                                      service:
+                                        type: object
                                       specRef:
                                         type: string
                                       weight:
                                         format: int32
                                         type: integer
                                     required:
                                     - name
+                                    - service
                                     - specRef
                                     type: object
                                   type: array

diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml
@@ -11571,13 +11571,16 @@ spec:
                                               type: string
                                             type: object
                                         type: object
+                                      service:
+                                        type: object
                                       specRef:
                                         type: string
                                       weight:
                                         format: int32
                                         type: integer
                                     required:
                                     - name
+                                    - service
                                     - specRef
                                     type: object
                                   type: array

diff --git a/pkg/apiclient/rollout/rollout.swagger.json b/pkg/apiclient/rollout/rollout.swagger.json
@@ -1329,6 +1329,10 @@
           "type": "integer",
           "format": "int32",
           "title": "Weight sets the percentage of traffic the template's replicas should receive"
+        },
+        "service": {
+          "$ref": "#/definitions/github.com.argoproj.argo_rollouts.pkg.apis.rollouts.v1alpha1.TemplateService",
+          "title": "Service defines wether a service will be generated or not"
         }
       },
       "title": "RolloutExperimentTemplate defines the template used to create experiments for the Rollout's experiment canary step"
@@ -1725,6 +1729,9 @@
       },
       "description": "TLSRoute holds the information on the virtual service's TLS/HTTPS routes that are desired to be matched for changing weights."
     },
+    "github.com.argoproj.argo_rollouts.pkg.apis.rollouts.v1alpha1.TemplateService": {
+      "type": "object"
+    },
     "github.com.argoproj.argo_rollouts.pkg.apis.rollouts.v1alpha1.TraefikTrafficRouting": {
       "type": "object",
       "properties": {

diff --git a/pkg/apis/rollouts/v1alpha1/generated.pb.go b/pkg/apis/rollouts/v1alpha1/generated.pb.go
diff --git a/pkg/apis/rollouts/v1alpha1/generated.proto b/pkg/apis/rollouts/v1alpha1/generated.proto
diff --git a/pkg/apis/rollouts/v1alpha1/openapi_generated.go b/pkg/apis/rollouts/v1alpha1/openapi_generated.go
diff --git a/pkg/apis/rollouts/v1alpha1/types.go b/pkg/apis/rollouts/v1alpha1/types.go
@@ -534,6 +534,8 @@ type RolloutExperimentTemplate struct {
 	Selector *metav1.LabelSelector `json:"selector,omitempty" protobuf:"bytes,5,opt,name=selector"`
 	// Weight sets the percentage of traffic the template's replicas should receive
 	Weight *int32 `json:"weight,omitempty" protobuf:"varint,6,opt,name=weight"`
+	// Service defines wether a service will be generated or not
+	Service *TemplateService `json:"service,omitemepty" protobuf:"bytes,7,opt,name=service"`
 }
 
 // PodTemplateMetadata extra labels to add to the template

diff --git a/pkg/apis/rollouts/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/rollouts/v1alpha1/zz_generated.deepcopy.go
diff --git a/rollout/experiment.go b/rollout/experiment.go
@@ -64,7 +64,9 @@ func GetExperimentFromTemplate(r *v1alpha1.Rollout, stableRS, newRS *appsv1.Repl
 			Name:     templateStep.Name,
 			Replicas: templateStep.Replicas,
 		}
-		template.Service = &v1alpha1.TemplateService{}
+		if templateStep.Weight != nil || templateStep.Service != nil {
+		    template.Service = &v1alpha1.TemplateService{}
+		}
 		templateRS := &appsv1.ReplicaSet{}
 		switch templateStep.SpecRef {
 		case v1alpha1.CanarySpecRef:

diff --git a/rollout/experiment_test.go b/rollout/experiment_test.go
@@ -818,7 +818,7 @@ func TestRolloutCreateExperimentWithService(t *testing.T) {
 	assert.NotNil(t, ex.Spec.Templates[0].Service)
 
 	assert.Equal(t, "canary-template", ex.Spec.Templates[1].Name)
-	assert.NotNil(t, ex.Spec.Templates[1].Service)
+	assert.Nil(t, ex.Spec.Templates[1].Service)
 }
 
 func TestRolloutCreateExperimentWithServicePorts(t *testing.T) {
@@ -859,5 +859,5 @@ func TestRolloutCreateExperimentWithServicePorts(t *testing.T) {
 	assert.NotNil(t, ex.Spec.Templates[0].Service)
 
 	assert.Equal(t, "canary-template", ex.Spec.Templates[1].Name)
-	assert.NotNil(t, ex.Spec.Templates[1].Service)
+	assert.Nil(t, ex.Spec.Templates[1].Service)
 }
diff --git a/test/e2e/functional/experiment-dry-run-analysis.yaml b/test/e2e/functional/experiment-dry-run-analysis.yaml
@@ -28,6 +28,7 @@ spec:
   templates:
   - name: baseline
     replicas: 1
+    service: {}
     selector:
       matchLabels:
         app: experiment-with-dry-run

diff --git a/test/e2e/functional/experiment-measurement-retention-analysis.yaml b/test/e2e/functional/experiment-measurement-retention-analysis.yaml
@@ -31,6 +31,7 @@ spec:
   templates:
   - name: baseline
     replicas: 1
+    service: {}
     selector:
       matchLabels:
         app: experiment-with-mr

diff --git a/test/e2e/functional/experiment-with-service.yaml b/test/e2e/functional/experiment-with-service.yaml
@@ -9,11 +9,7 @@ spec:
   templates:
     - name: test
       replicas: 1
-      service:
-        ports:
-          - protocol: TCP
-            port: 80
-            targetPort: 8080
+      service: {}
       selector:
         matchLabels:
           app: experiment-with-service
@@ -29,3 +25,7 @@ spec:
                 requests:
                   memory: 16Mi
                   cpu: 1m
+              ports:
+                - protocol: TCP
+                  port: 80
+                  containerPort: 8080
diff --git a/ui/src/models/rollout/generated/api.ts b/ui/src/models/rollout/generated/api.ts
@@ -1185,6 +1185,12 @@ export interface GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1RolloutExpe
      * @memberof GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1RolloutExperimentTemplate
      */
     weight?: number;
+    /**
+     * 
+     * @type {GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1TemplateService}
+     * @memberof GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1RolloutExperimentTemplate
+     */
+    service?: GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1TemplateService;
 }
 /**
  * 
@@ -1698,6 +1704,13 @@ export interface GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1TLSRoute {
      */
     sniHosts?: Array<string>;
 }
+/**
+ * 
+ * @export
+ * @interface GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1TemplateService
+ */
+export interface GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1TemplateService {
+}
 /**
  * 
  * @export