Skip to content

Commit

Permalink
Update test fixture to replace deprecated tag in image
Browse files Browse the repository at this point in the history
With the latest tag being removed, we needed to recreate all of the test fixtures to point to an image that actually exists. This also included regenerating report info, a fresh CI GPG key, resigning charts, etc.

Signed-off-by: Jose R. Gonzalez <[email protected]>
  • Loading branch information
komish committed Jul 5, 2023
1 parent 83a3f3b commit 5165419
Show file tree
Hide file tree
Showing 14 changed files with 481 additions and 35 deletions.
8 changes: 6 additions & 2 deletions tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,13 @@ As a result there are 6 tests.

### Signing the chart

The chart is signed using helm cli and a secret key. In this initial version the secret key used was one from Martin Mulholland. As a result the public key checked in for the test is also from Martin.
The signed chart tests have been signed with a key generated specifically for
these tests. When these are changed, a new keypair must be generated to use for
signing. The secret key can be thrown away. The private key can be thrown away.
The public key is all that's required for these tests to complete, and this key
is not to be used for anything else.

In the event the chart has to be updated, or a new chart added, the creator or updater of the chart can sign it use their own secret key, and create a copy of their public key to include with the test.
TODO: Generate a workflow that does this automagically in a container, etc.

This is not ideal, we will investigate generating secret and public keys as art of the test using a bot id.

