Skip to content

Commit

Permalink
Update to latest commit of argo-rollouts-manager '85db81b64541a2e0f10…
Browse files Browse the repository at this point in the history 
…616acca8b24ac63f46b42' (#799)

Signed-off-by: Jonathan West <[email protected]>
  • Loading branch information
@jgwest
jgwest authored Oct 23, 2024
1 parent 48d822e commit 02be501
Show file tree
Hide file tree
Showing 6 changed files with 142 additions and 5 deletions.
68 changes: 68 additions & 0 deletions bundle/manifests/argoproj.io_rolloutmanagers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,15 @@ spec:
items:
type: string
type: array
ha:
description: HA options for High Availability support for Rollouts.
properties:
enabled:
description: Enabled will toggle HA support globally for RolloutManager.
type: boolean
required:
- enabled
type: object
image:
description: Image defines Argo Rollouts controller image (optional)
type: string
Expand Down Expand Up @@ -286,6 +295,65 @@ spec:
type: object
type: array
type: object
plugins:
description: Plugins specify the traffic and metric plugins in Argo
Rollout
properties:
metric:
description: Metric holds a list of metric plugins used to gather
and report metrics during rollouts.
items:
description: Plugin is used to integrate traffic management
and metric plugins into the Argo Rollouts controller. For
more information on these plugins, see the upstream Argo Rollouts
documentation.
properties:
location:
description: Location supports http(s):// urls and file://,
though file:// requires the plugin be available on the
filesystem
type: string
name:
description: Name of the plugin, it must match the name
required by the plugin so it can find its configuration
type: string
sha256:
description: SHA256 is an optional sha256 checksum of the
plugin executable
type: string
required:
- location
- name
type: object
type: array
trafficManagement:
description: TrafficManagement holds a list of traffic management
plugins used to control traffic routing during rollouts.
items:
description: Plugin is used to integrate traffic management
and metric plugins into the Argo Rollouts controller. For
more information on these plugins, see the upstream Argo Rollouts
documentation.
properties:
location:
description: Location supports http(s):// urls and file://,
though file:// requires the plugin be available on the
filesystem
type: string
name:
description: Name of the plugin, it must match the name
required by the plugin so it can find its configuration
type: string
sha256:
description: SHA256 is an optional sha256 checksum of the
plugin executable
type: string
required:
- location
- name
type: object
type: array
type: object
skipNotificationSecretDeployment:
description: SkipNotificationSecretDeployment lets you specify if
the argo notification secret should be deployed
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/gitops-operator.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ metadata:
capabilities: Deep Insights
console.openshift.io/plugins: '["gitops-plugin"]'
containerImage: quay.io/redhat-developer/gitops-operator
createdAt: "2024-10-04T04:12:36Z"
createdAt: "2024-10-23T05:35:38Z"
description: Enables teams to adopt GitOps principles for managing cluster configurations
and application delivery across hybrid multi-cluster Kubernetes environments.
features.operators.openshift.io/disconnected: "true"
Expand Down
68 changes: 68 additions & 0 deletions config/crd/bases/argoproj.io_rolloutmanagers.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,15 @@ spec:
items:
type: string
type: array
ha:
description: HA options for High Availability support for Rollouts.
properties:
enabled:
description: Enabled will toggle HA support globally for RolloutManager.
type: boolean
required:
- enabled
type: object
image:
description: Image defines Argo Rollouts controller image (optional)
type: string
Expand Down Expand Up @@ -286,6 +295,65 @@ spec:
type: object
type: array
type: object
plugins:
description: Plugins specify the traffic and metric plugins in Argo
Rollout
properties:
metric:
description: Metric holds a list of metric plugins used to gather
and report metrics during rollouts.
items:
description: Plugin is used to integrate traffic management
and metric plugins into the Argo Rollouts controller. For
more information on these plugins, see the upstream Argo Rollouts
documentation.
properties:
location:
description: Location supports http(s):// urls and file://,
though file:// requires the plugin be available on the
filesystem
type: string
name:
description: Name of the plugin, it must match the name
required by the plugin so it can find its configuration
type: string
sha256:
description: SHA256 is an optional sha256 checksum of the
plugin executable
type: string
required:
- location
- name
type: object
type: array
trafficManagement:
description: TrafficManagement holds a list of traffic management
plugins used to control traffic routing during rollouts.
items:
description: Plugin is used to integrate traffic management
and metric plugins into the Argo Rollouts controller. For
more information on these plugins, see the upstream Argo Rollouts
documentation.
properties:
location:
description: Location supports http(s):// urls and file://,
though file:// requires the plugin be available on the
filesystem
type: string
name:
description: Name of the plugin, it must match the name
required by the plugin so it can find its configuration
type: string
sha256:
description: SHA256 is an optional sha256 checksum of the
plugin executable
type: string
required:
- location
- name
type: object
type: array
type: object
skipNotificationSecretDeployment:
description: SkipNotificationSecretDeployment lets you specify if
the argo notification secret should be deployed
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/redhat-developer/gitops-operator
go 1.21.0

