Skip to content

Commit a15716b

Browse files
authored
Use pull tests instead of testim for the tag-and-digest test (#4129)
1 parent 32fbc64 commit a15716b

File tree

77 files changed

+2051
-51
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+2051
-51
lines changed

.github/workflows/build-test.yaml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2024,46 +2024,6 @@ jobs:
20242024
cluster-id: ${{ steps.create-cluster.outputs.cluster-id }}
20252025

20262026

2027-
validate-tag-and-digest:
2028-
runs-on: ubuntu-20.04
2029-
needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
2030-
strategy:
2031-
fail-fast: false
2032-
matrix:
2033-
cluster: [
2034-
{distribution: kind, version: v1.28.0}
2035-
]
2036-
steps:
2037-
- name: Checkout
2038-
uses: actions/checkout@v3
2039-
- name: download e2e deps
2040-
uses: actions/download-artifact@v3
2041-
with:
2042-
name: e2e
2043-
path: e2e/bin/
2044-
- run: docker load -i e2e/bin/e2e-deps.tar
2045-
- run: chmod +x e2e/bin/*
2046-
- name: download kots binary
2047-
uses: actions/download-artifact@v3
2048-
with:
2049-
name: kots
2050-
path: bin/
2051-
- run: chmod +x bin/*
2052-
- uses: ./.github/actions/kots-e2e
2053-
with:
2054-
test-focus: 'Tag and Digest'
2055-
kots-namespace: 'tag-and-digest'
2056-
k8s-distribution: ${{ matrix.cluster.distribution }}
2057-
k8s-version: ${{ matrix.cluster.version }}
2058-
testim-access-token: '${{ secrets.TESTIM_ACCESS_TOKEN }}'
2059-
testim-branch: ${{ github.head_ref == 'main' && 'master' || github.head_ref }}
2060-
aws-access-key-id: '${{ secrets.E2E_SUPPORT_BUNDLE_AWS_ACCESS_KEY_ID }}'
2061-
aws-secret-access-key: '${{ secrets.E2E_SUPPORT_BUNDLE_AWS_SECRET_ACCESS_KEY }}'
2062-
replicated-api-token: '${{ secrets.C11Y_MATRIX_TOKEN }}'
2063-
kots-dockerhub-username: '${{ secrets.E2E_DOCKERHUB_USERNAME }}'
2064-
kots-dockerhub-password: '${{ secrets.E2E_DOCKERHUB_PASSWORD }}'
2065-
2066-
20672027
validate-kots-push-images-anonymous:
20682028
runs-on: ubuntu-20.04
20692029
needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ]
@@ -3924,7 +3884,6 @@ jobs:
39243884
- validate-no-required-config
39253885
- validate-version-history-pagination
39263886
- validate-change-license
3927-
- validate-tag-and-digest
39283887
- validate-min-kots-version
39293888
- validate-target-kots-version
39303889
- validate-range-kots-version

e2e/e2e_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@ var _ = Describe("E2E", func() {
215215
Entry(nil, inventory.NewVersionHistoryPagination()),
216216
Entry(nil, inventory.NewChangeLicense()),
217217
Entry(nil, inventory.NewHelmManagedMode()),
218-
Entry(nil, inventory.NewTagAndDigest()),
219218
Entry(nil, inventory.NewMinKotsVersion()),
220219
Entry(nil, inventory.NewTargetKotsVersion()),
221220
Entry(nil, inventory.NewRangeKotsVersion()),

e2e/testim/inventory/inventory.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -133,15 +133,6 @@ func MultiAppTest() Test {
133133
}
134134
}
135135

136-
func NewTagAndDigest() Test {
137-
return Test{
138-
Name: "Tag and Digest",
139-
Suite: "tag-and-digest",
140-
Namespace: "tag-and-digest",
141-
UpstreamURI: "tag-and-digest/automated",
142-
}
143-
}
144-
145136
func NewMinKotsVersion() Test {
146137
return Test{
147138
Name: "Min KOTS Version",
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Name: test tag and digest no rewrite
2+
PullOptions:
3+
Namespace: app-namespace
4+
ExcludeAdminConsole: true
5+
IsAirgap: true
6+
Silent: true
7+
LocalPath: cases/taganddigest-norewrite/upstream
8+
RootDir: cases/taganddigest-norewrite/results
9+
SharedPassword: dummy-pass
10+
RewriteImages: false
11+
Downstreams:
12+
- this-cluster
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: example-nginx-digest-multi-arch
5+
labels:
6+
app: example
7+
component: nginx-digest-multi-arch
8+
spec:
9+
selector:
10+
matchLabels:
11+
app: example
12+
component: nginx-digest-multi-arch
13+
template:
14+
metadata:
15+
labels:
16+
app: example
17+
component: nginx-digest-multi-arch
18+
spec:
19+
containers:
20+
- name: nginx
21+
image: nginx@sha256:790711e34858c9b0741edffef6ed3d8199d8faa33f2870dea5db70f16384df79
22+
resources:
23+
limits:
24+
memory: '256Mi'
25+
cpu: '500m'
26+
requests:
27+
memory: '32Mi'
28+
cpu: '100m'
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: example-nginx-digest-single-arch
5+
labels:
6+
app: example
7+
component: nginx-digest-single-arch
8+
spec:
9+
selector:
10+
matchLabels:
11+
app: example
12+
component: nginx-digest-single-arch
13+
template:
14+
metadata:
15+
labels:
16+
app: example
17+
component: nginx-digest-single-arch
18+
spec:
19+
containers:
20+
- name: nginx
21+
image: nginx@sha256:f26fbadb0acab4a21ecb4e337a326907e61fbec36c9a9b52e725669d99ed1261
22+
resources:
23+
limits:
24+
memory: '256Mi'
25+
cpu: '500m'
26+
requests:
27+
memory: '32Mi'
28+
cpu: '100m'
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: example-nginx-tag-1-23
5+
labels:
6+
app: example
7+
component: nginx-tag-1-23
8+
spec:
9+
selector:
10+
matchLabels:
11+
app: example
12+
component: nginx-tag-1-23
13+
template:
14+
metadata:
15+
labels:
16+
app: example
17+
component: nginx-tag-1-23
18+
spec:
19+
containers:
20+
- name: nginx
21+
image: nginx:1.23
22+
resources:
23+
limits:
24+
memory: '256Mi'
25+
cpu: '500m'
26+
requests:
27+
memory: '32Mi'
28+
cpu: '100m'
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: example-nginx-tag-1
5+
labels:
6+
app: example
7+
component: nginx-tag-1
8+
spec:
9+
selector:
10+
matchLabels:
11+
app: example
12+
component: nginx-tag-1
13+
template:
14+
metadata:
15+
labels:
16+
app: example
17+
component: nginx-tag-1
18+
spec:
19+
containers:
20+
- name: nginx
21+
image: nginx:1
22+
resources:
23+
limits:
24+
memory: '256Mi'
25+
cpu: '500m'
26+
requests:
27+
memory: '32Mi'
28+
cpu: '100m'
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: example-nginx-tag-digest
5+
labels:
6+
app: example
7+
component: nginx-tag-digest
8+
spec:
9+
selector:
10+
matchLabels:
11+
app: example
12+
component: nginx-tag-digest
13+
template:
14+
metadata:
15+
labels:
16+
app: example
17+
component: nginx-tag-digest
18+
spec:
19+
containers:
20+
- name: nginx
21+
image: nginx:1@sha256:f26fbadb0acab4a21ecb4e337a326907e61fbec36c9a9b52e725669d99ed1261
22+
resources:
23+
limits:
24+
memory: '256Mi'
25+
cpu: '500m'
26+
requests:
27+
memory: '32Mi'
28+
cpu: '100m'
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
apiVersion: kots.io/v1beta1
2+
kind: Application
3+
metadata:
4+
name: my-app
5+
spec:
6+
title: My App
7+
releaseNotes: |
8+
release notes
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
apiVersion: kots.io/v1beta1
2+
kind: License
3+
metadata:
4+
name: testcustomer
5+
spec:
6+
appSlug: my-app
7+
channelID: 1vusIYZLAVxMG6q760OJmRKj5i5
8+
channelName: My Channel
9+
customerName: Test Customer
10+
endpoint: https://replicated.app
11+
entitlements:
12+
bool_field:
13+
title: Bool Field
14+
value: true
15+
valueType: Boolean
16+
expires_at:
17+
description: License Expiration
18+
title: Expiration
19+
value: "2030-07-27T00:00:00Z"
20+
valueType: String
21+
hidden_field:
22+
isHidden: true
23+
title: Hidden Field
24+
value: this is secret
25+
valueType: String
26+
int_field:
27+
title: Int Field
28+
value: 123
29+
valueType: Integer
30+
string_field:
31+
title: StringField
32+
value: single line text
33+
valueType: String
34+
text_field:
35+
title: Text Field
36+
value: |-
37+
multi
38+
line
39+
text
40+
valueType: Text
41+
isAirgapSupported: true
42+
isGitOpsSupported: true
43+
isSnapshotSupported: true
44+
licenseID: 1vusOokxAVp1tkRGuyxnF23PJcq
45+
licenseSequence: 7
46+
licenseType: prod
47+
signature: eyJsaWNlbnNlRGF0YSI6ImV5SmhjR2xXWlhKemFXOXVJam9pYTI5MGN5NXBieTkyTVdKbGRHRXhJaXdpYTJsdVpDSTZJa3hwWTJWdWMyVWlMQ0p0WlhSaFpHRjBZU0k2ZXlKdVlXMWxJam9pZEdWemRHTjFjM1J2YldWeUluMHNJbk53WldNaU9uc2liR2xqWlc1elpVbEVJam9pTVhaMWMwOXZhM2hCVm5BeGRHdFNSM1Y1ZUc1R01qTlFTbU54SWl3aWJHbGpaVzV6WlZSNWNHVWlPaUp3Y205a0lpd2lZM1Z6ZEc5dFpYSk9ZVzFsSWpvaVZHVnpkQ0JEZFhOMGIyMWxjaUlzSW1Gd2NGTnNkV2NpT2lKdGVTMWhjSEFpTENKamFHRnVibVZzU1VRaU9pSXhkblZ6U1ZsYVRFRldlRTFITm5FM05qQlBTbTFTUzJvMWFUVWlMQ0pqYUdGdWJtVnNUbUZ0WlNJNklrMTVJRU5vWVc1dVpXd2lMQ0pzYVdObGJuTmxVMlZ4ZFdWdVkyVWlPamNzSW1WdVpIQnZhVzUwSWpvaWFIUjBjSE02THk5eVpYQnNhV05oZEdWa0xtRndjQ0lzSW1WdWRHbDBiR1Z0Wlc1MGN5STZleUppYjI5c1gyWnBaV3hrSWpwN0luUnBkR3hsSWpvaVFtOXZiQ0JHYVdWc1pDSXNJblpoYkhWbElqcDBjblZsTENKMllXeDFaVlI1Y0dVaU9pSkNiMjlzWldGdUluMHNJbVY0Y0dseVpYTmZZWFFpT25zaWRHbDBiR1VpT2lKRmVIQnBjbUYwYVc5dUlpd2laR1Z6WTNKcGNIUnBiMjRpT2lKTWFXTmxibk5sSUVWNGNHbHlZWFJwYjI0aUxDSjJZV3gxWlNJNklqSXdNekF0TURjdE1qZFVNREE2TURBNk1EQmFJaXdpZG1Gc2RXVlVlWEJsSWpvaVUzUnlhVzVuSW4wc0ltaHBaR1JsYmw5bWFXVnNaQ0k2ZXlKMGFYUnNaU0k2SWtocFpHUmxiaUJHYVdWc1pDSXNJblpoYkhWbElqb2lkR2hwY3lCcGN5QnpaV055WlhRaUxDSjJZV3gxWlZSNWNHVWlPaUpUZEhKcGJtY2lMQ0pwYzBocFpHUmxiaUk2ZEhKMVpYMHNJbWx1ZEY5bWFXVnNaQ0k2ZXlKMGFYUnNaU0k2SWtsdWRDQkdhV1ZzWkNJc0luWmhiSFZsSWpveE1qTXNJblpoYkhWbFZIbHdaU0k2SWtsdWRHVm5aWElpZlN3aWMzUnlhVzVuWDJacFpXeGtJanA3SW5ScGRHeGxJam9pVTNSeWFXNW5SbWxsYkdRaUxDSjJZV3gxWlNJNkluTnBibWRzWlNCc2FXNWxJSFJsZUhRaUxDSjJZV3gxWlZSNWNHVWlPaUpUZEhKcGJtY2lmU3dpZEdWNGRGOW1hV1ZzWkNJNmV5SjBhWFJzWlNJNklsUmxlSFFnUm1sbGJHUWlMQ0oyWVd4MVpTSTZJbTExYkhScFhHNXNhVzVsWEc1MFpYaDBJaXdpZG1Gc2RXVlVlWEJsSWpvaVZHVjRkQ0o5ZlN3aWFYTkJhWEpuWVhCVGRYQndiM0owWldRaU9uUnlkV1VzSW1selIybDBUM0J6VTNWd2NHOXlkR1ZrSWpwMGNuVmxMQ0pwYzFOdVlYQnphRzkwVTNWd2NHOXlkR1ZrSWpwMGNuVmxmWDA9IiwiaW5uZXJTaWduYXR1cmUiOiJleUpzYVdObGJuTmxVMmxuYm1GMGRYSmxJam9pYUhneE1XTXZUR1ozUTNoVE5YRmtRWEJGU1hGdVRrMU9NMHBLYTJzNFZHZFhSVVpzVDFKVlJ6UjJjR1YzZEZoV1YzbG1lamRZY0hBd1ExazJZamRyUVRSS2N6TklhR3d3YkZJMFdUQTFMemN2UVVkQ2FEZFZNSGczUkhaTVozUXpVM00wYm5GTFZTdFhXRXBTVHpKWVFVRnZSME4xZFRWR1RGcHJRVWhYY1RSUVFtMXphSFY2Y1ZsdmNucHhlbGhGWVZWVlpFUlVkVXhDTW1nNWFIZ3dXRWhQUmxwUk16bHVkbTlPUjJaT2R5OTRTVmRaZEhSUGRYZHZhMncyTVZsb1JVeFZlRmQxU1ZSRmMwTlVhM2xtTVRNd09IazVSbFJzWlRKeVYyZEVlSEZNYTBSUFNXVXlPRWwzUzJSQkwySXdWVUl5VEZGbVRWcHdWemwyUTNCSkwybHlWek5uYmpaeU5WWjNWMjB2U1dweWJtNDNSelJrVmpadVYzcFRkMGhQUTJSdWEwMTRNRXQ1VVVOa0wxQjFaWEpUYjNSdVEwOXRTMDEzWlRSTGJqaERkMU5YVVRRNGRURkRNbTFpV1VzeGRYTlpOM1YzUFQwaUxDSndkV0pzYVdOTFpYa2lPaUl0TFMwdExVSkZSMGxPSUZCVlFreEpReUJMUlZrdExTMHRMVnh1VFVsSlFrbHFRVTVDWjJ0eGFHdHBSemwzTUVKQlVVVkdRVUZQUTBGUk9FRk5TVWxDUTJkTFEwRlJSVUZ6TkhKdlVIcDFhV1JNZVhOMmIxWTJkemxhTkZ4dVdHRmliME5tWTJNeGFHZFZhQ3N3V1VkS2NFNURSVXhyTjBaTFF5OTJhemR6ZERsR05tY3dUMjlrU0VSbGVYZFJXa2hLZFU1TVpsUnNRbEJHUTJOaU5seHVObTlzVEZOeWNGQTRjbFUzU0d4SGJsRkVSMFJNYVhkS1EyaGtSRGRVVUdSM2FXdHBkMHRGY201aldqaEdaalZsU25vd2RETmlUWFpyVDJaVVluSkJiRnh1WWtGQ1kwbzVNVmxVT1hKdVVXOXFkVWN4UldKUVRqaEZWblI2TWxZNE5IZHViR2Q0TUhCd2JEVjRPSFpOYlhwcE1ISnVibEZVV1VGamJ6WnFhMnBJTTF4dVRuTlVkWE4xUzFkdlJGUjVNWE5yZGtSUk9IbEJZV0ptWTNNME4zWnNRazAwU0RGT1JFNHZSSFJhWWxZdllubDJia0o2YkM4eFZrVnpURmRqWlZWcFRGeHVSWEYxT0VkeWF5dFFVRGQyUkdSd2JFUjNjWFpQV2t4RmRYazNkamhuUm01U09WUlVSV3ByTlVvNWRuWlVTR2RtU25VemVubEVPR2xLWTBSRE5YcHFPVnh1YjFGSlJFRlJRVUpjYmkwdExTMHRSVTVFSUZCVlFreEpReUJMUlZrdExTMHRMVnh1SWl3aWEyVjVVMmxuYm1GMGRYSmxJam9pWlhsS2VtRlhaSFZaV0ZJeFkyMVZhVTlwU2pCUldIQjJXVE5LVms1NmFGaFNSMlJzVVRKb2NtTklXa1ZVVlRsRldqQktXVTFGUmtaVFJFNUZVMGhLYkUxclRUTkxNSEJFVkROR2VGTnROVVJVVlRWVlltMDFiVnBGUm5sWldIQjZaRVJqTVZaSGFFeFBXRUpVVWtacmRrd3diek5aTUZaSlVteFdWRXd5T1VoV1JXeHNWa1ZPTUZSSE1WWlJNR04zVkd4R2JGa3pTblJUUm1zMFZVWk9hMVpWU2pCVU1WbDNZbXQwY0ZSclZuQmpia0poVFZjNWFtSldiSEZaYTNob1UyeHNWV0pGUmtWWGJVWnZWakZLVUZkcWJGSmhXRVp1V2xkb1EyRnVRak5TUjNNd1lWWkpOVTVXVmxkV1ZUVnlUMGhLYjFsVlRYbGhiVGcwVjBkYWVGbHFWbFppYlhoeFpFWkZkMDU1Y3pCaFZsSkpWRVpPTm1WRk1IcGxWWFJ2VFVaR1ZtRXdWVFJSVnpsSFVsaEtVRTFZUmxCU01WcFJVMVJDTmxsV2FIcFdWWEJ0WTBSU2JFMVVRazlPVjNSU1ZucFdUMU5XWTNaU1ZYUkZVMGhzYlU5VmJGaGtNMUl3WTFWc1lXTlhSakJTYTA1RVlVWmtjbUo2VmtSU00wSllUREkxUmsxWVl6SmxWM1JKVlZoQk1sVXhTbEppU0Zwd1VrVXdNRlpFVWt0VU1rWnNVVmQwYzFSV1VrMVVWV055V1RCYVRHSXpaRTlUVm05NVlraE9SR1JzVG5aUmFrWmFaVmRPVGxOVlNteGFiRXB1Wld0U2RVMHhSVGxRVTBselNXMWtjMkl5U21oaVJYUnNaVlZzYTBscWIybFpiVkpzV2xSVk1rNVVXWGRaTWxwcFRrUk9hazlYU1hsUFIwcHRUMVJvYkZsWFRtaGFiVVV5VGtSWmFXWlJQVDBpZlE9PSJ9
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
metadata:
4+
annotations:
5+
kots.io/kustomization: base
6+
resources:
7+
- nginx-digest-multi-arch.yaml
8+
- nginx-digest-single-arch.yaml
9+
- nginx-tag-1-23.yaml
10+
- nginx-tag-1.yaml
11+
- nginx-tag-digest.yaml
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: example-nginx-digest-multi-arch
5+
labels:
6+
app: example
7+
component: nginx-digest-multi-arch
8+
spec:
9+
selector:
10+
matchLabels:
11+
app: example
12+
component: nginx-digest-multi-arch
13+
template:
14+
metadata:
15+
labels:
16+
app: example
17+
component: nginx-digest-multi-arch
18+
spec:
19+
containers:
20+
- name: nginx
21+
image: nginx@sha256:790711e34858c9b0741edffef6ed3d8199d8faa33f2870dea5db70f16384df79
22+
resources:
23+
limits:
24+
memory: '256Mi'
25+
cpu: '500m'
26+
requests:
27+
memory: '32Mi'
28+
cpu: '100m'
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: example-nginx-digest-single-arch
5+
labels:
6+
app: example
7+
component: nginx-digest-single-arch
8+
spec:
9+
selector:
10+
matchLabels:
11+
app: example
12+
component: nginx-digest-single-arch
13+
template:
14+
metadata:
15+
labels:
16+
app: example
17+
component: nginx-digest-single-arch
18+
spec:
19+
containers:
20+
- name: nginx
21+
image: nginx@sha256:f26fbadb0acab4a21ecb4e337a326907e61fbec36c9a9b52e725669d99ed1261
22+
resources:
23+
limits:
24+
memory: '256Mi'
25+
cpu: '500m'
26+
requests:
27+
memory: '32Mi'
28+
cpu: '100m'
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: example-nginx-tag-1-23
5+
labels:
6+
app: example
7+
component: nginx-tag-1-23
8+
spec:
9+
selector:
10+
matchLabels:
11+
app: example
12+
component: nginx-tag-1-23
13+
template:
14+
metadata:
15+
labels:
16+
app: example
17+
component: nginx-tag-1-23
18+
spec:
19+
containers:
20+
- name: nginx
21+
image: nginx:1.23
22+
resources:
23+
limits:
24+
memory: '256Mi'
25+
cpu: '500m'
26+
requests:
27+
memory: '32Mi'
28+
cpu: '100m'

0 commit comments

Comments
 (0)