Expand Down
52 changes: 51 additions & 1 deletion tests/charts/psql-service/0.1.11/community-report-info.json
Original file line number Diff line number Diff line change
@@ -1 +1,51 @@
{"annotations":[{"name":"charts.openshift.io/digest","value":"sha256:df41f5fb2134bceb4b3340c1bf795cc6191835250738cae089aa2c278db04491"},{"name":"charts.openshift.io/lastCertifiedTimestamp","value":"2023-01-13T15:57:24.152818-05:00"},{"name":"charts.openshift.io/testedOpenShiftVersion","value":"4.11"},{"name":"charts.openshift.io/supportedOpenShiftVersions","value":"\u003e=4.7"}],"digests":{"chart":"sha256:df41f5fb2134bceb4b3340c1bf795cc6191835250738cae089aa2c278db04491","package":"1205312f570d9608d17626f559c9280c2dde9b37ae0e6214c00c0e16c477fe10","publicKey":"1cc31121e86388fad29e4cc6fc6660f102f43d8c52ce5f7d54e134c3cb94adc2"},"metadata":{"vendorType":"community","profileVersion":"v1.2","webCatalogOnly":false,"chart-uri":"psql-service-0.1.11.tgz","chart":{"name":"psql-service","version":"0.1.11","description":"A Helm chart for a RedHat Certified PSQL","apiVersion":"v2","appVersion":"10.0.0","annotations":{"charts.openshift.io/archs":"x86_64","charts.openshift.io/name":"PSQL RedHat Demo Chart","charts.openshift.io/provider":"RedHat","charts.openshift.io/supportURL":"https://github.com/dperaza4dustbit/helm-chart"},"kubeVersion":"\u003e=1.20.0","type":"application"}},"results":{"passed":"1","failed":"0","message":null}}
{
"annotations": [
{
"name": "charts.openshift.io/digest",
"value": "sha256:df41f5fb2134bceb4b3340c1bf795cc6191835250738cae089aa2c278db04491"
},
{
"name": "charts.openshift.io/lastCertifiedTimestamp",
"value": "2023-01-13T15:57:24.152818-05:00"
},
{
"name": "charts.openshift.io/testedOpenShiftVersion",
"value": "4.11"
},
{
"name": "charts.openshift.io/supportedOpenShiftVersions",
"value": "\u003e=4.7"
}
],
"digests": {
"chart": "sha256:df41f5fb2134bceb4b3340c1bf795cc6191835250738cae089aa2c278db04491",
"package": "1205312f570d9608d17626f559c9280c2dde9b37ae0e6214c00c0e16c477fe10",
"publicKey": "1cc31121e86388fad29e4cc6fc6660f102f43d8c52ce5f7d54e134c3cb94adc2"
},
"metadata": {
"vendorType": "community",
"profileVersion": "v1.2",
"webCatalogOnly": false,
"chart-uri": "psql-service-0.1.11.tgz",
"chart": {
"name": "psql-service",
"version": "0.1.11",
"description": "A Helm chart for a RedHat Certified PSQL",
"apiVersion": "v2",
"appVersion": "10.0.0",
"annotations": {
"charts.openshift.io/archs": "x86_64",
"charts.openshift.io/name": "PSQL RedHat Demo Chart",
"charts.openshift.io/provider": "RedHat",
"charts.openshift.io/supportURL": "https://github.com/dperaza4dustbit/helm-chart"
},
"kubeVersion": "\u003e=1.20.0",
"type": "application"
}
},
"results": {
"passed": "1",
"failed": "0",
"message": null
}
}
52 changes: 51 additions & 1 deletion tests/charts/psql-service/0.1.11/partner-report-info.json
Original file line number Diff line number Diff line change
@@ -1 +1,51 @@
{"annotations":[{"name":"charts.openshift.io/digest","value":"sha256:df41f5fb2134bceb4b3340c1bf795cc6191835250738cae089aa2c278db04491"},{"name":"charts.openshift.io/lastCertifiedTimestamp","value":"2023-01-13T15:54:52.070001-05:00"},{"name":"charts.openshift.io/testedOpenShiftVersion","value":"4.11"},{"name":"charts.openshift.io/supportedOpenShiftVersions","value":"\u003e=4.7"}],"digests":{"chart":"sha256:df41f5fb2134bceb4b3340c1bf795cc6191835250738cae089aa2c278db04491","package":"1205312f570d9608d17626f559c9280c2dde9b37ae0e6214c00c0e16c477fe10","publicKey":"1cc31121e86388fad29e4cc6fc6660f102f43d8c52ce5f7d54e134c3cb94adc2"},"metadata":{"vendorType":"partner","profileVersion":"v1.2","webCatalogOnly":false,"chart-uri":"psql-service-0.1.11.tgz","chart":{"name":"psql-service","version":"0.1.11","description":"A Helm chart for a RedHat Certified PSQL","apiVersion":"v2","appVersion":"10.0.0","annotations":{"charts.openshift.io/archs":"x86_64","charts.openshift.io/name":"PSQL RedHat Demo Chart","charts.openshift.io/provider":"RedHat","charts.openshift.io/supportURL":"https://github.com/dperaza4dustbit/helm-chart"},"kubeVersion":"\u003e=1.20.0","type":"application"}},"results":{"passed":"13","failed":"0","message":null}}
{
"annotations": [
{
"name": "charts.openshift.io/digest",
"value": "sha256:5a5584c48c449861d1ef23325d91a4fa1fd838e7754558e32119986f5b8dfeed"
},
{
"name": "charts.openshift.io/lastCertifiedTimestamp",
"value": "2023-01-13T15:54:52.070001-05:00"
},
{
"name": "charts.openshift.io/testedOpenShiftVersion",
"value": "4.11"
},
{
"name": "charts.openshift.io/supportedOpenShiftVersions",
"value": "\u003e=4.7"
}
],
"digests": {
"chart": "sha256:5a5584c48c449861d1ef23325d91a4fa1fd838e7754558e32119986f5b8dfeed",
"package": "defaa409927744f7a2caa0b18467c28fc2343b3a2bd8d2fe8a104cd72d66c0c2",
"publicKey": "e5ff2a2124a152af497deea4d4be2ba279a7daa43b39e182af3aa686daf12e1e"
},
"metadata": {
"vendorType": "partner",
"profileVersion": "v1.2",
"webCatalogOnly": false,
"chart-uri": "psql-service-0.1.11.tgz",
"chart": {
"name": "psql-service",
"version": "0.1.11",
"description": "A Helm chart for a RedHat Certified PSQL",
"apiVersion": "v2",
"appVersion": "10.0.0",
"annotations": {
"charts.openshift.io/archs": "x86_64",
"charts.openshift.io/name": "PSQL RedHat Demo Chart",
"charts.openshift.io/provider": "RedHat",
"charts.openshift.io/supportURL": "https://github.com/dperaza4dustbit/helm-chart"
},
"kubeVersion": "\u003e=1.20.0",
"type": "application"
}
},
"results": {
"passed": "13",
"failed": "0",
"message": null
}
}
Binary file modified tests/charts/psql-service/0.1.11/psql-service-0.1.11.tgz
Binary file not shown.
34 changes: 16 additions & 18 deletions tests/charts/psql-service/0.1.11/psql-service-0.1.11.tgz.key
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----

