Skip to content

Commit 9b14ac4

Browse files
authored
chore(deps): bump github.com/argoproj-labs/argocd-operator (#846)
* 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]>
1 parent 6b9de14 commit 9b14ac4

File tree

8 files changed

+59
-5
lines changed

8 files changed

+59
-5
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ toolchain go1.22.5
66

77
require (
88
github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250212035559-38faac6d4127
9-
github.com/argoproj-labs/argocd-operator v0.13.0-rc1.0.20250219054436-548f278bff7e
9+
github.com/argoproj-labs/argocd-operator v0.13.0-rc1.0.20250220070432-0ffa69ea6872
1010
github.com/coreos/prometheus-operator v0.40.0
1111
github.com/go-logr/logr v1.4.2
1212
github.com/google/go-cmp v0.6.0

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -622,8 +622,8 @@ github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb
622622
github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
623623
github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250212035559-38faac6d4127 h1:chOb5NQfFybnoDHwdkjhC2Y9YgsSjNxgXIKLEGBgWho=
624624
github.com/argoproj-labs/argo-rollouts-manager v0.0.6-0.20250212035559-38faac6d4127/go.mod h1:hX18xfJcnomx/k6urvDp/7+Zwa/y5aF1Mlhz5a2en4k=
625-
github.com/argoproj-labs/argocd-operator v0.13.0-rc1.0.20250219054436-548f278bff7e h1:55snlduYkXFPAeYpXjJS52kvXLnEsfSOB+XaUe0Ga+Y=
626-
github.com/argoproj-labs/argocd-operator v0.13.0-rc1.0.20250219054436-548f278bff7e/go.mod h1:FoPi0HK2noC0QQn/T5UTtD3/845yHhpdd0I6rrsW+2U=
625+
github.com/argoproj-labs/argocd-operator v0.13.0-rc1.0.20250220070432-0ffa69ea6872 h1:SpoL21jH0/6mMWgz1pA4pZ+J4Og0PjYXEJIZP1jFyr8=
626+
github.com/argoproj-labs/argocd-operator v0.13.0-rc1.0.20250220070432-0ffa69ea6872/go.mod h1:FoPi0HK2noC0QQn/T5UTtD3/845yHhpdd0I6rrsW+2U=
627627
github.com/argoproj/argo-cd/v2 v2.12.3 h1:Bi4QahHTnKl3esU5MplQP1wraGhaTpvgAV4GsMqc3Zc=
628628
github.com/argoproj/argo-cd/v2 v2.12.3/go.mod h1:2fh6q4NX/cylbH6Ktx/KjJsX7sOBwF3jbGnO0IZyNOc=
629629
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=

test/openshift/e2e/ignore-tests/parallel/1-064_validate_security_contexts/01-assert.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ spec:
6262
allowPrivilegeEscalation: false
6363
# readOnlyRootFilesystem: true
6464
runAsNonRoot: true
65-
runAsUser: 999
65+
# random runAsUser in openshift
66+
#runAsUser: 999
6667
---
6768
apiVersion: apps/v1
6869
kind: Deployment

test/openshift/e2e/parallel/1-064_validate_security_contexts/01-assert.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ spec:
6262
allowPrivilegeEscalation: false
6363
# readOnlyRootFilesystem: true
6464
runAsNonRoot: true
65-
runAsUser: 999
65+
# random runAsUser in openshift
66+
#runAsUser: 999
6667
---
6768
apiVersion: apps/v1
6869
kind: Deployment
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
apiVersion: kuttl.dev/v1beta1
2+
kind: TestAssert
3+
timeout: 300
4+
---
5+
apiVersion: argoproj.io/v1alpha1
6+
kind: ArgoCD
7+
metadata:
8+
name: argocd
9+
labels:
10+
example: basic
11+
spec:
12+
ha:
13+
enabled: true
14+
status:
15+
redis: Running
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
apiVersion: argoproj.io/v1alpha1
2+
kind: ArgoCD
3+
metadata:
4+
name: argocd
5+
labels:
6+
example: basic
7+
spec:
8+
ha:
9+
enabled: true
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
apiVersion: kuttl.dev/v1beta1
2+
kind: TestStep
3+
commands:
4+
- script: |
5+
pod_name=$(oc get pod -l app.kubernetes.io/name=argocd-redis-ha -n $NAMESPACE -o jsonpath="{.items[0].metadata.name}")
6+
actual_scc=$(oc get pod $pod_name -n $NAMESPACE -o jsonpath="{.metadata.annotations.openshift\.io/scc}")
7+
expected_scc="restricted-v2"
8+
9+
if [[ "$actual_scc" != "$expected_scc" ]]; then
10+
echo "SCC check failed: Expected '$expected_scc' but got '$actual_scc'"
11+
exit 1
12+
else
13+
echo "SCC check passed: '$actual_scc'"
14+
fi
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
apiVersion: kuttl.dev/v1beta1
2+
kind: TestStep
3+
commands:
4+
- script: |
5+
pod_name=$(oc get pod -l app.kubernetes.io/name=argocd-redis-ha-haproxy -n $NAMESPACE -o jsonpath="{.items[0].metadata.name}")
6+
actual_scc=$(oc get pod $pod_name -n $NAMESPACE -o jsonpath="{.metadata.annotations.openshift\.io/scc}")
7+
expected_scc="restricted-v2"
8+
9+
if [[ "$actual_scc" != "$expected_scc" ]]; then
10+
echo "SCC check failed: Expected '$expected_scc' but got '$actual_scc'"
11+
exit 1
12+
else
13+
echo "SCC check passed: '$actual_scc'"
14+
fi

0 commit comments

Comments
 (0)