Skip to content

Commit

Permalink
chore(deps): bump github.com/argoproj-labs/argocd-operator (#846)
Browse files Browse the repository at this point in the history
* upgrade argocd-operator

Signed-off-by: Mangaal <[email protected]>

* e2e test for redis scc

Signed-off-by: Mangaal <[email protected]>

* go mod tidy

Signed-off-by: Mangaal <[email protected]>

* Remove misplaced copy of go.mod from incorrect folder

Signed-off-by: Mangaal <[email protected]>

* random runAsUser in openshift

Signed-off-by: Mangaal <[email protected]>

* random runAsUser in openshift

Signed-off-by: Mangaal <[email protected]>

---------

Signed-off-by: Mangaal <[email protected]>
  • Loading branch information
Mangaal authored Feb 24, 2025
1 parent 6b9de14 commit 9b14ac4
Show file tree
Hide file tree
Showing 8 changed files with 59 additions and 5 deletions.
2 changes: 1 addition & 1 deletion go.mod
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
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
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
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
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
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
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
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

0 comments on commit 9b14ac4

Please sign in to comment.