Skip to content

Commit

Permalink
chore: Use mirror.gcr.io instead ghcr.io as helm chart default
Browse files Browse the repository at this point in the history
  • Loading branch information
simar7 committed Nov 26, 2024
1 parent 65f5425 commit a7aca36
Show file tree
Hide file tree
Showing 22 changed files with 346 additions and 346 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,10 @@ jobs:
kubectl describe node
- name: Load operator image to cluster
run: >
docker tag ghcr.io/aquasecurity/trivy-operator:${{ github.sha }}-amd64
ghcr.io/aquasecurity/trivy-operator:e2e
docker tag mirror.gcr.io/aquasec/trivy-operator:${{ github.sha }}-amd64
mirror.gcr.io/aquasec/trivy-operator:e2e
docker save -o trivy-operator.tar ghcr.io/aquasecurity/trivy-operator:e2e
docker save -o trivy-operator.tar mirror.gcr.io/aquasec/trivy-operator:e2e
kind load image-archive trivy-operator.tar
- name: Init E2E tests (Install kuttl & helm)
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/chart-testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ jobs:
cmd: yq -i '.appVersion = "ct"' ./deploy/helm/Chart.yaml
- name: Load operator image to cluster
run: >
docker tag ghcr.io/aquasecurity/trivy-operator:${{ github.sha }}-amd64
ghcr.io/aquasecurity/trivy-operator:ct
docker tag mirror.gcr.io/aquasec/trivy-operator:${{ github.sha }}-amd64
mirror.gcr.io/aquasec/trivy-operator:ct
docker save -o trivy-operator.tar ghcr.io/aquasecurity/trivy-operator:ct
docker save -o trivy-operator.tar mirror.gcr.io/aquasec/trivy-operator:ct
kind load image-archive trivy-operator.tar
- name: Set up python
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/private-registries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ jobs:
-n private
- name: Load operator image to cluster
run: >
docker tag ghcr.io/aquasecurity/trivy-operator:${{ github.sha }}-amd64
ghcr.io/aquasecurity/trivy-operator:e2e
docker tag mirror.gcr.io/aquasec/trivy-operator:${{ github.sha }}-amd64
mirror.gcr.io/aquasec/trivy-operator:e2e
docker save -o trivy-operator.tar ghcr.io/aquasecurity/trivy-operator:e2e
docker save -o trivy-operator.tar mirror.gcr.io/aquasec/trivy-operator:e2e
kind load image-archive trivy-operator.tar
- name: Init E2E tests (Install kuttl & helm)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-snapshot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Scan Trivy Operator image for vulnerabilities
uses: aquasecurity/trivy-action@master
with:
image-ref: 'ghcr.io/aquasecurity/trivy-operator:${{ github.sha }}-amd64'
image-ref: 'mirror.gcr.io/aquasec/trivy-operator:${{ github.sha }}-amd64'
exit-code: '1'
ignore-unfixed: true
severity: 'CRITICAL,HIGH'
Expand Down
40 changes: 20 additions & 20 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ dockers:
- image_templates:
- "docker.io/aquasec/trivy-operator:{{ .Version }}-amd64"
- "public.ecr.aws/aquasecurity/trivy-operator:{{ .Version }}-amd64"
- "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-amd64"
# - "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-amd64"
use: buildx
goos: linux
dockerfile: build/trivy-operator/Dockerfile
Expand All @@ -90,7 +90,7 @@ dockers:
- image_templates:
- "docker.io/aquasec/trivy-operator:{{ .Version }}-ubi8-amd64"
- "public.ecr.aws/aquasecurity/trivy-operator:{{ .Version }}-ubi8-amd64"
- "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-ubi8-amd64"
# - "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-ubi8-amd64"
use: buildx
goos: linux
dockerfile: build/trivy-operator/Dockerfile.ubi8
Expand All @@ -110,7 +110,7 @@ dockers:
- image_templates:
- "docker.io/aquasec/trivy-operator:{{ .Version }}-arm64"
- "public.ecr.aws/aquasecurity/trivy-operator:{{ .Version }}-arm64"
- "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-arm64"
# - "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-arm64"
use: buildx
goos: linux
dockerfile: build/trivy-operator/Dockerfile
Expand All @@ -130,7 +130,7 @@ dockers:
- image_templates:
- "docker.io/aquasec/trivy-operator:{{ .Version }}-ubi8-arm64"
- "public.ecr.aws/aquasecurity/trivy-operator:{{ .Version }}-ubi8-arm64"
- "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-ubi8-arm64"
# - "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-ubi8-arm64"
use: buildx
goos: linux
dockerfile: build/trivy-operator/Dockerfile.ubi8
Expand All @@ -150,7 +150,7 @@ dockers:
- image_templates:
- "docker.io/aquasec/trivy-operator:{{ .Version }}-s390x"
- "public.ecr.aws/aquasecurity/trivy-operator:{{ .Version }}-s390x"
- "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-s390x"
# - "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-s390x"
use: buildx
goos: linux
dockerfile: build/trivy-operator/Dockerfile
Expand All @@ -170,7 +170,7 @@ dockers:
- image_templates:
- "docker.io/aquasec/trivy-operator:{{ .Version }}-ppc64le"
- "public.ecr.aws/aquasecurity/trivy-operator:{{ .Version }}-ppc64le"
- "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-ppc64le"
# - "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-ppc64le"
use: buildx
goos: linux
dockerfile: build/trivy-operator/Dockerfile
Expand All @@ -190,7 +190,7 @@ dockers:
- image_templates:
- "docker.io/aquasec/trivy-operator:{{ .Version }}-ubi8-s390x"
- "public.ecr.aws/aquasecurity/trivy-operator:{{ .Version }}-ubi8-s390x"
- "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-ubi8-s390x"
# - "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-ubi8-s390x"
use: buildx
goos: linux
dockerfile: build/trivy-operator/Dockerfile.ubi8
Expand All @@ -210,7 +210,7 @@ dockers:
- image_templates:
- "docker.io/aquasec/trivy-operator:{{ .Version }}-ubi8-ppc64le"
- "public.ecr.aws/aquasecurity/trivy-operator:{{ .Version }}-ubi8-ppc64le"
- "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-ubi8-ppc64le"
# - "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-ubi8-ppc64le"
use: buildx
goos: linux
dockerfile: build/trivy-operator/Dockerfile.ubi8
Expand Down Expand Up @@ -252,18 +252,18 @@ docker_manifests:
- "public.ecr.aws/aquasecurity/trivy-operator:{{ .Version }}-ubi8-arm64"
- "public.ecr.aws/aquasecurity/trivy-operator:{{ .Version }}-ubi8-s390x"
- "public.ecr.aws/aquasecurity/trivy-operator:{{ .Version }}-ubi8-ppc64le"
- name_template: "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}"
image_templates:
- "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-amd64"
- "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-arm64"
- "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-s390x"
- "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-ppc64le"
- name_template: "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-ubi8"
image_templates:
- "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-ubi8-amd64"
- "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-ubi8-arm64"
- "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-ubi8-s390x"
- "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-ubi8-ppc64le"
# - name_template: "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}"
# image_templates:
# - "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-amd64"
# - "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-arm64"
# - "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-s390x"
# - "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-ppc64le"
# - name_template: "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-ubi8"
# image_templates:
# - "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-ubi8-amd64"
# - "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-ubi8-arm64"
# - "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-ubi8-s390x"
# - "ghcr.io/aquasecurity/trivy-operator:{{ .Version }}-ubi8-ppc64le"

signs:
- cmd: cosign
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ have to

## Build Binaries

| Binary | Image | Description |
|----------------------|------------------------------------------------|---------------------------------------------------------------|
| `trivy-operator` | `ghcr.io/aquasecurity/trivy-operator:dev` | Trivy Operator |
| Binary | Image | Description |
|------------------|-------------------------------------------|----------------|
| `trivy-operator` | `mirror.gcr.io/aquasec/trivy-operator:dev` | Trivy Operator |

To build all Trivy-operator binary, run:

Expand Down
Loading

0 comments on commit a7aca36

Please sign in to comment.