mI0EYzYFNgEEAKFdY13RGnFbo8neupNTt5rE9otDOwvUSIH+lr0CY5m8e1upckVZ
P85OEo33WdjUAzS2+j6PElfyo6j3KC/Pm6aB26YQq6M6+OfBRo/2xEhhNcrfzv01
527I0P8/xmV/A4tRF5C4msh4lHNXTwjAAzAi8E/9tF8Kg+QWEWd0xREnABEBAAG0
Sk1hcnRpbiBNdWxob2xsYW5kIChjaGFydCB2ZXJpZmllciBzaWduYXR1cmUgdGVz
dGluZykgPG1tdWxob2xsQHJlZGhhdC5jb20+iNcEEwEIAEEWIQRM0M0jOMc5ztL/
mzRFd6APf4d2MAUCYzYFNgIbAwUJAeEzgAULCQgHAgIiAgYVCgkICwIEFgIDAQIe
BwIXgAAKCRBFd6APf4d2MMVxBACAawfI4Fn2iQ8xQxZosiT2sA6dozYhYz0c78Th
wB3PATtNqS0KogAiXphXGCQ5fy8A19/2skWX/Yhar2KjStdUf3P1AgHD2J6lP/pT
+ERL4V1jy7fOIctpUXDCoKZCPi13Fp8fic7zbxMz5fbLLj91gnMR+qqo47RYRpv+
glHcJ7iNBGM2BTYBBADerLalSzXirWGd20NxOaJDoeZDg4n2fgpkCruqe7YB3uso
BhYfWKOHRDIRMIYtbPIFLD7Om91ZUAuaHYpSHWcqHJB+pum21yH0V9m8aGCiPt+A
lNyZYB6Fqmy1577FZUuYBQnKxSReD9AzYe8NY1MKxU1QGzO6IORsir352Yhj8QAR
AQABiLwEGAEIACYWIQRM0M0jOMc5ztL/mzRFd6APf4d2MAUCYzYFNgIbDAUJAeEz
gAAKCRBFd6APf4d2MMyHA/9ZQKgul4xiQhJ5m6e37qga+ICSfBTyb0OKA8vD2yqA
7mpQP4d00TvUBQELhs7LmzLckezie4PZxUVVNdxvxakfJj4g8+rSidrGeLVpramz
zB3fLBanuoNYJDYfnVaRQyJzGw2Fw6IuieNNUi3L3kGH2ut6X5o3jSB/pI7eZ+IG
yA==
=ZFSe
mI0EZKMjKQEEAJwf7E7JYK/f8P66PgQKYpjm9bZDZy+9/vIBM7GGPHQCBuH3zFjo
EFZ7XuALt135aAFVFdGfabKPk7iMATPWZWZYiH+LdpcjHzW/A2cPeDMdI3rRanP/
4xXAbFb2TdZpG6zPyRvIvnAF1aV6K+ZOvX1CQ88Nt+hootaRP679nlA1ABEBAAG0
C0NJIFRlc3QgS2V5iNEEEwEIADsWIQTddJ401yTuXYuMICSKPQLRecu59AUCZKMj
KQIbAwULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgAAKCRCKPQLRecu59Ep9BACS
iOUI35vfcSGqk37HmfiPbCcQ64d8tMk/nKaxDaf+LCDh2q2euAIYCdnsvBjJzSCG
2qoBCKAzTBoXP+LLxZirgrJkDVi2avQ1Pgw9/2kKB8K6IS6GTjyBuAVqQpZ4USLa
G5wRdGc4NH1s6VFasTMPXTIESWYigMW4WlyJRTRMtriNBGSjIykBBAC2XVX42sqD
YGFbqS0dDuHU6TgW2U1SEehYqBvyo/gW/TznpuyQifPV24E+Ta1wgSHTKGa/LJve
sq13lF8WS9GdNRXPnIMdFKKfvRJ42mGc4OgWhgj2nylnlkTotAt/IQ+EqTRqEXna
uIaA97HjGjGDmBxv6lNCHj7R88WyHnR7ewARAQABiLYEGAEIACAWIQTddJ401yTu
XYuMICSKPQLRecu59AUCZKMjKQIbDAAKCRCKPQLRecu59E8UA/9belKI0PgwO5t6
aWczmDFMTfdDdoTbDtzsqugDDymbrTeg1qccC1X79z4kA0B0e3N7sKAZg16KmbW9
btOSw8dbfLg2PCzPoahosusiGzIbVJjQisgUNe1+dpwYrzONdTmbTw02rqfUZviy
H44nmH3v+d8CcspOtorjwMEleZ5krg==
=bygo
-----END PGP PUBLIC KEY BLOCK-----
12 changes: 6 additions & 6 deletions tests/charts/psql-service/0.1.11/psql-service-0.1.11.tgz.prov
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ version: 0.1.11

