Skip to content

Commit 44fef15

Browse files
authored
Fix multi images e2e test. (#1066)
Signed-off-by: Denis Karpelevich <[email protected]>
1 parent 7e4c52a commit 44fef15

File tree

14 files changed

+354
-16
lines changed

14 files changed

+354
-16
lines changed

test/e2e/README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,3 @@ The end-to-end tests are comprised of the following components:
4444
## Run the test suite
4545

4646
1. Run `./e2e-test.sh` to run all the tests located in `./suite`.
47-
48-
## Known issues
49-
50-
1. `./suite/004-multiple-images` is failing now.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: e2e-registry
5+
spec:
6+
replicas: 1
7+
selector:
8+
matchLabels:
9+
app: test-app-001
10+
component: argocd-image-updater-e2e
11+
template:
12+
metadata:
13+
labels:
14+
app: test-app-001
15+
component: argocd-image-updater-e2e
16+
spec:
17+
containers:
18+
- name: test-nginx
19+
image: nginx:1.17.0
20+
- name: test-memcached
21+
image: memcached:1.6.0
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
resources:
2+
- deployment.yaml

test/e2e/suite/004-multiple-images/01-install.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ kind: Application
88
metadata:
99
name: image-updater-004
1010
annotations:
11-
argocd-image-updater.argoproj.io/image-list: test1=10.42.0.1:30000/test-image:1.X.X,test2=10.42.0.1:30000/other-image:1.X.X
11+
argocd-image-updater.argoproj.io/image-list: test-nginx=nginx:1.17.10,test-memcached=memcached:1.6.10
1212
argocd-image-updater.argoproj.io/test.update-strategy: semver
1313
finalizers:
1414
- resources-finalizer.argocd.argoproj.io
1515
spec:
1616
project: default
1717
source:
1818
repoURL: http://10.42.0.1:30002/testdata.git
19-
path: ./004-multi-images
19+
path: ./004-multi-images-public
2020
targetRevision: HEAD
2121
destination:
2222
server: https://kubernetes.default.svc

test/e2e/suite/004-multiple-images/02-assert.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ spec:
66
source:
77
kustomize:
88
images:
9-
- 10.42.0.1:30000/test-image:1.0.2
10-
- 10.42.0.1:30000/other-image:1.0.1
9+
- nginx:1.17.10
10+
- memcached:1.6.10
1111
status:
1212
health:
1313
status: Healthy
@@ -20,5 +20,5 @@ metadata:
2020
namespace: image-updater-e2e-004
2121
spec:
2222
containers:
23-
- image: 10.42.0.1:30000/test-image:1.0.2
24-
- image: 10.42.0.1:30000/other-image:1.0.1
23+
- image: nginx:1.17.10
24+
- image: memcached:1.6.10

test/e2e/suite/004-multiple-images/02-run-updater.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ commands:
55
${SRC_DIR}/dist/argocd-image-updater run --once \
66
--argocd-namespace argocd-image-updater-e2e \
77
--registries-conf-path ${SRC_DIR}/test/e2e/assets/registries.conf \
8-
--loglevel trace
8+
--loglevel debug

test/e2e/suite/004-multiple-images/README.md

Lines changed: 296 additions & 0 deletions
Large diffs are not rendered by default.

test/e2e/suite/005-app-wide-update-strategy/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ To run this individual test case,
66

77
* make sure both docker daemon and k8s cluster is running
88
* `cd $HOME/go/src/image-updater/test/e2e`
9-
* `SRC_DIR=$HOME/go/src/image-updater kubectl kuttl test --namespace argocd-image-updater-e2e --timeout 120 --test 005-app-wide-update-strategy`
9+
* `SRC_DIR=$HOME/go/src/argocd-image-updater kubectl kuttl test --namespace argocd-image-updater-e2e --timeout 120 --test 005-app-wide-update-strategy`
1010

1111
Test output:
1212
```bash

test/e2e/suite/006-apps-in-any-namespace/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ To run this individual test case,
66

77
* make sure both docker daemon and k8s cluster is running
88
* `cd $HOME/go/src/image-updater/test/e2e`
9-
* `SRC_DIR=$HOME/go/src/image-updater kubectl kuttl test --namespace argocd-image-updater-e2e --timeout 120 --test 006-apps-in-any-namespace`
9+
* `SRC_DIR=$HOME/go/src/argocd-image-updater kubectl kuttl test --namespace argocd-image-updater-e2e --timeout 120 --test 006-apps-in-any-namespace`
1010

1111
Test output:
1212
```bash

test/e2e/suite/101-kustomize-match-application-label/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ To run this individual test case,
66

77
* make sure both docker daemon and k8s cluster is running
88
* `cd $HOME/go/src/image-updater/test/e2e`
9-
* `SRC_DIR=$HOME/go/src/image-updater kubectl kuttl test --namespace argocd-image-updater-e2e --timeout 120 --test 101-kustomize-match-application-label`
9+
* `SRC_DIR=$HOME/go/src/argocd-image-updater kubectl kuttl test --namespace argocd-image-updater-e2e --timeout 120 --test 101-kustomize-match-application-label`
1010

1111
Test output:
1212
```bash

0 commit comments

Comments
 (0)