Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 18 additions & 0 deletions bundle/manifests/argoproj.io_argocds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1425,6 +1425,15 @@ spec:
image:
description: Image is the ArgoCD container image for all ArgoCD components.
type: string
imagePullPolicy:
description: |-
ImagePullPolicy is the image pull policy for all ArgoCD components.
Valid values are Always, IfNotPresent, Never. If not specified, defaults to the operator's global setting.
enum:
- Always
- IfNotPresent
- Never
type: string
import:
description: Import is the import/restore options for ArgoCD.
properties:
Expand Down Expand Up @@ -16064,6 +16073,15 @@ spec:
image:
description: Image is the ArgoCD container image for all ArgoCD components.
type: string
imagePullPolicy:
description: |-
ImagePullPolicy is the image pull policy for all ArgoCD components.
Valid values are Always, IfNotPresent, Never. If not specified, defaults to the operator's global setting.
enum:
- Always
- IfNotPresent
- Never
type: string
imageUpdater:
description: ImageUpdater defines whether the Argo CD ImageUpdater
controller should be installed.
Expand Down
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-10-23T13:34:07Z"
createdAt: "2025-10-29T14:30:25Z"
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
18 changes: 18 additions & 0 deletions config/crd/bases/argoproj.io_argocds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1414,6 +1414,15 @@ spec:
image:
description: Image is the ArgoCD container image for all ArgoCD components.
type: string
imagePullPolicy:
description: |-
ImagePullPolicy is the image pull policy for all ArgoCD components.
Valid values are Always, IfNotPresent, Never. If not specified, defaults to the operator's global setting.
enum:
- Always
- IfNotPresent
- Never
type: string
import:
description: Import is the import/restore options for ArgoCD.
properties:
Expand Down Expand Up @@ -16053,6 +16062,15 @@ spec:
image:
description: Image is the ArgoCD container image for all ArgoCD components.
type: string
imagePullPolicy:
description: |-
ImagePullPolicy is the image pull policy for all ArgoCD components.
Valid values are Always, IfNotPresent, Never. If not specified, defaults to the operator's global setting.
enum:
- Always
- IfNotPresent
- Never
type: string
imageUpdater:
description: ImageUpdater defines whether the Argo CD ImageUpdater
controller should be installed.
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.24.6

require (
github.com/argoproj-labs/argo-rollouts-manager v0.0.7-0.20251020065637-7f928e52c0d9
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20251017041829-18184f26c64e
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20251024105544-f7c3f5b0cc95
github.com/argoproj/argo-cd/v3 v3.1.8
github.com/argoproj/gitops-engine v0.7.1-0.20250905160054-e48120133eec
github.com/go-logr/logr v1.4.3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
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.7-0.20251020065637-7f928e52c0d9 h1:WcUWvh0qIqUaY+JfVIUfBV0ACv9ep2by3YEi04dRNr4=
github.com/argoproj-labs/argo-rollouts-manager v0.0.7-0.20251020065637-7f928e52c0d9/go.mod h1:iVIrf0/GJPZR3NMtJvpo1Ui6qqPjpY34Lp+5RmZo9vY=
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20251017041829-18184f26c64e h1:0JYIQ9qRNce5t7ak5mEL1hLk9S3CKukdjvlVJySJNzE=
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20251017041829-18184f26c64e/go.mod h1:LTBNqNbKk9Us5xiCrK612HLOr8SJFfyxlMJQErzMghg=
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20251024105544-f7c3f5b0cc95 h1:v2J4IPd8Fab5udUD7nMZsYflqGDhkVGx30q5uenMBbE=
github.com/argoproj-labs/argocd-operator v0.14.0-rc1.0.20251024105544-f7c3f5b0cc95/go.mod h1:LTBNqNbKk9Us5xiCrK612HLOr8SJFfyxlMJQErzMghg=
github.com/argoproj/argo-cd/v3 v3.1.8 h1:NkLPiRI5qGkV+q1EN3O7/0Wb9O/MVl62vadKteZqMUw=
github.com/argoproj/argo-cd/v3 v3.1.8/go.mod h1:ZHb/LOz/hr88VWMJiVTd8DGYL7MheHCAT8S6DgYOBFo=
github.com/argoproj/gitops-engine v0.7.1-0.20250905160054-e48120133eec h1:rNAwbRQFvRIuW/e2bU+B10mlzghYXsnwZedYeA7Drz4=
Expand Down
21 changes: 21 additions & 0 deletions test/openshift/e2e/ginkgo/fixture/deployment/fixture.go
Original file line number Diff line number Diff line change
Expand Up @@ -427,3 +427,24 @@ func fetchDeployment(f func(*appsv1.Deployment) bool) matcher.GomegaMatcher {
}, BeTrue())

}

// verifyDeploymentImagePullPolicy checks if all containers in a deployment have the expected imagePullPolicy
func VerifyDeploymentImagePullPolicy(name, namespace string, expectedPolicy corev1.PullPolicy, depl *appsv1.Deployment) func() bool {
return func() bool {
depl := &appsv1.Deployment{}
k8sClient, _ := utils.GetE2ETestKubeClient()
err := k8sClient.Get(context.Background(), client.ObjectKey{Name: name, Namespace: namespace}, depl)
if err != nil {
return false
}
if len(depl.Spec.Template.Spec.Containers) == 0 {
return false
}
for _, container := range depl.Spec.Template.Spec.Containers {
if container.ImagePullPolicy != expectedPolicy {
return false
}
}
return true
}
}
20 changes: 20 additions & 0 deletions test/openshift/e2e/ginkgo/fixture/statefulset/fixture.go
Original file line number Diff line number Diff line change
Expand Up @@ -280,3 +280,23 @@ func fetchStatefulSet(f func(*appsv1.StatefulSet) bool) matcher.GomegaMatcher {
}, BeTrue())

}

// verifyStatefulSetImagePullPolicy checks if all containers in a statefulset have the expected imagePullPolicy
func VerifyStatefulSetImagePullPolicy(name, namespace string, expectedPolicy corev1.PullPolicy, ss *appsv1.StatefulSet) func() bool {
return func() bool {
k8sClient, _ := utils.GetE2ETestKubeClient()
err := k8sClient.Get(context.Background(), client.ObjectKey{Name: name, Namespace: namespace}, ss)
if err != nil {
return false
}
if len(ss.Spec.Template.Spec.Containers) == 0 {
return false
}
for _, container := range ss.Spec.Template.Spec.Containers {
if container.ImagePullPolicy != expectedPolicy {
return false
}
}
return true
}
}
Loading