...
files:
psql-service-0.1.11.tgz: sha256:1205312f570d9608d17626f559c9280c2dde9b37ae0e6214c00c0e16c477fe10
psql-service-0.1.11.tgz: sha256:defaa409927744f7a2caa0b18467c28fc2343b3a2bd8d2fe8a104cd72d66c0c2
-----BEGIN PGP SIGNATURE-----

wpwEAQEKABAFAmM2W5oJEEV3oA9/h3YwAAA9jAQAG/Dz7nMFFphl7Zvzlu8mqbPU
xd2BjahzsepMYCpRqVBFtf8U8TvaZtcTc043utAlnjHKfTMylUXQCuZRmGTRqjme
9ZMWoRfN18/BcCMyp0Gro/yTy/Tjqsv5VBqR7CgBQlLZ9cR4eeTeTWqd4S9ldlU5
wmRykT9j0jZq9GPTS6M=
=k6d2
wpwEAQEKABAFAmSjJBsJEIo9AtF5y7n0AAA+YwQAM+ljvUeBCoRRYH0CVXyPPZGD
TbPum9UEsRwg5IeA6eF1VoV4GdYfH9bfdV+WMkSNqEz5ytm0Du2ETsFjxbHwxwbj
TuqqT3ZWmbeGv/yQ52m2l/GNFucF1l4N7ptUOGAronNpk98PCe4lsCyCf4YAZYG1
lKS31PyHHNSeRLslJ1M=
=GB+g
-----END PGP SIGNATURE-----
52 changes: 51 additions & 1 deletion tests/charts/psql-service/0.1.11/redhat-report-info.json
Original file line number Diff line number Diff line change
@@ -1 +1,51 @@
{"annotations":[{"name":"charts.openshift.io/digest","value":"sha256:df41f5fb2134bceb4b3340c1bf795cc6191835250738cae089aa2c278db04491"},{"name":"charts.openshift.io/lastCertifiedTimestamp","value":"2023-01-13T15:56:19.737913-05:00"},{"name":"charts.openshift.io/testedOpenShiftVersion","value":"4.11"},{"name":"charts.openshift.io/supportedOpenShiftVersions","value":"\u003e=4.7"}],"digests":{"chart":"sha256:df41f5fb2134bceb4b3340c1bf795cc6191835250738cae089aa2c278db04491","package":"1205312f570d9608d17626f559c9280c2dde9b37ae0e6214c00c0e16c477fe10","publicKey":"1cc31121e86388fad29e4cc6fc6660f102f43d8c52ce5f7d54e134c3cb94adc2"},"metadata":{"vendorType":"redhat","profileVersion":"v1.2","webCatalogOnly":false,"chart-uri":"psql-service-0.1.11.tgz","chart":{"name":"psql-service","version":"0.1.11","description":"A Helm chart for a RedHat Certified PSQL","apiVersion":"v2","appVersion":"10.0.0","annotations":{"charts.openshift.io/archs":"x86_64","charts.openshift.io/name":"PSQL RedHat Demo Chart","charts.openshift.io/provider":"RedHat","charts.openshift.io/supportURL":"https://github.com/dperaza4dustbit/helm-chart"},"kubeVersion":"\u003e=1.20.0","type":"application"}},"results":{"passed":"13","failed":"0","message":null}}
{
"annotations": [
{
"name": "charts.openshift.io/digest",
"value": "sha256:5a5584c48c449861d1ef23325d91a4fa1fd838e7754558e32119986f5b8dfeed"
},
{
"name": "charts.openshift.io/lastCertifiedTimestamp",
"value": "2023-01-13T15:56:19.737913-05:00"
},
{
"name": "charts.openshift.io/testedOpenShiftVersion",
"value": "4.11"
},
{
"name": "charts.openshift.io/supportedOpenShiftVersions",
"value": "\u003e=4.7"
}
],
"digests": {
"chart": "sha256:5a5584c48c449861d1ef23325d91a4fa1fd838e7754558e32119986f5b8dfeed",
"package": "defaa409927744f7a2caa0b18467c28fc2343b3a2bd8d2fe8a104cd72d66c0c2",
"publicKey": "e5ff2a2124a152af497deea4d4be2ba279a7daa43b39e182af3aa686daf12e1e"
},
"metadata": {
"vendorType": "redhat",
"profileVersion": "v1.2",
"webCatalogOnly": false,
"chart-uri": "psql-service-0.1.11.tgz",
"chart": {
"name": "psql-service",
"version": "0.1.11",
"description": "A Helm chart for a RedHat Certified PSQL",
"apiVersion": "v2",
"appVersion": "10.0.0",
"annotations": {
"charts.openshift.io/archs": "x86_64",
"charts.openshift.io/name": "PSQL RedHat Demo Chart",
"charts.openshift.io/provider": "RedHat",
"charts.openshift.io/supportURL": "https://github.com/dperaza4dustbit/helm-chart"
},
"kubeVersion": "\u003e=1.20.0",
"type": "application"
}
},
"results": {
"passed": "13",
"failed": "0",
"message": null
}
}
51 changes: 50 additions & 1 deletion tests/charts/psql-service/0.1.8/community-report-info.json
Original file line number Diff line number Diff line change
@@ -1 +1,50 @@
{"annotations":[{"name":"charts.openshift.io/digest","value":"sha256:614f8984d28167f234cd95392c8635e1e8db152a94d619b7e88f92c8e7045cac"},{"name":"charts.openshift.io/lastCertifiedTimestamp","value":"2023-03-01T16:46:41.753747+00:00"},{"name":"charts.openshift.io/testedOpenShiftVersion","value":"4.12"},{"name":"charts.openshift.io/supportedOpenShiftVersions","value":"\u003e=4.8"}],"digests":{"chart":"sha256:614f8984d28167f234cd95392c8635e1e8db152a94d619b7e88f92c8e7045cac","package":""},"metadata":{"vendorType":"community","profileVersion":"v1.2","webCatalogOnly":false,"chart-uri":"/charts/src","chart":{"name":"psql-service","version":"0.1.8","description":"A Helm chart for a RedHat Certified PSQL","apiVersion":"v2","appVersion":"10.0.0","annotations":{"charts.openshift.io/archs":"x86_64","charts.openshift.io/name":"PSQL RedHat Demo Chart","charts.openshift.io/provider":"RedHat","charts.openshift.io/supportURL":"https://github.com/dperaza4dustbit/helm-chart"},"kubeVersion":"\u003e=1.21","type":"application"}},"results":{"passed":"1","failed":"0","message":null}}
{
"annotations": [
{
"name": "charts.openshift.io/digest",
"value": "sha256:b035c5986fb63a6960db259de347769885aa363ebbeb818484502a9973d9b4d5"
},
{
"name": "charts.openshift.io/lastCertifiedTimestamp",
"value": "2023-03-01T16:46:41.753747+00:00"
},
{
"name": "charts.openshift.io/testedOpenShiftVersion",
"value": "4.12"
},
{
"name": "charts.openshift.io/supportedOpenShiftVersions",
"value": "\u003e=4.8"
}
],
"digests": {
"chart": "sha256:b035c5986fb63a6960db259de347769885aa363ebbeb818484502a9973d9b4d5",
"package": ""
},
"metadata": {
"vendorType": "community",
"profileVersion": "v1.2",
"webCatalogOnly": false,
"chart-uri": "/charts/src",
"chart": {
"name": "psql-service",
"version": "0.1.8",
"description": "A Helm chart for a RedHat Certified PSQL",
"apiVersion": "v2",
"appVersion": "10.0.0",
"annotations": {
"charts.openshift.io/archs": "x86_64",
"charts.openshift.io/name": "PSQL RedHat Demo Chart",
"charts.openshift.io/provider": "RedHat",
"charts.openshift.io/supportURL": "https://github.com/dperaza4dustbit/helm-chart"
},
"kubeVersion": "\u003e=1.21",
"type": "application"
}
},
"results": {
"passed": "1",
"failed": "0",
"message": null
}
}
51 changes: 50 additions & 1 deletion tests/charts/psql-service/0.1.8/partner-report-info.json
Original file line number Diff line number Diff line change
@@ -1 +1,50 @@
{"annotations":[{"name":"charts.openshift.io/digest","value":"sha256:614f8984d28167f234cd95392c8635e1e8db152a94d619b7e88f92c8e7045cac"},{"name":"charts.openshift.io/lastCertifiedTimestamp","value":"2023-03-01T16:48:53.163562+00:00"},{"name":"charts.openshift.io/testedOpenShiftVersion","value":"4.12"},{"name":"charts.openshift.io/supportedOpenShiftVersions","value":"\u003e=4.8"}],"digests":{"chart":"sha256:614f8984d28167f234cd95392c8635e1e8db152a94d619b7e88f92c8e7045cac","package":""},"metadata":{"vendorType":"partner","profileVersion":"v1.2","webCatalogOnly":false,"chart-uri":"/charts/src","chart":{"name":"psql-service","version":"0.1.8","description":"A Helm chart for a RedHat Certified PSQL","apiVersion":"v2","appVersion":"10.0.0","annotations":{"charts.openshift.io/archs":"x86_64","charts.openshift.io/name":"PSQL RedHat Demo Chart","charts.openshift.io/provider":"RedHat","charts.openshift.io/supportURL":"https://github.com/dperaza4dustbit/helm-chart"},"kubeVersion":"\u003e=1.21","type":"application"}},"results":{"passed":"13","failed":"0","message":null}}
{
"annotations": [
{
"name": "charts.openshift.io/digest",
"value": "sha256:b035c5986fb63a6960db259de347769885aa363ebbeb818484502a9973d9b4d5"
},
{
"name": "charts.openshift.io/lastCertifiedTimestamp",
"value": "2023-03-01T16:48:53.163562+00:00"
},
{
"name": "charts.openshift.io/testedOpenShiftVersion",
"value": "4.12"
},
{
"name": "charts.openshift.io/supportedOpenShiftVersions",
"value": "\u003e=4.8"
}
],
"digests": {
"chart": "sha256:b035c5986fb63a6960db259de347769885aa363ebbeb818484502a9973d9b4d5",
"package": ""
},
"metadata": {
"vendorType": "partner",
"profileVersion": "v1.2",
"webCatalogOnly": false,
"chart-uri": "/charts/src",
"chart": {
"name": "psql-service",
"version": "0.1.8",
"description": "A Helm chart for a RedHat Certified PSQL",
"apiVersion": "v2",
"appVersion": "10.0.0",
"annotations": {
"charts.openshift.io/archs": "x86_64",
"charts.openshift.io/name": "PSQL RedHat Demo Chart",
"charts.openshift.io/provider": "RedHat",
"charts.openshift.io/supportURL": "https://github.com/dperaza4dustbit/helm-chart"
},
"kubeVersion": "\u003e=1.21",
"type": "application"
}
},
"results": {
"passed": "13",
"failed": "0",
"message": null
}
}
Loading

0 comments on commit 5165419

Please sign in to comment.