Skip to content

Commit 02be501

Browse files
jgwestjgwest
authored
Update to latest commit of argo-rollouts-manager '85db81b64541a2e0f10616acca8b24ac63f46b42' (#799)
Signed-off-by: Jonathan West <[email protected]>
1 parent 48d822e commit 02be501

File tree

6 files changed

+142
-5
lines changed

6 files changed

+142
-5
lines changed

‎bundle/manifests/argoproj.io_rolloutmanagers.yaml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,15 @@ spec:
228228
items:
229229
type: string
230230
type: array
231+
ha:
232+
description: HA options for High Availability support for Rollouts.
233+
properties:
234+
enabled:
235+
description: Enabled will toggle HA support globally for RolloutManager.
236+
type: boolean
237+
required:
238+
- enabled
239+
type: object
231240
image:
232241
description: Image defines Argo Rollouts controller image (optional)
233242
type: string
@@ -286,6 +295,65 @@ spec:
286295
type: object
287296
type: array
288297
type: object
298+
plugins:
299+
description: Plugins specify the traffic and metric plugins in Argo
300+
Rollout
301+
properties:
302+
metric:
303+
description: Metric holds a list of metric plugins used to gather
304+
and report metrics during rollouts.
305+
items:
306+
description: Plugin is used to integrate traffic management
307+
and metric plugins into the Argo Rollouts controller. For
308+
more information on these plugins, see the upstream Argo Rollouts
309+
documentation.
310+
properties:
311+
location:
312+
description: Location supports http(s):// urls and file://,
313+
though file:// requires the plugin be available on the
314+
filesystem
315+
type: string
316+
name:
317+
description: Name of the plugin, it must match the name
318+
required by the plugin so it can find its configuration
319+
type: string
320+
sha256:
321+
description: SHA256 is an optional sha256 checksum of the
322+
plugin executable
323+
type: string
324+
required:
325+
- location
326+
- name
327+
type: object
328+
type: array
329+
trafficManagement:
330+
description: TrafficManagement holds a list of traffic management
331+
plugins used to control traffic routing during rollouts.
332+
items:
333+
description: Plugin is used to integrate traffic management
334+
and metric plugins into the Argo Rollouts controller. For
335+
more information on these plugins, see the upstream Argo Rollouts
336+
documentation.
337+
properties:
338+
location:
339+
description: Location supports http(s):// urls and file://,
340+
though file:// requires the plugin be available on the
341+
filesystem
342+
type: string
343+
name:
344+
description: Name of the plugin, it must match the name
345+
required by the plugin so it can find its configuration
346+
type: string
347+
sha256:
348+
description: SHA256 is an optional sha256 checksum of the
349+
plugin executable
350+
type: string
351+
required:
352+
- location
353+
- name
354+
type: object
355+
type: array
356+
type: object
289357
skipNotificationSecretDeployment:
290358
description: SkipNotificationSecretDeployment lets you specify if
291359
the argo notification secret should be deployed

‎bundle/manifests/gitops-operator.clusterserviceversion.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ metadata:
164164
capabilities: Deep Insights
165165
console.openshift.io/plugins: '["gitops-plugin"]'
166166
containerImage: quay.io/redhat-developer/gitops-operator
167-
createdAt: "2024-10-04T04:12:36Z"
167+
createdAt: "2024-10-23T05:35:38Z"
168168
description: Enables teams to adopt GitOps principles for managing cluster configurations
169169
and application delivery across hybrid multi-cluster Kubernetes environments.
170170
features.operators.openshift.io/disconnected: "true"

‎config/crd/bases/argoproj.io_rolloutmanagers.yaml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,15 @@ spec:
228228
items:
229229
type: string
230230
type: array
231+
ha:
232+
description: HA options for High Availability support for Rollouts.
233+
properties:
234+
enabled:
235+
description: Enabled will toggle HA support globally for RolloutManager.
236+
type: boolean
237+
required:
238+
- enabled
239+
type: object
231240
image:
232241
description: Image defines Argo Rollouts controller image (optional)
233242
type: string
@@ -286,6 +295,65 @@ spec:
286295
type: object
287296
type: array
288297
type: object
298+
plugins:
299+
description: Plugins specify the traffic and metric plugins in Argo
300+
Rollout
301+
properties:
302+
metric:
303+
description: Metric holds a list of metric plugins used to gather
304+
and report metrics during rollouts.
305+
items:
306+
description: Plugin is used to integrate traffic management
307+
and metric plugins into the Argo Rollouts controller. For
308+
more information on these plugins, see the upstream Argo Rollouts
309+
documentation.
310+
properties:
311+
location:
312+
description: Location supports http(s):// urls and file://,
313+
though file:// requires the plugin be available on the
314+
filesystem
315+
type: string
316+
name:
317+
description: Name of the plugin, it must match the name
318+
required by the plugin so it can find its configuration
319+
type: string
320+
sha256:
321+
description: SHA256 is an optional sha256 checksum of the
322+
plugin executable
323+
type: string
324+
required:
325+
- location
326+
- name
327+
type: object
328+
type: array
329+
trafficManagement:
330+
description: TrafficManagement holds a list of traffic management
331+
plugins used to control traffic routing during rollouts.
332+
items:
333+
description: Plugin is used to integrate traffic management
334+
and metric plugins into the Argo Rollouts controller. For
335+
more information on these plugins, see the upstream Argo Rollouts
336+
documentation.
337+
properties:
338+
location:
339+
description: Location supports http(s):// urls and file://,
340+
though file:// requires the plugin be available on the
341+
filesystem
342+
type: string
343+
name:
344+
description: Name of the plugin, it must match the name
345+
required by the plugin so it can find its configuration
346+
type: string
347+
sha256:
348+
description: SHA256 is an optional sha256 checksum of the
349+
plugin executable
350+
type: string
351+
required:
352+
- location
353+
- name
354+
type: object
355+
type: array
356+
type: object
289357
skipNotificationSecretDeployment:
290358
description: SkipNotificationSecretDeployment lets you specify if
291359
the argo notification secret should be deployed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/redhat-developer/gitops-operator
33
go 1.21.0
44

55
require (
6-
github.com/argoproj-labs/argo-rollouts-manager v0.0.5-0.20241003091439-52fd4a22e49e
6+
github.com/argoproj-labs/argo-rollouts-manager v0.0.5-0.20241023053239-85db81b64541
77
github.com/argoproj-labs/argocd-operator v0.12.0-rc3
88
github.com/coreos/prometheus-operator v0.40.0
99
github.com/go-logr/logr v1.4.2

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -620,8 +620,8 @@ github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4x
620620
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
621621
github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
622622
github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
623-
github.com/argoproj-labs/argo-rollouts-manager v0.0.5-0.20241003091439-52fd4a22e49e h1:qp6+6Ii2yF3vlIOuLZPrcgmb11fBh+xLR6bNPZpFNiw=
624-
github.com/argoproj-labs/argo-rollouts-manager v0.0.5-0.20241003091439-52fd4a22e49e/go.mod h1:seR9B+tx6AbGaya+JA61HDBFciKx7FM7t/1IMhOwXlM=
623+
github.com/argoproj-labs/argo-rollouts-manager v0.0.5-0.20241023053239-85db81b64541 h1:T4JSu0lAPWsxmbPut0h08JFQz4Q1NFXCJraXisNgKMw=
624+
github.com/argoproj-labs/argo-rollouts-manager v0.0.5-0.20241023053239-85db81b64541/go.mod h1:seR9B+tx6AbGaya+JA61HDBFciKx7FM7t/1IMhOwXlM=
625625
github.com/argoproj-labs/argocd-operator v0.12.0-rc3 h1:UqHQFeaZKWY8IqsAgLU3CwjRymcYCsJ01Wysqf7nDiY=
626626
github.com/argoproj-labs/argocd-operator v0.12.0-rc3/go.mod h1:+yvFAnSJZL8iOTWI3cTQ9qwXfh40lLyOI4ghDFqM8S0=
627627
github.com/argoproj/argo-cd/v2 v2.12.3 h1:Bi4QahHTnKl3esU5MplQP1wraGhaTpvgAV4GsMqc3Zc=

‎scripts/run-rollouts-e2e-tests.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ cd "$ROLLOUTS_TMP_DIR/argo-rollouts-manager"
1616

1717
# This commit value will be automatically updated by calling 'hack/upgrade-rollouts-manager/go-run.sh':
1818
# - It should always point to the same argo-rollouts-manager commit that is referenced in go.mod of gitops-operator (which will usually be the most recent argo-rollouts-manager commit)
19-
TARGET_ROLLOUT_MANAGER_COMMIT=52fd4a22e49e9bb0a3947262cce75931b63b209b
19+
TARGET_ROLLOUT_MANAGER_COMMIT=85db81b64541a2e0f10616acca8b24ac63f46b42
2020

2121
# This commit value will be automatically updated by calling 'hack/upgrade-rollouts-manager/go-run.sh':
2222
# - It should always point to the same argo-rollouts-manager commit that is referenced in the version of argo-rollouts-manager that is in go.mod
@@ -69,3 +69,4 @@ git checkout $TARGET_OPENSHIFT_ROUTE_ROLLOUT_PLUGIN_COMMIT
6969
make test-e2e
7070

7171

72+

0 commit comments

Comments
 (0)