Skip to content

Commit fbd702b

Browse files
jgwestjgwest
authored
Update to latest commit of argo-rollouts-manager 'a96aa79b546433ee2d68f48d424baaabed0cb2ac' (#757)
Signed-off-by: Jonathan West <jonwest@redhat.com>
1 parent 8e3e339 commit fbd702b

File tree

6 files changed

+124
-5
lines changed

6 files changed

+124
-5
lines changed

‎bundle/manifests/argoproj.io_rolloutmanagers.yaml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,61 @@ spec:
5353
description: Labels to add to the resources during its creation.
5454
type: object
5555
type: object
56+
controllerResources:
57+
description: Resources requests/limits for Argo Rollout controller
58+
properties:
59+
claims:
60+
description: |-
61+
Claims lists the names of resources, defined in spec.resourceClaims,
62+
that are used by this container.
63+
64+
65+
This is an alpha field and requires enabling the
66+
DynamicResourceAllocation feature gate.
67+
68+
69+
This field is immutable. It can only be set for containers.
70+
items:
71+
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
72+
properties:
73+
name:
74+
description: |-
75+
Name must match the name of one entry in pod.spec.resourceClaims of
76+
the Pod where this field is used. It makes that resource available
77+
inside a container.
78+
type: string
79+
required:
80+
- name
81+
type: object
82+
type: array
83+
x-kubernetes-list-map-keys:
84+
- name
85+
x-kubernetes-list-type: map
86+
limits:
87+
additionalProperties:
88+
anyOf:
89+
- type: integer
90+
- type: string
91+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
92+
x-kubernetes-int-or-string: true
93+
description: |-
94+
Limits describes the maximum amount of compute resources allowed.
95+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
96+
type: object
97+
requests:
98+
additionalProperties:
99+
anyOf:
100+
- type: integer
101+
- type: string
102+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
103+
x-kubernetes-int-or-string: true
104+
description: |-
105+
Requests describes the minimum amount of compute resources required.
106+
If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
107+
otherwise to an implementation-defined value. Requests cannot exceed Limits.
108+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
109+
type: object
110+
type: object
56111
env:
57112
description: Env lets you specify environment for Rollouts pods
58113
items:
@@ -231,6 +286,10 @@ spec:
231286
type: object
232287
type: array
233288
type: object
289+
skipNotificationSecretDeployment:
290+
description: SkipNotificationSecretDeployment lets you specify if
291+
the argo notification secret should be deployed
292+
type: boolean
234293
version:
235294
description: Version defines Argo Rollouts controller tag (optional)
236295
type: string

‎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-07-17T05:12:50Z"
167+
createdAt: "2024-08-07T08:46:26Z"
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: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,61 @@ spec:
5353
description: Labels to add to the resources during its creation.
5454
type: object
5555
type: object
56+
controllerResources:
57+
description: Resources requests/limits for Argo Rollout controller
58+
properties:
59+
claims:
60+
description: |-
61+
Claims lists the names of resources, defined in spec.resourceClaims,
62+
that are used by this container.
63+
64+
65+
This is an alpha field and requires enabling the
66+
DynamicResourceAllocation feature gate.
67+
68+
69+
This field is immutable. It can only be set for containers.
70+
items:
71+
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
72+
properties:
73+
name:
74+
description: |-
75+
Name must match the name of one entry in pod.spec.resourceClaims of
76+
the Pod where this field is used. It makes that resource available
77+
inside a container.
78+
type: string
79+
required:
80+
- name
81+
type: object
82+
type: array
83+
x-kubernetes-list-map-keys:
84+
- name
85+
x-kubernetes-list-type: map
86+
limits:
87+
additionalProperties:
88+
anyOf:
89+
- type: integer
90+
- type: string
91+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
92+
x-kubernetes-int-or-string: true
93+
description: |-
94+
Limits describes the maximum amount of compute resources allowed.
95+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
96+
type: object
97+
requests:
98+
additionalProperties:
99+
anyOf:
100+
- type: integer
101+
- type: string
102+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
103+
x-kubernetes-int-or-string: true
104+
description: |-
105+
Requests describes the minimum amount of compute resources required.
106+
If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
107+
otherwise to an implementation-defined value. Requests cannot exceed Limits.
108+
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
109+
type: object
110+
type: object
56111
env:
57112
description: Env lets you specify environment for Rollouts pods
58113
items:
@@ -231,6 +286,10 @@ spec:
231286
type: object
232287
type: array
233288
type: object
289+
skipNotificationSecretDeployment:
290+
description: SkipNotificationSecretDeployment lets you specify if
291+
the argo notification secret should be deployed
292+
type: boolean
234293
version:
235294
description: Version defines Argo Rollouts controller tag (optional)
236295
type: string

‎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
44

55
require (
6-
github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240722162401-192dd2c3b5dd
6+
github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240807084148-a96aa79b5464
77
github.com/argoproj-labs/argocd-operator v0.9.0-rc3.0.20240717043955-806551f68206
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.4-0.20240722162401-192dd2c3b5dd h1:SA081fH129BJ8kAYUEefO2nVjRvXOf7xxRdsvaM5HDw=
624-
github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240722162401-192dd2c3b5dd/go.mod h1:seR9B+tx6AbGaya+JA61HDBFciKx7FM7t/1IMhOwXlM=
623+
github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240807084148-a96aa79b5464 h1:LTMoDmQoIjqhe+pulFiG7l80pnjjZX6WiivURO2uXsQ=
624+
github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240807084148-a96aa79b5464/go.mod h1:seR9B+tx6AbGaya+JA61HDBFciKx7FM7t/1IMhOwXlM=
625625
github.com/argoproj-labs/argocd-operator v0.9.0-rc3.0.20240717043955-806551f68206 h1:9aldn/g7WxGlPrSJrnyRq5RYkhWAXpg69e3Ygvf3GZs=
626626
github.com/argoproj-labs/argocd-operator v0.9.0-rc3.0.20240717043955-806551f68206/go.mod h1:WN3DyeUxFxNJFCxg1JtnLDTuAqi+Wv82qeMmrZhoyp0=
627627
github.com/argoproj/argo-cd/v2 v2.11.4 h1:ADwC/pbRkAo4RQ0txHaMpd//yn0ZD/GkKuGXOkBa9bg=

‎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=192dd2c3b5dd026e2c59c5765e98ca2f70ca01f9
19+
TARGET_ROLLOUT_MANAGER_COMMIT=a96aa79b546433ee2d68f48d424baaabed0cb2ac
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
@@ -67,3 +67,4 @@ cd "$ROLLOUTS_TMP_DIR/rollouts-plugin-trafficrouter-openshift"
6767
git checkout $TARGET_OPENSHIFT_ROUTE_ROLLOUT_PLUGIN_COMMIT
6868

6969
make test-e2e
70+

0 commit comments

Comments
 (0)