Skip to content

Commit 990a1f9

Browse files
iam-veeramallaiam-veeramalla
authored
feat: add support for sidecar container in controller and server (#758)
* feat: add support for sidecar container in controller and server Signed-off-by: iam-veeramalla <[email protected]> * fix: failing test due to timeout Signed-off-by: iam-veeramalla <[email protected]> * fix: failing tests Signed-off-by: iam-veeramalla <[email protected]> * fix: manifests updates Signed-off-by: iam-veeramalla <[email protected]> --------- Signed-off-by: iam-veeramalla <[email protected]>
1 parent fbd702b commit 990a1f9

File tree

17 files changed

+32262
-14877
lines changed

17 files changed

+32262
-14877
lines changed

‎Makefile

+12
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,18 @@ test-e2e: manifests generate fmt vet ## Run e2e tests.
123123
test-metrics:
124124
go test -timeout 30m ./test/e2e -ginkgo.focus="Argo CD metrics controller" -coverprofile cover.out -ginkgo.v
125125

126+
.PHONY: operator-sdk
127+
OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk
128+
operator-sdk: ## Download operator-sdk locally if necessary.
129+
ifeq (,$(wildcard $(OPERATOR_SDK)))
130+
@{ \
131+
set -e ;\
132+
mkdir -p $(dir $(OPERATOR_SDK)) ;\
133+
OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \
134+
curl -sSLo $(OPERATOR_SDK) https://github.com/operator-framework/operator-sdk/releases/download/$(OPERATOR_SDK_VERSION)/operator-sdk_$${OS}_$${ARCH} ;\
135+
chmod +x $(OPERATOR_SDK) ;\
136+
}
137+
endif
126138

127139
.PHONY: test-route
128140
test-route:

‎bundle/manifests/argoproj.io_argocds.yaml

+10,396-1,792
Large diffs are not rendered by default.

‎bundle/manifests/gitops-operator.clusterserviceversion.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ metadata:
164164
capabilities: Deep Insights
165165
console.openshift.io/plugins: '["gitops-plugin"]'
166166
containerImage: quay.io/redhat-developer/gitops-operator
167-
createdAt: "2024-08-07T08:46:26Z"
167+
createdAt: "2024-08-08T17:53:22Z"
168168
description: Enables teams to adopt GitOps principles for managing cluster configurations
169169
and application delivery across hybrid multi-cluster Kubernetes environments.
170170
features.operators.openshift.io/disconnected: "true"

‎config/crd/bases/argoproj.io_argocds.yaml

+21,654-13,050
Large diffs are not rendered by default.

‎go.mod

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ module github.com/redhat-developer/gitops-operator
33
go 1.21
44

55
require (
6-
github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240807084148-a96aa79b5464
7-
github.com/argoproj-labs/argocd-operator v0.9.0-rc3.0.20240717043955-806551f68206
6+
github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240722162401-192dd2c3b5dd
7+
github.com/argoproj-labs/argocd-operator v0.9.0-rc3.0.20240802182151-b4daa97202ef
88
github.com/coreos/prometheus-operator v0.40.0
99
github.com/go-logr/logr v1.4.2
1010
github.com/google/go-cmp v0.6.0
1111
github.com/hashicorp/go-version v1.6.0
1212
github.com/onsi/ginkgo v1.16.5
13-
github.com/onsi/gomega v1.33.1
13+
github.com/onsi/gomega v1.34.0
1414
github.com/openshift/api v3.9.1-0.20190916204813-cdbe64fb0c91+incompatible
1515
github.com/operator-framework/api v0.17.5
1616
github.com/stretchr/testify v1.9.0
@@ -27,7 +27,7 @@ require (
2727
)
2828

2929
require (
30-
github.com/argoproj/argo-cd/v2 v2.11.4 // indirect
30+
github.com/argoproj/argo-cd/v2 v2.11.6 // indirect
3131
github.com/beorn7/perks v1.0.1 // indirect
3232
github.com/blang/semver/v4 v4.0.0 // indirect
3333
github.com/cert-manager/cert-manager v1.14.4 // indirect
@@ -67,17 +67,17 @@ require (
6767
github.com/sirupsen/logrus v1.9.3 // indirect
6868
github.com/spf13/pflag v1.0.5 // indirect
6969
go.uber.org/multierr v1.11.0 // indirect
70-
golang.org/x/crypto v0.22.0 // indirect
70+
golang.org/x/crypto v0.23.0 // indirect
7171
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
72-
golang.org/x/net v0.24.0 // indirect
72+
golang.org/x/net v0.25.0 // indirect
7373
golang.org/x/oauth2 v0.17.0 // indirect
74-
golang.org/x/sys v0.19.0 // indirect
75-
golang.org/x/term v0.19.0 // indirect
76-
golang.org/x/text v0.14.0 // indirect
74+
golang.org/x/sys v0.20.0 // indirect
75+
golang.org/x/term v0.20.0 // indirect
76+
golang.org/x/text v0.15.0 // indirect
7777
golang.org/x/time v0.5.0 // indirect
7878
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
7979
google.golang.org/appengine v1.6.8 // indirect
80-
google.golang.org/protobuf v1.33.0 // indirect
80+
google.golang.org/protobuf v1.34.1 // indirect
8181
gopkg.in/inf.v0 v0.9.1 // indirect
8282
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
8383
gopkg.in/yaml.v2 v2.4.0 // indirect

‎go.sum

+18-18
Original file line numberDiff line numberDiff line change
@@ -620,12 +620,12 @@ github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4x
620620
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
621621
github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
622622
github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
623-
github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240807084148-a96aa79b5464 h1:LTMoDmQoIjqhe+pulFiG7l80pnjjZX6WiivURO2uXsQ=
624-
github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240807084148-a96aa79b5464/go.mod h1:seR9B+tx6AbGaya+JA61HDBFciKx7FM7t/1IMhOwXlM=
625-
github.com/argoproj-labs/argocd-operator v0.9.0-rc3.0.20240717043955-806551f68206 h1:9aldn/g7WxGlPrSJrnyRq5RYkhWAXpg69e3Ygvf3GZs=
626-
github.com/argoproj-labs/argocd-operator v0.9.0-rc3.0.20240717043955-806551f68206/go.mod h1:WN3DyeUxFxNJFCxg1JtnLDTuAqi+Wv82qeMmrZhoyp0=
627-
github.com/argoproj/argo-cd/v2 v2.11.4 h1:ADwC/pbRkAo4RQ0txHaMpd//yn0ZD/GkKuGXOkBa9bg=
628-
github.com/argoproj/argo-cd/v2 v2.11.4/go.mod h1:0H0h5kihqrTC5TiRxFkgE/IHirSN2bJ8JJVo3mMepnU=
623+
github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240722162401-192dd2c3b5dd h1:SA081fH129BJ8kAYUEefO2nVjRvXOf7xxRdsvaM5HDw=
624+
github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240722162401-192dd2c3b5dd/go.mod h1:seR9B+tx6AbGaya+JA61HDBFciKx7FM7t/1IMhOwXlM=
625+
github.com/argoproj-labs/argocd-operator v0.9.0-rc3.0.20240802182151-b4daa97202ef h1:Mbqo5TYtd6I4wriKY424gdISnkMHK3Zvcio2DlqUqaQ=
626+
github.com/argoproj-labs/argocd-operator v0.9.0-rc3.0.20240802182151-b4daa97202ef/go.mod h1:OWhagjNeROw0f/b1FDofceqYQ1TMun1U70wp+cYA5HA=
627+
github.com/argoproj/argo-cd/v2 v2.11.6 h1:rAqp1oduTOaugPjlhmjDmjY+zf1chBEX/5SQZItXDcY=
628+
github.com/argoproj/argo-cd/v2 v2.11.6/go.mod h1:RfmtLRki6JBwq9jkgCMie9MzfvYqs0DfzbuG3JcDrPk=
629629
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
630630
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
631631
github.com/armon/go-metrics v0.3.0/go.mod h1:zXjbSimjXTd7vOpY8B0/2LpvNvDoXBuplAD+gJD3GYs=
@@ -1660,8 +1660,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
16601660
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
16611661
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
16621662
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
1663-
golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
1664-
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
1663+
golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
1664+
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
16651665
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
16661666
golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
16671667
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1784,8 +1784,8 @@ golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
17841784
golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
17851785
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
17861786
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
1787-
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
1788-
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
1787+
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
1788+
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
17891789
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
17901790
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
17911791
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1934,8 +1934,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
19341934
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
19351935
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
19361936
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1937-
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
1938-
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1937+
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
1938+
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
19391939
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
19401940
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
19411941
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
@@ -1946,8 +1946,8 @@ golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
19461946
golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
19471947
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
19481948
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
1949-
golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
1950-
golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
1949+
golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
1950+
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
19511951
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
19521952
golang.org/x/text v0.3.1-0.20180805044716-cb6730876b98/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
19531953
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@@ -1964,8 +1964,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
19641964
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
19651965
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
19661966
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
1967-
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
1968-
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
1967+
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
1968+
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
19691969
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
19701970
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
19711971
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -2277,8 +2277,8 @@ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw
22772277
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
22782278
google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
22792279
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
2280-
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
2281-
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
2280+
google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
2281+
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
22822282
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
22832283
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
22842284
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎test/openshift/e2e/parallel/1-019_validate_volume_mounts/01-assert.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ spec:
5959
name: gpg-keys
6060
- mountPath: /app/config/gpg/keys
6161
name: gpg-keyring
62-
- mountPath: /tmp
63-
name: tmp
6462
- mountPath: /app/config/reposerver/tls
6563
name: argocd-repo-server-tls
6664
- mountPath: /app/config/reposerver/tls/redis
6765
name: argocd-operator-redis-tls
6866
- mountPath: /home/argocd/cmp-server/plugins
6967
name: plugins
68+
- mountPath: /tmp
69+
name: tmp
7070
volumes:
7171
- configMap:
7272
defaultMode: 420
@@ -82,8 +82,6 @@ spec:
8282
name: gpg-keys
8383
- emptyDir: {}
8484
name: gpg-keyring
85-
- emptyDir: {}
86-
name: tmp
8785
- name: argocd-repo-server-tls
8886
secret:
8987
defaultMode: 420
@@ -98,6 +96,8 @@ spec:
9896
name: var-files
9997
- emptyDir: {}
10098
name: plugins
99+
- emptyDir: {}
100+
name: tmp
101101
---
102102
apiVersion: apps/v1
103103
kind: StatefulSet

‎test/openshift/e2e/parallel/1-019_validate_volume_mounts/01-install.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
apiVersion: argoproj.io/v1alpha1
22
kind: ArgoCD
33
metadata:
4-
name: argocd
4+
name: argocd
5+
spec: {}

‎test/openshift/e2e/parallel/1-031_validate_toolchain/01-check.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ commands:
88
# These variables need to be maintained according to the component matrix: https://spaces.redhat.com/display/GITOPS/GitOps+Component+Matrix
99
expected_kustomizeVersion='v5.2.1'
1010
expected_helmVersion='v3.14.4'
11-
expected_argocdVersion='v2.11.2+25f7504'
11+
expected_argocdVersion='v2.11.6+089247d'
1212
1313
if CI="prow"; then
1414
# when running against openshift-ci

‎test/openshift/e2e/parallel/1-106_validate_appcontroller_initcontainers/01-assert.yaml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
apiVersion: argoproj.io/v1beta1
2+
kind: ArgoCD
3+
metadata:
4+
name: argocd
5+
---
6+
apiVersion: v1
7+
kind: Pod
8+
metadata:
9+
name: argocd-application-controller-0
10+
spec:
11+
initContainers:
12+
- name: argocd-init
13+
image: nginx:latest
14+
imagePullPolicy: Always
15+
resources:
16+
limits:
17+
cpu: 50m
18+
memory: 64Mi
19+
requests:
20+
cpu: 10m
21+
memory: 32Mi
22+
containers:
23+
- name: argocd-application-controller

‎test/openshift/e2e/parallel/1-106_validate_appcontroller_initcontainers/01-install.yaml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
apiVersion: argoproj.io/v1beta1
2+
kind: ArgoCD
3+
metadata:
4+
name: argocd
5+
spec:
6+
controller:
7+
initContainers:
8+
- name: argocd-init
9+
image: nginx:latest
10+
imagePullPolicy: Always
11+
resources:
12+
limits:
13+
cpu: 50m
14+
memory: 64Mi
15+
requests:
16+
cpu: 10m
17+
memory: 32Mi

‎test/openshift/e2e/parallel/1-107_validate_server_initcontainers/01-assert.yaml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
apiVersion: argoproj.io/v1beta1
2+
kind: ArgoCD
3+
metadata:
4+
name: argocd
5+
---
6+
apiVersion: apps/v1
7+
kind: Deployment
8+
metadata:
9+
name: argocd-server
10+
spec:
11+
selector:
12+
matchLabels:
13+
app.kubernetes.io/name: argocd-server
14+
template:
15+
spec:
16+
initContainers:
17+
- name: argocd-init
18+
image: nginx:latest
19+
imagePullPolicy: Always
20+
resources:
21+
limits:
22+
cpu: 50m
23+
memory: 64Mi
24+
requests:
25+
cpu: 10m
26+
memory: 32Mi
27+
containers:
28+
- name: argocd-server

‎test/openshift/e2e/parallel/1-107_validate_server_initcontainers/01-install.yaml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
apiVersion: argoproj.io/v1beta1
2+
kind: ArgoCD
3+
metadata:
4+
name: argocd
5+
spec:
6+
server:
7+
initContainers:
8+
- name: argocd-init
9+
image: nginx:latest
10+
imagePullPolicy: Always
11+
resources:
12+
limits:
13+
cpu: 50m
14+
memory: 64Mi
15+
requests:
16+
cpu: 10m
17+
memory: 32Mi

‎test/openshift/e2e/parallel/1-108_validate_appcontroller_sidecar/01-assert.yaml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
apiVersion: argoproj.io/v1beta1
2+
kind: ArgoCD
3+
metadata:
4+
name: argocd
5+
---
6+
apiVersion: v1
7+
kind: Pod
8+
metadata:
9+
name: argocd-application-controller-0
10+
spec:
11+
containers:
12+
- name: argocd-application-controller
13+
- name: sidecar
14+
image: busybox
15+
resources:
16+
limits:
17+
cpu: 50m
18+
memory: 64Mi
19+
requests:
20+
cpu: 10m
21+
memory: 32Mi

‎test/openshift/e2e/parallel/1-108_validate_appcontroller_sidecar/01-install.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
apiVersion: argoproj.io/v1beta1
2+
kind: ArgoCD
3+
metadata:
4+
name: argocd
5+
spec:
6+
controller:
7+
sidecarContainers:
8+
- name: sidecar
9+
image: busybox
10+
resources:
11+
limits:
12+
cpu: 50m
13+
memory: 64Mi
14+
requests:
15+
cpu: 10m
16+
memory: 32Mi

‎test/openshift/e2e/parallel/1-109_validate_server_sidecar/01-assert.yaml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
apiVersion: argoproj.io/v1beta1
2+
kind: ArgoCD
3+
metadata:
4+
name: argocd
5+
---
6+
apiVersion: apps/v1
7+
kind: Deployment
8+
metadata:
9+
name: argocd-server
10+
spec:
11+
selector:
12+
matchLabels:
13+
app.kubernetes.io/name: argocd-server
14+
template:
15+
spec:
16+
containers:
17+
- name: argocd-server
18+
- name: sidecar
19+
image: busybox
20+
resources:
21+
limits:
22+
cpu: 50m
23+
memory: 64Mi
24+
requests:
25+
cpu: 10m
26+
memory: 32Mi

‎test/openshift/e2e/parallel/1-109_validate_server_sidecar/01-install.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
apiVersion: argoproj.io/v1beta1
2+
kind: ArgoCD
3+
metadata:
4+
name: argocd
5+
spec:
6+
server:
7+
sidecarContainers:
8+
- name: sidecar
9+
image: busybox
10+
resources:
11+
limits:
12+
cpu: 50m
13+
memory: 64Mi
14+
requests:
15+
cpu: 10m
16+
memory: 32Mi

0 commit comments

Comments
 (0)