Skip to content

Commit

Permalink
Cleanup of prow images (#12151)
Browse files Browse the repository at this point in the history
* Cleanup of prow images

dependabot update

dependabot update

Cleanup of prow images

dependabot update

dependabot update

fix buildx

fix documentation

* move cmd/images back to /images
  • Loading branch information
akiioto authored Oct 23, 2024
1 parent 32bc0bf commit bc8a310
Show file tree
Hide file tree
Showing 15 changed files with 9 additions and 585 deletions.
104 changes: 3 additions & 101 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ updates:
prefix: "tf"
include: "scope"
- package-ecosystem: "docker"
directory: "/prow/images/ginkgo"
directory: "/images/ginkgo"
labels:
- "docker"
- "skip-review"
Expand All @@ -68,66 +68,6 @@ updates:
commit-message:
prefix: "ginkgo"
include: "scope"
- package-ecosystem: "docker"
directory: "/prow/images/clonerefs"
labels:
- "docker"
- "skip-review"
- "area/dependency"
- "kind/chore"
schedule:
interval: "daily"
commit-message:
prefix: "clonerefs"
include: "scope"
- package-ecosystem: "docker"
directory: "/prow/images/kyma-integration"
labels:
- "docker"
- "skip-review"
- "area/dependency"
- "kind/chore"
schedule:
interval: "daily"
commit-message:
prefix: "kyma-integrate"
include: "scope"
- package-ecosystem: "docker"
directory: "/prow/images/whitesource-scanner"
labels:
- "docker"
- "skip-review"
- "area/dependency"
- "kind/chore"
schedule:
interval: "daily"
commit-message:
prefix: "whitesource"
include: "scope"
- package-ecosystem: "docker"
directory: "/prow/images/golangci-lint"
labels:
- "docker"
- "skip-review"
- "area/dependency"
- "kind/chore"
schedule:
interval: "daily"
commit-message:
prefix: "golangci-lint"
include: "scope"
- package-ecosystem: "docker"
directory: "/prow/images/cla-assistant-external-plugin"
labels:
- "docker"
- "skip-review"
- "area/dependency"
- "kind/chore"
schedule:
interval: "daily"
commit-message:
prefix: "cla-plugin"
include: "scope"
- package-ecosystem: "docker"
directory: "/cmd/cloud-run/move-gcs-bucket"
labels:
Expand Down Expand Up @@ -237,45 +177,7 @@ updates:
prefix: "unified-agent"
include: "scope"
- package-ecosystem: "docker"
directory: "/images/e2e-dind-gcloud"
labels:
- "docker"
- "skip-review"
- "area/dependency"
- "kind/chore"
schedule:
interval: "daily"
commit-message:
prefix: "e2e-dind-gcloud"
include: "scope"
- package-ecosystem: "docker"
directory: "/images/e2e-dind-garden"
labels:
- "docker"
- "skip-review"
- "area/dependency"
- "kind/chore"
schedule:
interval: "daily"
commit-message:
prefix: "e2e-dind-garden"
include: "scope"
# Busola must prepare for node update to newest version.
# We can enable this once preparation is done.
# - package-ecosystem: "docker"
# directory: "/images/e2e-dind-nodejs"
# labels:
# - "docker"
# - "skip-review"
# - "area/dependency"
# - "kind/chore"
# schedule:
# interval: "daily"
# commit-message:
# prefix: "e2e-dind-nodejs"
# include: "scope"
- package-ecosystem: "docker"
directory: "/images/e2e-dind-k3d"
directory: "/images/e2e-gcloud"
labels:
- "docker"
- "skip-review"
Expand All @@ -284,7 +186,7 @@ updates:
schedule:
interval: "daily"
commit-message:
prefix: "e2e-dind-k3d"
prefix: "e2e-gcloud"
include: "scope"
- package-ecosystem: "docker"
directory: "/images/alpine/git/gke-aws-auth"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/image-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
description: Path to the dockerfile used to build docker image
required: false
type: string
default: "prow/images/ginkgo/Dockerfile"
default: "images/ginkgo/Dockerfile"
context:
description: Build context to build container from
required: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-image-builder-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
uses: ./.github/workflows/image-builder.yml
with:
name: test-infra/ginkgo
dockerfile: prow/images/ginkgo/Dockerfile
dockerfile: images/ginkgo/Dockerfile
context: .
env-file: "envs"
tags: ${{ needs.compute-tag.outputs.tag }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-validate-kaniko-build-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ jobs:
- uses: docker://europe-docker.pkg.dev/kyma-project/prod/image-builder:v20241022-5fa8bfa1
id: build
with:
args: --name=test-infra/ginkgo --context=. --dockerfile=prow/images/ginkgo/Dockerfile --azure-access-token=${{ steps.secrets.outputs.ado-pat }} --oidc-token=${{ steps.get_oidc.outputs.jwt }} --env-file='envs' --build-in-ado=true --test-kaniko-build-config=true --config="./configs/image-builder-client-config.yaml"
args: --name=test-infra/ginkgo --context=. --dockerfile=images/ginkgo/Dockerfile --azure-access-token=${{ steps.secrets.outputs.ado-pat }} --oidc-token=${{ steps.get_oidc.outputs.jwt }} --env-file='envs' --build-in-ado=true --test-kaniko-build-config=true --config="./configs/image-builder-client-config.yaml"
4 changes: 2 additions & 2 deletions cmd/image-builder/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
with:
name: test-infra/ginkgo
dockerfile: prow/images/ginkgo/Dockerfile
dockerfile: images/ginkgo/Dockerfile
context: .
env-file: "envs"
tags: ${{ needs.compute-tag.outputs.tag }}
Expand All @@ -68,7 +68,7 @@ The example workflow consists of three jobs:
1. `compute-tag` - computes the tag for the image. It uses the `get_tag` step output to pass the tag to the `build-image` job.
2. `build-image` - builds the image using the Image Builder reusable workflow.
It uses the `kyma-project/test-infra/.github/workflows/image-builder.yml@main` reusable workflow.
It builds the `test-infra/ginkgo` image, using the Dockerfile from the `prow/images/gingko/Dockerfile` path.
It builds the `test-infra/ginkgo` image, using the Dockerfile from the `images/gingko/Dockerfile` path.
The build context is the current directory which effectively means the repository root.
It uses the `envs` file to load environment variables.
The image will be tagged with the tag computed in the `compute-tag` job.
Expand Down
5 changes: 1 addition & 4 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,4 @@

[External Secrets](/prow/cluster/resources/external-secrets/README.md) - Kubernetes Secrets are synchronized with Google Cloud Secret Manager using [External Secrets Operator](https://github.com/external-secrets/external-secrets).

[Images](/prow/images/README.md) - > DEPRECATED: Use the [`images`](/images) directory instead.

[Vulnerability Scanner](/prow/images/whitesource-scanner/README.md) - This folder contains the WhiteSource Unified Agent image that is based on the Java Buildpack image. Use it to perform WhiteSource vulnerability scans.

[Images](/images/README.md) - > DEPRECATED: Use the [`images`](/images) directory instead.
File renamed without changes.
File renamed without changes.
24 changes: 0 additions & 24 deletions prow/images/README.md

This file was deleted.

67 changes: 0 additions & 67 deletions prow/images/whitesource-scanner/Dockerfile

This file was deleted.

43 changes: 0 additions & 43 deletions prow/images/whitesource-scanner/Makefile

This file was deleted.

15 changes: 0 additions & 15 deletions prow/images/whitesource-scanner/README.md

This file was deleted.

Loading

0 comments on commit bc8a310

Please sign in to comment.