updated

Signed-off-by: Michael Wilkerson <[email protected]>
argoproj-labs · Feb 8, 2024 · 1aab36f · 1aab36f
1 parent b6db2ac
commit 1aab36f
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 29 deletions.
diff --git a/testing/install.yaml b/testing/install.yaml
@@ -179,6 +179,19 @@ spec:
                             type: object
                           datadog:
                             properties:
+                              aggregator:
+                                default: last
+                                enum:
+                                  - avg
+                                  - min
+                                  - max
+                                  - sum
+                                  - last
+                                  - percentile
+                                  - mean
+                                  - l2norm
+                                  - area
+                                type: string
                               apiVersion:
                                 default: v1
                                 enum:
@@ -3002,11 +3015,26 @@ spec:
                   type: array
                 terminate:
                   type: boolean
+                ttlStrategy:
+                  properties:
+                    secondsAfterCompletion:
+                      format: int32
+                      type: integer
+                    secondsAfterFailure:
+                      format: int32
+                      type: integer
+                    secondsAfterSuccess:
+                      format: int32
+                      type: integer
+                  type: object
               required:
                 - metrics
               type: object
             status:
               properties:
+                completedAt:
+                  format: date-time
+                  type: string
                 dryRunSummary:
                   properties:
                     count:
@@ -3300,6 +3328,19 @@ spec:
                             type: object
                           datadog:
                             properties:
+                              aggregator:
+                                default: last
+                                enum:
+                                  - avg
+                                  - min
+                                  - max
+                                  - sum
+                                  - last
+                                  - percentile
+                                  - mean
+                                  - l2norm
+                                  - area
+                                type: string
                               apiVersion:
                                 default: v1
                                 enum:
@@ -6307,6 +6348,19 @@ spec:
                             type: object
                           datadog:
                             properties:
+                              aggregator:
+                                default: last
+                                enum:
+                                  - avg
+                                  - min
+                                  - max
+                                  - sum
+                                  - last
+                                  - percentile
+                                  - mean
+                                  - l2norm
+                                  - area
+                                type: string
                               apiVersion:
                                 default: v1
                                 enum:
@@ -11880,11 +11934,13 @@ spec:
           jsonPath: .status.replicas
           name: Current
           type: integer
-        - description: Total number of non-terminated pods targeted by this rollout that have the desired template spec
+        - description: Total number of non-terminated pods targeted by this rollout that
+            have the desired template spec
           jsonPath: .status.updatedReplicas
           name: Up-to-date
           type: integer
-        - description: Total number of available pods (ready for at least minReadySeconds) targeted by this rollout
+        - description: Total number of available pods (ready for at least minReadySeconds)
+            targeted by this rollout
           jsonPath: .status.availableReplicas
           name: Available
           type: integer
@@ -12667,19 +12723,6 @@ spec:
                                     - name
                                   type: object
                               type: object
-                            consul:
-                              properties:
-                                canarySubsetName:
-                                  type: string
-                                serviceName:
-                                  type: string
-                                stableSubsetName:
-                                  type: string
-                              required:
-                                - canarySubsetName
-                                - serviceName
-                                - stableSubsetName
-                              type: object
                             istio:
                               properties:
                                 destinationRule:
@@ -15735,17 +15778,6 @@ rules:
       - get
       - update
       - patch
-  - apiGroups:
-      - consul.hashicorp.com
-    resources:
-      - servicesplitters
-      - serviceresolvers
-    verbs:
-      - create
-      - watch
-      - get
-      - update
-      - patch
   - apiGroups:
       - getambassador.io
       - x.getambassador.io
@@ -15958,7 +15990,7 @@ spec:
     matchLabels:
       app.kubernetes.io/name: argo-rollouts
   strategy:
-    type: Recreate
+    type: RollingUpdate
   template:
     metadata:
       labels:

diff --git a/testing/makefile b/testing/makefile
@@ -44,14 +44,14 @@ consul-setup: kind deploy
 kind: kind-delete
 	kind create cluster --image kindest/node:$(KUBERNETES_VERSION) --name=dc1 --config ./resources/kind_config.yaml
 
-add-helm-Repo:
+add-helm-repo:
 	helm repo add hashicorp https://helm.releases.hashicorp.com
 
 kind-delete:
 	kind delete cluster --name=dc1
 
 deploy:
-	helm install consul hashicorp/consul --version $(CONSUL_K8S_CHART_VERSION) -f values.yaml
+	helm repo update; helm install consul hashicorp/consul --version $(CONSUL_K8S_CHART_VERSION) -f values.yaml
 
 # Install Argo
 argo-setup: deploy-argo apply-crds