Skip to content

chore(deps): bump github.com/argoproj-labs/argocd-operator #846

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
merged 7 commits into from
Feb 24, 2025
Merged

chore(deps): bump github.com/argoproj-labs/argocd-operator #846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
99e0b72
upgrade argocd-operator
Mangaal Feb 20, 2025
0f419f8
e2e test for redis scc
Mangaal Feb 20, 2025
623cfec
go mod tidy
Mangaal Feb 20, 2025
0c552b2
Remove misplaced copy of go.mod from incorrect folder
Mangaal Feb 20, 2025
f3353a0
random runAsUser in openshift
Mangaal Feb 21, 2025
6607de0
Merge conflict
Mangaal Feb 21, 2025
e33b9a9
random runAsUser in openshift
Mangaal Feb 21, 2025
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
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 @@ -6,7 +6,7 @@ toolchain go1.22.5

require (
github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250212035559-38faac6d4127
github.com/argoproj-labs/argocd-operator v0.13.0-rc1.0.20250219054436-548f278bff7e
github.com/argoproj-labs/argocd-operator v0.13.0-rc1.0.20250220070432-0ffa69ea6872
github.com/coreos/prometheus-operator v0.40.0
github.com/go-logr/logr v1.4.2
github.com/google/go-cmp v0.6.0
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 @@ -622,8 +622,8 @@ github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb
github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250212035559-38faac6d4127 h1:chOb5NQfFybnoDHwdkjhC2Y9YgsSjNxgXIKLEGBgWho=
github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250212035559-38faac6d4127/go.mod h1:hX18xfJcnomx/k6urvDp/7+Zwa/y5aF1Mlhz5a2en4k=
github.com/argoproj-labs/argocd-operator v0.13.0-rc1.0.20250219054436-548f278bff7e h1:55snlduYkXFPAeYpXjJS52kvXLnEsfSOB+XaUe0Ga+Y=
github.com/argoproj-labs/argocd-operator v0.13.0-rc1.0.20250219054436-548f278bff7e/go.mod h1:FoPi0HK2noC0QQn/T5UTtD3/845yHhpdd0I6rrsW+2U=
github.com/argoproj-labs/argocd-operator v0.13.0-rc1.0.20250220070432-0ffa69ea6872 h1:SpoL21jH0/6mMWgz1pA4pZ+J4Og0PjYXEJIZP1jFyr8=
github.com/argoproj-labs/argocd-operator v0.13.0-rc1.0.20250220070432-0ffa69ea6872/go.mod h1:FoPi0HK2noC0QQn/T5UTtD3/845yHhpdd0I6rrsW+2U=
github.com/argoproj/argo-cd/v2 v2.12.3 h1:Bi4QahHTnKl3esU5MplQP1wraGhaTpvgAV4GsMqc3Zc=
github.com/argoproj/argo-cd/v2 v2.12.3/go.mod h1:2fh6q4NX/cylbH6Ktx/KjJsX7sOBwF3jbGnO0IZyNOc=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
Expand Down
3 changes: 2 additions & 1 deletion test/openshift/e2e/ignore-tests/parallel/1-064_validate_security_contexts/01-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ spec:
allowPrivilegeEscalation: false
# readOnlyRootFilesystem: true
runAsNonRoot: true
runAsUser: 999
# random runAsUser in openshift
#runAsUser: 999
---
apiVersion: apps/v1
kind: Deployment
Expand Down
3 changes: 2 additions & 1 deletion test/openshift/e2e/parallel/1-064_validate_security_contexts/01-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ spec:
allowPrivilegeEscalation: false
# readOnlyRootFilesystem: true
runAsNonRoot: true
runAsUser: 999
# random runAsUser in openshift
#runAsUser: 999
---
apiVersion: apps/v1
kind: Deployment
Expand Down
15 changes: 15 additions & 0 deletions test/openshift/e2e/sequential/1-107_validate_redis_ssc/01-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
apiVersion: kuttl.dev/v1beta1
kind: TestAssert
timeout: 300
---
apiVersion: argoproj.io/v1alpha1
kind: ArgoCD
metadata:
name: argocd
labels:
example: basic
spec:
ha:
enabled: true
status:
redis: Running
9 changes: 9 additions & 0 deletions test/openshift/e2e/sequential/1-107_validate_redis_ssc/01-install.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
apiVersion: argoproj.io/v1alpha1
kind: ArgoCD
metadata:
name: argocd
labels:
example: basic
spec:
ha:
enabled: true
14 changes: 14 additions & 0 deletions test/openshift/e2e/sequential/1-107_validate_redis_ssc/02-check-ha-redis-server-ssc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
apiVersion: kuttl.dev/v1beta1
kind: TestStep
commands:
- script: |
pod_name=$(oc get pod -l app.kubernetes.io/name=argocd-redis-ha -n $NAMESPACE -o jsonpath="{.items[0].metadata.name}")
actual_scc=$(oc get pod $pod_name -n $NAMESPACE -o jsonpath="{.metadata.annotations.openshift\.io/scc}")
expected_scc="restricted-v2"

if [[ "$actual_scc" != "$expected_scc" ]]; then
echo "SCC check failed: Expected '$expected_scc' but got '$actual_scc'"
exit 1
else
echo "SCC check passed: '$actual_scc'"
fi
14 changes: 14 additions & 0 deletions test/openshift/e2e/sequential/1-107_validate_redis_ssc/03-check-ha-proxy-ssc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
apiVersion: kuttl.dev/v1beta1
kind: TestStep
commands:
- script: |
pod_name=$(oc get pod -l app.kubernetes.io/name=argocd-redis-ha-haproxy -n $NAMESPACE -o jsonpath="{.items[0].metadata.name}")
actual_scc=$(oc get pod $pod_name -n $NAMESPACE -o jsonpath="{.metadata.annotations.openshift\.io/scc}")
expected_scc="restricted-v2"

if [[ "$actual_scc" != "$expected_scc" ]]; then
echo "SCC check failed: Expected '$expected_scc' but got '$actual_scc'"
exit 1
else
echo "SCC check passed: '$actual_scc'"
fi
Loading