Skip to content

Commit 9422c6b

Browse files
committed
refactor: add adm-controller prefix to built container image refs
Update all references to the 3 container images built by this repository to use the new adm-controller path prefix, matching the images published by CI with repository-prefix: adm-controller: ghcr.io/kubewarden/controller → ghcr.io/kubewarden/adm-controller/controller ghcr.io/kubewarden/audit-scanner → ghcr.io/kubewarden/adm-controller/audit-scanner ghcr.io/kubewarden/policy-server → ghcr.io/kubewarden/adm-controller/policy-server Policy and test images (ghcr.io/kubewarden/policies/*, tests/*) are not built here and are left unchanged. Assisted-by: Github Copilot Signed-off-by: José Guilherme Vanz <jguilhermevanz@suse.com>
1 parent bb6aeb2 commit 9422c6b

9 files changed

Lines changed: 29 additions & 29 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ GO_BUILD_ENV := CGO_ENABLED=0 GOOS=linux GOARCH=amd64
1313
ENVTEST_DIR ?= $(shell pwd)/.envtest
1414

1515
REGISTRY ?= ghcr.io
16-
REPO ?= kubewarden
16+
REPO ?= kubewarden/adm-controller
1717
TAG ?= dev
1818

1919
# Detect architecture for Rust builds

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ To verify the attestation manifest and its layer signatures:
7575
```shell
7676
cosign verify --certificate-oidc-issuer=https://token.actions.githubusercontent.com \
7777
--certificate-identity="https://github.com/kubewarden/adm-controller/.github/workflows/attestation.yml@<TAG TO VERIFY>" \
78-
ghcr.io/kubewarden/controller@sha256:1abc0944378d9f3ee2963123fe84d045248d320d76325f4c2d4eb201304d4c4e
78+
ghcr.io/kubewarden/adm-controller/controller@sha256:1abc0944378d9f3ee2963123fe84d045248d320d76325f4c2d4eb201304d4c4e
7979
```
8080

8181
> [!NOTE]
@@ -89,7 +89,7 @@ like `crane`. For example, the following command will show you all the
8989
attestation manifests of the `latest` tag:
9090

9191
```shell
92-
crane manifest ghcr.io/kubewarden/controller:latest | jq '.manifests[] | select(.annotations["vnd.docker.reference.type"]=="attestation-manifest")'
92+
crane manifest ghcr.io/kubewarden/adm-controller/controller:latest | jq '.manifests[] | select(.annotations["vnd.docker.reference.type"]=="attestation-manifest")'
9393
{
9494
"mediaType": "application/vnd.oci.image.manifest.v1+json",
9595
"digest": "sha256:fc01fa6c82cffeffd23b737c7e6b153357d1e499295818dad0c7d207f64e6ee8",
@@ -124,9 +124,9 @@ layers signatures.
124124
```shell
125125
cosign verify --certificate-oidc-issuer=https://token.actions.githubusercontent.com \
126126
--certificate-identity="https://github.com/kubewarden/adm-controller/.github/workflows/attestation.yml@<TAG TO VERIFY>" \
127-
ghcr.io/kubewarden/controller@sha256:fc01fa6c82cffeffd23b737c7e6b153357d1e499295818dad0c7d207f64e6ee8
127+
ghcr.io/kubewarden/adm-controller/controller@sha256:fc01fa6c82cffeffd23b737c7e6b153357d1e499295818dad0c7d207f64e6ee8
128128

129-
crane manifest ghcr.io/kubewarden/controller@sha256:fc01fa6c82cffeffd23b737c7e6b153357d1e499295818dad0c7d207f64e6ee8
129+
crane manifest ghcr.io/kubewarden/adm-controller/controller@sha256:fc01fa6c82cffeffd23b737c7e6b153357d1e499295818dad0c7d207f64e6ee8
130130
{
131131
"schemaVersion": 2,
132132
"mediaType": "application/vnd.oci.image.manifest.v1+json",
@@ -181,7 +181,7 @@ crane manifest ghcr.io/kubewarden/controller@sha256:fc01fa6c82cffeffd23b737c7e6
181181

182182
cosign verify --certificate-oidc-issuer=https://token.actions.githubusercontent.com \
183183
--certificate-identity="https://github.com/kubewarden/adm-controller/.github/workflows/attestation.yml@<TAG TO VERIFY>" \
184-
ghcr.io/kubewarden/controller@sha256:594da3e8bd8c6ee2682b0db35857933f9558fd98ec092344a6c1e31398082f4d
184+
ghcr.io/kubewarden/adm-controller/controller@sha256:594da3e8bd8c6ee2682b0db35857933f9558fd98ec092344a6c1e31398082f4d
185185
```
186186

187187
Note that each attestation manifest (for each architecture) has its own layers.
@@ -190,7 +190,7 @@ Buildx during the multi stage build process. You can also use `crane` to
190190
download the attestation file:
191191

192192
```shell
193-
crane blob ghcr.io/kubewarden/controller@sha256:7738d8d506c6482aaaef1d22ed920468ffaf4975afd28f49bb50dba2c20bf2ca
193+
crane blob ghcr.io/kubewarden/adm-controller/controller@sha256:7738d8d506c6482aaaef1d22ed920468ffaf4975afd28f49bb50dba2c20bf2ca
194194
```
195195

196196
## Security disclosure

api/policies/v1/factories.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515

1616
const (
1717
integrationTestsFinalizer = "kubewarden.io/integration-tests-safety-net-finalizer"
18-
defaultKubewardenRepository = "ghcr.io/kubewarden/policy-server"
18+
defaultKubewardenRepository = "ghcr.io/kubewarden/adm-controller/policy-server"
1919
maxNameSuffixLength = 8
2020
defaultPolicyGroupRejectionMessage = "policy group default rejection message"
2121
)

charts/hauler_manifest.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ metadata:
1212
hauler.dev/certificate-oidc-issuer: https://token.actions.githubusercontent.com
1313
spec:
1414
images:
15-
- name: ghcr.io/kubewarden/audit-scanner:v1.35.0
15+
- name: ghcr.io/kubewarden/adm-controller/audit-scanner:v1.35.0
1616
certificate-identity-regexp: https://github.com/kubewarden/adm-controller/.github/workflows/release.yml@refs/tags/v1.35.0
17-
- name: ghcr.io/kubewarden/controller:v1.35.0
17+
- name: ghcr.io/kubewarden/adm-controller/controller:v1.35.0
1818
certificate-identity-regexp: https://github.com/kubewarden/adm-controller/.github/workflows/release.yml@refs/tags/v1.35.0
19-
- name: ghcr.io/kubewarden/policy-server:v1.35.0
19+
- name: ghcr.io/kubewarden/adm-controller/policy-server:v1.35.0
2020
certificate-identity-regexp: https://github.com/kubewarden/adm-controller/.github/workflows/release.yml@refs/tags/v1.35.0
2121
---
2222
# The policies are in a separated definition just to allow a better keyless validation

charts/kubewarden-controller/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ To verify the attestation manifest and its layer signatures:
7575
```shell
7676
cosign verify --certificate-oidc-issuer=https://token.actions.githubusercontent.com \
7777
--certificate-identity="https://github.com/kubewarden/adm-controller/.github/workflows/attestation.yml@<TAG TO VERIFY>" \
78-
ghcr.io/kubewarden/controller@sha256:1abc0944378d9f3ee2963123fe84d045248d320d76325f4c2d4eb201304d4c4e
78+
ghcr.io/kubewarden/adm-controller/controller@sha256:1abc0944378d9f3ee2963123fe84d045248d320d76325f4c2d4eb201304d4c4e
7979
```
8080

8181
> [!NOTE]
@@ -89,7 +89,7 @@ like `crane`. For example, the following command will show you all the
8989
attestation manifests of the `latest` tag:
9090

9191
```shell
92-
crane manifest ghcr.io/kubewarden/controller:latest | jq '.manifests[] | select(.annotations["vnd.docker.reference.type"]=="attestation-manifest")'
92+
crane manifest ghcr.io/kubewarden/adm-controller/controller:latest | jq '.manifests[] | select(.annotations["vnd.docker.reference.type"]=="attestation-manifest")'
9393
{
9494
"mediaType": "application/vnd.oci.image.manifest.v1+json",
9595
"digest": "sha256:fc01fa6c82cffeffd23b737c7e6b153357d1e499295818dad0c7d207f64e6ee8",
@@ -124,9 +124,9 @@ layers signatures.
124124
```shell
125125
cosign verify --certificate-oidc-issuer=https://token.actions.githubusercontent.com \
126126
--certificate-identity="https://github.com/kubewarden/adm-controller/.github/workflows/attestation.yml@<TAG TO VERIFY>" \
127-
ghcr.io/kubewarden/controller@sha256:fc01fa6c82cffeffd23b737c7e6b153357d1e499295818dad0c7d207f64e6ee8
127+
ghcr.io/kubewarden/adm-controller/controller@sha256:fc01fa6c82cffeffd23b737c7e6b153357d1e499295818dad0c7d207f64e6ee8
128128

129-
crane manifest ghcr.io/kubewarden/controller@sha256:fc01fa6c82cffeffd23b737c7e6b153357d1e499295818dad0c7d207f64e6ee8
129+
crane manifest ghcr.io/kubewarden/adm-controller/controller@sha256:fc01fa6c82cffeffd23b737c7e6b153357d1e499295818dad0c7d207f64e6ee8
130130
{
131131
"schemaVersion": 2,
132132
"mediaType": "application/vnd.oci.image.manifest.v1+json",
@@ -181,7 +181,7 @@ crane manifest ghcr.io/kubewarden/controller@sha256:fc01fa6c82cffeffd23b737c7e6
181181

182182
cosign verify --certificate-oidc-issuer=https://token.actions.githubusercontent.com \
183183
--certificate-identity="https://github.com/kubewarden/adm-controller/.github/workflows/attestation.yml@<TAG TO VERIFY>" \
184-
ghcr.io/kubewarden/controller@sha256:594da3e8bd8c6ee2682b0db35857933f9558fd98ec092344a6c1e31398082f4d
184+
ghcr.io/kubewarden/adm-controller/controller@sha256:594da3e8bd8c6ee2682b0db35857933f9558fd98ec092344a6c1e31398082f4d
185185
```
186186

187187
Note that each attestation manifest (for each architecture) has its own layers.
@@ -190,7 +190,7 @@ Buildx during the multi stage build process. You can also use `crane` to
190190
download the attestation file:
191191

192192
```shell
193-
crane blob ghcr.io/kubewarden/controller@sha256:7738d8d506c6482aaaef1d22ed920468ffaf4975afd28f49bb50dba2c20bf2ca
193+
crane blob ghcr.io/kubewarden/adm-controller/controller@sha256:7738d8d506c6482aaaef1d22ed920468ffaf4975afd28f49bb50dba2c20bf2ca
194194
```
195195

196196
## Security disclosure

charts/kubewarden-controller/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ telemetry:
217217
image:
218218
# The registry is defined in the global.cattle.systemDefaultRegistry value
219219
# controller image to be used
220-
repository: "kubewarden/controller"
220+
repository: "kubewarden/adm-controller/controller"
221221
# image tag
222222
tag: v1.35.0
223223
pullPolicy: IfNotPresent
@@ -295,7 +295,7 @@ auditScanner:
295295
image:
296296
# The registry is defined in the common.cattle.systemDefaultRegistry value
297297
# kubectl image to be used in the pre-delete helm hook
298-
repository: "kubewarden/audit-scanner"
298+
repository: "kubewarden/adm-controller/audit-scanner"
299299
tag: v1.35.0
300300
pullPolicy: IfNotPresent
301301
cronJob:

e2e/main_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ var (
2424
testenv env.Environment
2525
kindClusterName string
2626
namespace = "kubewarden"
27-
controllerImage = "ghcr.io/kubewarden/controller:dev"
28-
auditScannerImage = "ghcr.io/kubewarden/audit-scanner:dev"
29-
policyServerImage = "ghcr.io/kubewarden/policy-server:dev"
27+
controllerImage = "ghcr.io/kubewarden/adm-controller/controller:dev"
28+
auditScannerImage = "ghcr.io/kubewarden/adm-controller/audit-scanner:dev"
29+
policyServerImage = "ghcr.io/kubewarden/adm-controller/policy-server:dev"
3030
)
3131

3232
func TestMain(m *testing.M) {

scripts/test-sigstore-e2e.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
# configuration. Skips policy deployment and webhook evaluation.
3030
# --policy-server-image Full image reference (repository:tag) for the policy-server.
3131
# Overrides the default image in charts/kubewarden-defaults.
32-
# Example: --policy-server-image ghcr.io/kubewarden/policy-server:dev
32+
# Example: --policy-server-image ghcr.io/kubewarden/adm-controller/policy-server:dev
3333
#
3434
# Tools required (per stage):
3535
# All stages: kubectl, jq

updatecli/values/artifacts.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ ociArtifacts:
1313
# image defined in the release process
1414
- file: "charts/kubewarden-controller/values.yaml"
1515
key: "$.image.tag"
16-
image: "ghcr.io/kubewarden/controller"
16+
image: "ghcr.io/kubewarden/adm-controller/controller"
1717
workflowUrl: "https://github.com/kubewarden/adm-controller/.github/workflows/release.yml@refs/tags"
1818
skipVersionFromRegistry: true
1919
- file: "charts/kubewarden-controller/values.yaml"
2020
key: "$.auditScanner.image.tag"
21-
image: "ghcr.io/kubewarden/audit-scanner"
21+
image: "ghcr.io/kubewarden/adm-controller/audit-scanner"
2222
workflowUrl: "https://github.com/kubewarden/adm-controller/.github/workflows/release.yml@refs/tags"
2323
skipVersionFromRegistry: true
2424
- file: "charts/kubewarden-defaults/values.yaml"
2525
key: "$.policyServer.image.tag"
26-
image: "ghcr.io/kubewarden/policy-server"
26+
image: "ghcr.io/kubewarden/adm-controller/policy-server"
2727
workflowUrl: "https://github.com/kubewarden/adm-controller/.github/workflows/release.yml@refs/tags"
2828
skipVersionFromRegistry: true
2929
# Policies
@@ -75,15 +75,15 @@ kubewardenContainerImage:
7575
- name: "controller"
7676
file: "charts/kubewarden-controller/values.yaml"
7777
key: "$.image.tag"
78-
image: "ghcr.io/kubewarden/controller"
78+
image: "ghcr.io/kubewarden/adm-controller/controller"
7979
workflowUrl: "https://github.com/kubewarden/adm-controller/.github/workflows/release.yml@refs/tags"
8080
- name: "auditScanner"
8181
file: "charts/kubewarden-controller/values.yaml"
8282
key: "$.auditScanner.image.tag"
83-
image: "ghcr.io/kubewarden/audit-scanner"
83+
image: "ghcr.io/kubewarden/adm-controller/audit-scanner"
8484
workflowUrl: "https://github.com/kubewarden/audit-scanner/.github/workflows/release.yml@refs/tags"
8585
- name: "policyServer"
8686
file: "charts/kubewarden-defaults/values.yaml"
8787
key: "$.policyServer.image.tag"
88-
image: "ghcr.io/kubewarden/policy-server"
88+
image: "ghcr.io/kubewarden/adm-controller/policy-server"
8989
workflowUrl: "https://github.com/kubewarden/policy-server/.github/workflows/release.yml@refs/tags"

0 commit comments

Comments
 (0)