require (
github.com/argoproj-labs/argo-rollouts-manager v0.0.5-0.20241003091439-52fd4a22e49e
github.com/argoproj-labs/argo-rollouts-manager v0.0.5-0.20241023053239-85db81b64541
github.com/argoproj-labs/argocd-operator v0.12.0-rc3
github.com/coreos/prometheus-operator v0.40.0
github.com/go-logr/logr v1.4.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -620,8 +620,8 @@ github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4x
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
github.com/argoproj-labs/argo-rollouts-manager v0.0.5-0.20241003091439-52fd4a22e49e h1:qp6+6Ii2yF3vlIOuLZPrcgmb11fBh+xLR6bNPZpFNiw=
github.com/argoproj-labs/argo-rollouts-manager v0.0.5-0.20241003091439-52fd4a22e49e/go.mod h1:seR9B+tx6AbGaya+JA61HDBFciKx7FM7t/1IMhOwXlM=
github.com/argoproj-labs/argo-rollouts-manager v0.0.5-0.20241023053239-85db81b64541 h1:T4JSu0lAPWsxmbPut0h08JFQz4Q1NFXCJraXisNgKMw=
github.com/argoproj-labs/argo-rollouts-manager v0.0.5-0.20241023053239-85db81b64541/go.mod h1:seR9B+tx6AbGaya+JA61HDBFciKx7FM7t/1IMhOwXlM=
github.com/argoproj-labs/argocd-operator v0.12.0-rc3 h1:UqHQFeaZKWY8IqsAgLU3CwjRymcYCsJ01Wysqf7nDiY=
github.com/argoproj-labs/argocd-operator v0.12.0-rc3/go.mod h1:+yvFAnSJZL8iOTWI3cTQ9qwXfh40lLyOI4ghDFqM8S0=
github.com/argoproj/argo-cd/v2 v2.12.3 h1:Bi4QahHTnKl3esU5MplQP1wraGhaTpvgAV4GsMqc3Zc=
Expand Down
3 changes: 2 additions & 1 deletion scripts/run-rollouts-e2e-tests.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ cd "$ROLLOUTS_TMP_DIR/argo-rollouts-manager"

# This commit value will be automatically updated by calling 'hack/upgrade-rollouts-manager/go-run.sh':
# - 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)
TARGET_ROLLOUT_MANAGER_COMMIT=52fd4a22e49e9bb0a3947262cce75931b63b209b
TARGET_ROLLOUT_MANAGER_COMMIT=85db81b64541a2e0f10616acca8b24ac63f46b42

# This commit value will be automatically updated by calling 'hack/upgrade-rollouts-manager/go-run.sh':
# - 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
Expand Down Expand Up @@ -69,3 +69,4 @@ git checkout $TARGET_OPENSHIFT_ROUTE_ROLLOUT_PLUGIN_COMMIT
make test-e2e



0 comments on commit 02be501

Please sign in to comment.