Skip to content

Commit 2cc59df

Browse files
jgwestjgwest
authored
chore: update to latest commit of argocd-operator '2264f895048ad5ebc5a9181516b8965ff0275369' (#950)
Signed-off-by: Jonathan West <[email protected]>
1 parent 55e8033 commit 2cc59df

File tree

8 files changed

+87
-6
lines changed

8 files changed

+87
-6
lines changed

‎bundle/manifests/argoproj.io_argocds.yaml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15696,6 +15696,45 @@ spec:
1569615696
type: string
1569715697
type: object
1569815698
type: array
15699+
localUsers:
15700+
description: LocalUsers is a listing of local users to be created
15701+
by the operator for the purpose of issuing ArgoCD API keys.
15702+
items:
15703+
description: LocalUserSpec is used to specify information about
15704+
an ArgoCD local user to be created by the operator.
15705+
properties:
15706+
apiKey:
15707+
description: |-
15708+
ApiKey defines whether or not the user is configured to use an ArgoCD API
15709+
key. Default is true
15710+
type: boolean
15711+
autoRenewToken:
15712+
description: |-
15713+
AutoRenewToken specifies if a new token is to be issued once the existing
15714+
one has expired. Default is true
15715+
type: boolean
15716+
enabled:
15717+
description: |-
15718+
Enabled defines whether or not this local user is enabled. Default is
15719+
true
15720+
type: boolean
15721+
login:
15722+
description: Login defines whether or not the user is configured
15723+
to be able to login. Default is false
15724+
type: boolean
15725+
name:
15726+
description: Name of the local user
15727+
type: string
15728+
tokenLifetime:
15729+
description: |-
15730+
TokenLifetime defines the how long the token issued to this user is valid
15731+
for. An empty string or the value 0 indicates an infinite lifetime.
15732+
Examples: "30m", "8760h"
15733+
type: string
15734+
required:
15735+
- name
15736+
type: object
15737+
type: array
1569915738
monitoring:
1570015739
description: Monitoring defines whether workload status monitoring
1570115740
configuration for this instance.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ metadata:
180180
capabilities: Deep Insights
181181
console.openshift.io/plugins: '["gitops-plugin"]'
182182
containerImage: quay.io/redhat-developer/gitops-operator
183-
createdAt: "2025-08-10T13:07:26Z"
183+
createdAt: "2025-08-20T01:09:37Z"
184184
description: Enables teams to adopt GitOps principles for managing cluster configurations
185185
and application delivery across hybrid multi-cluster Kubernetes environments.
186186
features.operators.openshift.io/disconnected: "true"

‎cmd/main.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,9 @@ func main() {
228228
Scheme: mgr.GetScheme(),
229229
LabelSelector: labelSelectorFlag,
230230
K8sClient: k8sClient,
231+
LocalUsers: &argocdprovisioner.LocalUsersInfo{
232+
TokenRenewalTimers: map[string]*argocdprovisioner.TokenRenewalTimer{},
233+
},
231234
}).SetupWithManager(mgr); err != nil {
232235
setupLog.Error(err, "unable to create controller", "controller", "Argo CD")
233236
os.Exit(1)

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15685,6 +15685,45 @@ spec:
1568515685
type: string
1568615686
type: object
1568715687
type: array
15688+
localUsers:
15689+
description: LocalUsers is a listing of local users to be created
15690+
by the operator for the purpose of issuing ArgoCD API keys.
15691+
items:
15692+
description: LocalUserSpec is used to specify information about
15693+
an ArgoCD local user to be created by the operator.
15694+
properties:
15695+
apiKey:
15696+
description: |-
15697+
ApiKey defines whether or not the user is configured to use an ArgoCD API
15698+
key. Default is true
15699+
type: boolean
15700+
autoRenewToken:
15701+
description: |-
15702+
AutoRenewToken specifies if a new token is to be issued once the existing
15703+
one has expired. Default is true
15704+
type: boolean
15705+
enabled:
15706+
description: |-
15707+
Enabled defines whether or not this local user is enabled. Default is
15708+
true
15709+
type: boolean
15710+
login:
15711+
description: Login defines whether or not the user is configured
15712+
to be able to login. Default is false
15713+
type: boolean
15714+
name:
15715+
description: Name of the local user
15716+
type: string
15717+
tokenLifetime:
15718+
description: |-
15719+
TokenLifetime defines the how long the token issued to this user is valid
15720+
for. An empty string or the value 0 indicates an infinite lifetime.
15721+
Examples: "30m", "8760h"
15722+
type: string
15723+
required:
15724+
- name
15725+
type: object
15726+
type: array
1568815727
monitoring:
1568915728
description: Monitoring defines whether workload status monitoring
1569015729
configuration for this instance.

‎controllers/argocd/openshift/openshift.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func BuilderHook(_ *argoapp.ArgoCD, v interface{}, _ string) error {
118118
logv.Info("updating the Argo CD controller to watch for changes to the admin ClusterRole")
119119

120120
clusterResourceHandler := handler.EnqueueRequestsFromMapFunc(adminClusterRoleMapper(bldr.Client))
121-
bldr.Builder.Watches(&rbacv1.ClusterRole{}, clusterResourceHandler,
121+
bldr.Watches(&rbacv1.ClusterRole{}, clusterResourceHandler,
122122
builder.WithPredicates(predicate.NewPredicateFuncs(func(o client.Object) bool {
123123
return o.GetName() == "admin"
124124
})))

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.24.4
44

55
require (
66
github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250731075119-a100fc1d88b8
7-
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250812131727-80f37522108a
7+
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250820003054-2264f895048a
88
github.com/argoproj/argo-cd/v3 v3.1.0-rc2
99
github.com/argoproj/gitops-engine v0.7.1-0.20250617174952-093aef0dad58
1010
github.com/go-logr/logr v1.4.3

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFI
3131
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
3232
github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250731075119-a100fc1d88b8 h1:6+eo7BKrNkSIhQ1nnyCUloSNrGzghlb8r8e7GokoeBo=
3333
github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250731075119-a100fc1d88b8/go.mod h1:yTwzKUV79YyI764hkXdVojGYBA9yKJk3qXx5mRuQ2Xc=
34-
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250812131727-80f37522108a h1:ltdwxgFZEv8F83tRaHRWWSx61/Rnc4tv0A0JefvNAc4=
35-
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250812131727-80f37522108a/go.mod h1:yHybcTQ4MdqiQ3NqBATUNnF7iXrZX2GmTQp5W+rRw0Y=
34+
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250820003054-2264f895048a h1:t44X2qp5Skx/oJISgLcpatPNFKxGy7qMlqsxaKK52J8=
35+
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250820003054-2264f895048a/go.mod h1:7zgj/iHFq1r1OZmLX9yxUAarttxnklMbqZb/63euXA8=
3636
github.com/argoproj/argo-cd/v3 v3.1.0-rc2 h1:oT9whFw3tShGkW1WrHJReFkAJvmsgS2KGJkcRIFSnt8=
3737
github.com/argoproj/argo-cd/v3 v3.1.0-rc2/go.mod h1:vrxw1sapzdI3nnkwRKP84cMTzYjOKP7XsEy5fW1FQgg=
3838
github.com/argoproj/gitops-engine v0.7.1-0.20250617174952-093aef0dad58 h1:9ESamu44v3dR9j/I4/4Aa1Fx3QSIE8ElK1CR8Z285uk=

‎test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
9595
if os.Getenv("CI") == "prow" {
9696
// when running against openshift-ci
9797
expected_dexVersion = "v2.30.3-dirty"
98-
expected_redisVersion = "6.2.4"
98+
expected_redisVersion = "7.2.7"
9999

100100
} else {
101101
// when running against RC/ released version of gitops

0 commit comments

Comments
 (0)