Skip to content

chore: update to latest commit of argocd-operator '2264f895048ad5ebc5a9181516b8965ff0275369' #950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Aug 21, 2025
Merged

chore: update to latest commit of argocd-operator '2264f895048ad5ebc5a9181516b8965ff0275369' #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions bundle/manifests/argoproj.io_argocds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15696,6 +15696,45 @@ spec:
type: string
type: object
type: array
localUsers:
description: LocalUsers is a listing of local users to be created
by the operator for the purpose of issuing ArgoCD API keys.
items:
description: LocalUserSpec is used to specify information about
an ArgoCD local user to be created by the operator.
properties:
apiKey:
description: |-
ApiKey defines whether or not the user is configured to use an ArgoCD API
key. Default is true
type: boolean
autoRenewToken:
description: |-
AutoRenewToken specifies if a new token is to be issued once the existing
one has expired. Default is true
type: boolean
enabled:
description: |-
Enabled defines whether or not this local user is enabled. Default is
true
type: boolean
login:
description: Login defines whether or not the user is configured
to be able to login. Default is false
type: boolean
name:
description: Name of the local user
type: string
tokenLifetime:
description: |-
TokenLifetime defines the how long the token issued to this user is valid
for. An empty string or the value 0 indicates an infinite lifetime.
Examples: "30m", "8760h"
type: string
required:
- name
type: object
type: array
monitoring:
description: Monitoring defines whether workload status monitoring
configuration for this instance.
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/gitops-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ metadata:
capabilities: Deep Insights
console.openshift.io/plugins: '["gitops-plugin"]'
containerImage: quay.io/redhat-developer/gitops-operator
createdAt: "2025-08-10T13:07:26Z"
createdAt: "2025-08-20T01:09:37Z"
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
3 changes: 3 additions & 0 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,9 @@ func main() {
Scheme: mgr.GetScheme(),
LabelSelector: labelSelectorFlag,
K8sClient: k8sClient,
LocalUsers: &argocdprovisioner.LocalUsersInfo{
TokenRenewalTimers: map[string]*argocdprovisioner.TokenRenewalTimer{},
},
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "Argo CD")
os.Exit(1)
Expand Down
39 changes: 39 additions & 0 deletions config/crd/bases/argoproj.io_argocds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15685,6 +15685,45 @@ spec:
type: string
type: object
type: array
localUsers:
description: LocalUsers is a listing of local users to be created
by the operator for the purpose of issuing ArgoCD API keys.
items:
description: LocalUserSpec is used to specify information about
an ArgoCD local user to be created by the operator.
properties:
apiKey:
description: |-
ApiKey defines whether or not the user is configured to use an ArgoCD API
key. Default is true
type: boolean
autoRenewToken:
description: |-
AutoRenewToken specifies if a new token is to be issued once the existing
one has expired. Default is true
type: boolean
enabled:
description: |-
Enabled defines whether or not this local user is enabled. Default is
true
type: boolean
login:
description: Login defines whether or not the user is configured
to be able to login. Default is false
type: boolean
name:
description: Name of the local user
type: string
tokenLifetime:
description: |-
TokenLifetime defines the how long the token issued to this user is valid
for. An empty string or the value 0 indicates an infinite lifetime.
Examples: "30m", "8760h"
type: string
required:
- name
type: object
type: array
monitoring:
description: Monitoring defines whether workload status monitoring
configuration for this instance.
Expand Down
2 changes: 1 addition & 1 deletion controllers/argocd/openshift/openshift.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func BuilderHook(_ *argoapp.ArgoCD, v interface{}, _ string) error {
logv.Info("updating the Argo CD controller to watch for changes to the admin ClusterRole")

clusterResourceHandler := handler.EnqueueRequestsFromMapFunc(adminClusterRoleMapper(bldr.Client))
bldr.Builder.Watches(&rbacv1.ClusterRole{}, clusterResourceHandler,
bldr.Watches(&rbacv1.ClusterRole{}, clusterResourceHandler,
builder.WithPredicates(predicate.NewPredicateFuncs(func(o client.Object) bool {
return o.GetName() == "admin"
})))
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.24.4

require (
github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250731075119-a100fc1d88b8
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250812131727-80f37522108a
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250820003054-2264f895048a
github.com/argoproj/argo-cd/v3 v3.1.0-rc2
github.com/argoproj/gitops-engine v0.7.1-0.20250617174952-093aef0dad58
github.com/go-logr/logr v1.4.3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFI
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250731075119-a100fc1d88b8 h1:6+eo7BKrNkSIhQ1nnyCUloSNrGzghlb8r8e7GokoeBo=
github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250731075119-a100fc1d88b8/go.mod h1:yTwzKUV79YyI764hkXdVojGYBA9yKJk3qXx5mRuQ2Xc=
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250812131727-80f37522108a h1:ltdwxgFZEv8F83tRaHRWWSx61/Rnc4tv0A0JefvNAc4=
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250812131727-80f37522108a/go.mod h1:yHybcTQ4MdqiQ3NqBATUNnF7iXrZX2GmTQp5W+rRw0Y=
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250820003054-2264f895048a h1:t44X2qp5Skx/oJISgLcpatPNFKxGy7qMlqsxaKK52J8=
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20250820003054-2264f895048a/go.mod h1:7zgj/iHFq1r1OZmLX9yxUAarttxnklMbqZb/63euXA8=
github.com/argoproj/argo-cd/v3 v3.1.0-rc2 h1:oT9whFw3tShGkW1WrHJReFkAJvmsgS2KGJkcRIFSnt8=
github.com/argoproj/argo-cd/v3 v3.1.0-rc2/go.mod h1:vrxw1sapzdI3nnkwRKP84cMTzYjOKP7XsEy5fW1FQgg=
github.com/argoproj/gitops-engine v0.7.1-0.20250617174952-093aef0dad58 h1:9ESamu44v3dR9j/I4/4Aa1Fx3QSIE8ElK1CR8Z285uk=
Expand Down
2 changes: 1 addition & 1 deletion test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
if os.Getenv("CI") == "prow" {
// when running against openshift-ci
expected_dexVersion = "v2.30.3-dirty"
expected_redisVersion = "6.2.4"
expected_redisVersion = "7.2.7"

} else {
// when running against RC/ released version of gitops
Expand Down