diff --git a/Makefile b/Makefile index 7da118870e..0815aeb62e 100644 --- a/Makefile +++ b/Makefile @@ -6,21 +6,21 @@ COLLECTOR_TAG ?= ${VERSION} REMOVER_TAG ?= ${VERSION} # Image URL to use all building/pushing image targets -TRIVY_SCANNER_REPO ?= ghcr.io/azure/eraser-trivy-scanner +TRIVY_SCANNER_REPO ?= ghcr.io/eraser-dev/eraser-trivy-scanner TRIVY_SCANNER_IMG ?= ${TRIVY_SCANNER_REPO}:${TRIVY_SCANNER_TAG} TRIVY_BINARY_REPO ?= ghcr.io/aquasecurity/trivy TRIVY_BINARY_TAG ?= 0.43.0 TRIVY_BINARY_IMG ?= ${TRIVY_BINARY_REPO}:${TRIVY_BINARY_TAG} -MANAGER_REPO ?= ghcr.io/azure/eraser-manager +MANAGER_REPO ?= ghcr.io/eraser-dev/eraser-manager MANAGER_IMG ?= ${MANAGER_REPO}:${MANAGER_TAG} -REMOVER_REPO ?= ghcr.io/azure/remover +REMOVER_REPO ?= ghcr.io/eraser-dev/remover REMOVER_IMG ?= ${REMOVER_REPO}:${REMOVER_TAG} -COLLECTOR_REPO ?= ghcr.io/azure/collector +COLLECTOR_REPO ?= ghcr.io/eraser-dev/collector COLLECTOR_IMG ?= ${COLLECTOR_REPO}:${COLLECTOR_TAG} VULNERABLE_IMG ?= docker.io/library/alpine:3.7.3 EOL_IMG ?= docker.io/library/alpine:3.1 BUSYBOX_BASE_IMG ?= busybox:1.36.0 -NON_VULNERABLE_IMG ?= ghcr.io/azure/non-vulnerable:latest +NON_VULNERABLE_IMG ?= ghcr.io/eraser-dev/non-vulnerable:latest E2E_TESTS ?= $(shell find ./test/e2e/tests/ -mindepth 1 -type d) API_VERSIONS ?= ./api/v1alpha1,./api/v1,./api/v1alpha2 @@ -264,7 +264,7 @@ release-manifest: ## Generates manifests for a release. @sed -i "s/version: .*/version: $$(echo ${NEWVERSION} | cut -c2-)/" ./third_party/open-policy-agent/gatekeeper/helmify/static/Chart.yaml @sed -Ei 's/(tag:\s*).*/\1"$(NEWVERSION)"/' ./third_party/open-policy-agent/gatekeeper/helmify/static/values.yaml @sed -i 's/Current release version: `.*`/Current release version: `'"${NEWVERSION}"'`/' ./third_party/open-policy-agent/gatekeeper/helmify/static/README.md - @sed -i 's/https:\/\/raw\.githubusercontent\.com\/Azure\/eraser\/master\/deploy\/eraser\.yaml.*/https:\/\/raw\.githubusercontent\.com\/Azure\/eraser\/${NEWVERSION}\/deploy\/eraser\.yaml/' ./docs/docs/installation.md + @sed -i 's/https:\/\/raw\.githubusercontent\.com\/eraser-dev\/eraser\/master\/deploy\/eraser\.yaml.*/https:\/\/raw\.githubusercontent\.com\/eraser-dev\/eraser\/${NEWVERSION}\/deploy\/eraser\.yaml/' ./docs/docs/installation.md export $(MAKE) manifests diff --git a/PROJECT b/PROJECT index 8a7681c672..78e71ffae4 100644 --- a/PROJECT +++ b/PROJECT @@ -1,36 +1,36 @@ -domain: azure-eraser.io +domain: eraser-dev.io layout: - go.kubebuilder.io/v3 projectName: eraser -repo: github.com/Azure/eraser +repo: github.com/eraser-dev/eraser resources: - api: crdVersion: v1alpha1 namespaced: true controller: true - domain: azure-eraser.io + domain: eraser-dev.io group: eraser.sh kind: ImageList - path: azure-eraser.io/eraser/api/v1alpha1 + path: eraser.io/eraser/api/v1alpha1 version: v1alpha1 - controller: true - domain: azure-eraser.io + domain: eraser-dev.io group: eraser.sh kind: ImageCollector version: v1alpha1 -- domain: azure-eraser.io +- domain: eraser-dev.io group: eraser.sh kind: ImageList version: v1 - api: crdVersion: v1 namespaced: true - domain: azure-eraser.io + domain: eraser.io group: eraser.sh kind: EraserConfig - path: github.com/Azure/eraser/api/v1alpha1 + path: github.com/eraser-dev/eraser/api/v1alpha1 version: v1alpha1 -- domain: azure-eraser.io +- domain: eraser.io group: eraser.sh kind: EraserConfig version: v1alpha2 diff --git a/README.md b/README.md index b2dce121ed..6e5f223de9 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,11 @@ Eraser helps Kubernetes admins remove a list of non-running images from all Kubernetes nodes in a cluster. -[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/Azure/eraser/badge)](https://api.securityscorecards.dev/projects/github.com/Azure/eraser) +[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/eraser-dev/eraser/badge)](https://api.securityscorecards.dev/projects/github.com/eraser-dev/eraser) ## Getting started -You can find a quick start guide in the Eraser [documentation](https://azure.github.io/eraser/docs/quick-start). +You can find a quick start guide in the Eraser [documentation](https://eraser-dev.github.io/eraser/docs/quick-start). ## Demo @@ -19,7 +19,7 @@ There are several ways to get involved: - Join the [mailing list](https://groups.google.com/u/1/g/eraser-dev) to get notifications for releases, security announcements, etc. - Join the [biweekly community meetings](https://docs.google.com/document/d/1Sj5u47K3WUGYNPmQHGFpb52auqZb1FxSlWAQnPADhWI/edit) to discuss development, issues, use cases, etc. - Join the `#eraser` channel on the [Kubernetes Slack](https://kubernetes.slack.com/archives/C03Q8KV8YQ4) -- View the development setup instructions in the [documentation](https://azure.github.io/eraser/docs/setup) +- View the development setup instructions in the [documentation](https://eraser-dev.github.io/eraser/docs/setup) This project welcomes contributions and suggestions. @@ -29,6 +29,6 @@ This project has adopted the [CNCF Code of Conduct](https://github.com/cncf/foun ### How to file issues and get help -This project uses GitHub Issues to track bugs and feature requests. Please search the [existing issues](https://github.com/Azure/eraser/issues) before filing new issues to avoid duplicates. For new issues, file your bug or feature request as a new Issue. +This project uses GitHub Issues to track bugs and feature requests. Please search the [existing issues](https://github.com/eraser-dev/eraser/issues) before filing new issues to avoid duplicates. For new issues, file your bug or feature request as a new Issue. The Eraser maintainers will respond to the best of their abilities. \ No newline at end of file diff --git a/api/unversioned/config/config.go b/api/unversioned/config/config.go index 150147d8fd..02bb1856a5 100644 --- a/api/unversioned/config/config.go +++ b/api/unversioned/config/config.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/Azure/eraser/api/unversioned" - "github.com/Azure/eraser/version" + "github.com/eraser-dev/eraser/api/unversioned" + "github.com/eraser-dev/eraser/version" "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/api/v1/doc.go b/api/v1/doc.go index 7c447bf4a4..0d9a612324 100644 --- a/api/v1/doc.go +++ b/api/v1/doc.go @@ -1,2 +1,2 @@ -// +k8s:conversion-gen=github.com/Azure/eraser/api/unversioned +// +k8s:conversion-gen=github.com/eraser-dev/eraser/api/unversioned package v1 diff --git a/api/v1/zz_generated.conversion.go b/api/v1/zz_generated.conversion.go index 13f8c405fe..816e166670 100644 --- a/api/v1/zz_generated.conversion.go +++ b/api/v1/zz_generated.conversion.go @@ -23,7 +23,7 @@ package v1 import ( unsafe "unsafe" - unversioned "github.com/Azure/eraser/api/unversioned" + unversioned "github.com/eraser-dev/eraser/api/unversioned" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" diff --git a/api/v1alpha1/config/config.go b/api/v1alpha1/config/config.go index c0e02c33ba..a1d678031e 100644 --- a/api/v1alpha1/config/config.go +++ b/api/v1alpha1/config/config.go @@ -5,8 +5,8 @@ import ( "sync" "time" - v1alpha1 "github.com/Azure/eraser/api/v1alpha1" - "github.com/Azure/eraser/version" + v1alpha1 "github.com/eraser-dev/eraser/api/v1alpha1" + "github.com/eraser-dev/eraser/version" "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/api/v1alpha1/doc.go b/api/v1alpha1/doc.go index 401ba1a474..b188ccbffe 100644 --- a/api/v1alpha1/doc.go +++ b/api/v1alpha1/doc.go @@ -1,2 +1,2 @@ -// +k8s:conversion-gen=github.com/Azure/eraser/api/unversioned +// +k8s:conversion-gen=github.com/eraser-dev/eraser/api/unversioned package v1alpha1 diff --git a/api/v1alpha1/eraserconfig_types.go b/api/v1alpha1/eraserconfig_types.go index 9fd9c6e2c7..c27bde1fb0 100644 --- a/api/v1alpha1/eraserconfig_types.go +++ b/api/v1alpha1/eraserconfig_types.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/Azure/eraser/api/unversioned" + "github.com/eraser-dev/eraser/api/unversioned" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/conversion" diff --git a/api/v1alpha1/zz_generated.conversion.go b/api/v1alpha1/zz_generated.conversion.go index 665bcfcde0..70c4d3e92e 100644 --- a/api/v1alpha1/zz_generated.conversion.go +++ b/api/v1alpha1/zz_generated.conversion.go @@ -23,7 +23,7 @@ package v1alpha1 import ( unsafe "unsafe" - unversioned "github.com/Azure/eraser/api/unversioned" + unversioned "github.com/eraser-dev/eraser/api/unversioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" diff --git a/api/v1alpha2/config/config.go b/api/v1alpha2/config/config.go index 29aa1139be..1bf0524f9b 100644 --- a/api/v1alpha2/config/config.go +++ b/api/v1alpha2/config/config.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/Azure/eraser/api/v1alpha2" - "github.com/Azure/eraser/version" + "github.com/eraser-dev/eraser/api/v1alpha2" + "github.com/eraser-dev/eraser/version" "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/api/v1alpha2/doc.go b/api/v1alpha2/doc.go index aee785ac17..1b5810ff83 100644 --- a/api/v1alpha2/doc.go +++ b/api/v1alpha2/doc.go @@ -1,2 +1,2 @@ -// +k8s:conversion-gen=github.com/Azure/eraser/api/unversioned +// +k8s:conversion-gen=github.com/eraser-dev/eraser/api/unversioned package v1alpha2 diff --git a/api/v1alpha2/zz_generated.conversion.go b/api/v1alpha2/zz_generated.conversion.go index 4b7c956637..d0b8be8dab 100644 --- a/api/v1alpha2/zz_generated.conversion.go +++ b/api/v1alpha2/zz_generated.conversion.go @@ -23,7 +23,7 @@ package v1alpha2 import ( unsafe "unsafe" - unversioned "github.com/Azure/eraser/api/unversioned" + unversioned "github.com/eraser-dev/eraser/api/unversioned" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/build/version.sh b/build/version.sh index f00f78382c..9a057c31d5 100755 --- a/build/version.sh +++ b/build/version.sh @@ -72,7 +72,7 @@ version::ldflags() { local key=${1} local val=${2} ldflags+=( - "-X 'github.com/Azure/eraser/version.${key}=${val}'" + "-X 'github.com/eraser-dev/eraser/version.${key}=${val}'" ) } diff --git a/charts/eraser/Chart.yaml b/charts/eraser/Chart.yaml index 1c7befdf8b..9d54b1799c 100644 --- a/charts/eraser/Chart.yaml +++ b/charts/eraser/Chart.yaml @@ -4,6 +4,6 @@ description: A Helm chart for Eraser type: application version: 1.1.1 appVersion: v1.1.1 -home: https://github.com/Azure/eraser +home: https://github.com/eraser-dev/eraser sources: - - https://github.com/Azure/eraser.git + - https://github.com/eraser-dev/eraser.git diff --git a/charts/eraser/README.md b/charts/eraser/README.md index 47ae1a4dc3..a2ad3ced96 100644 --- a/charts/eraser/README.md +++ b/charts/eraser/README.md @@ -7,7 +7,7 @@ This Helm chart is autogenerated from the Eraser static manifest. The generator ## Get Repo Info ```console -helm repo add eraser https://azure.github.io/eraser/charts +helm repo add eraser https://eraser-dev.github.io/eraser/charts helm repo update ``` @@ -49,7 +49,7 @@ _See [helm install](https://helm.sh/docs/helm/helm_install/) for command documen | runtimeConfig.components.collector | Settings for the collector component. | `{ enabled: false }` | | runtimeConfig.components.scanner | Settings for the scanner component. | `{ enabled: false }` | | runtimeConfig.components.eraser | Settings for the eraser component. | `{}` | -| deploy.image.repo | Repository for the image. | `ghcr.io/azure/eraser-manager` | +| deploy.image.repo | Repository for the image. | `ghcr.io/eraser-dev/eraser-manager` | | deploy.image.pullPolicy | Policy for pulling the image. | `IfNotPresent` | | deploy.image.tag | Overrides the default image tag. | `""` | | deploy.additionalArgs | Additional arguments to pass to the command. | `[]` | diff --git a/charts/eraser/values.yaml b/charts/eraser/values.yaml index 7369c2f79d..a55fc2b2bb 100644 --- a/charts/eraser/values.yaml +++ b/charts/eraser/values.yaml @@ -88,7 +88,7 @@ runtimeConfig: deploy: image: - repo: ghcr.io/azure/eraser-manager + repo: ghcr.io/eraser-dev/eraser-manager pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: "v1.1.1" diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index ce715cbd98..22820f40ea 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -9,7 +9,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: - name: controller - newName: ghcr.io/azure/eraser-manager + newName: ghcr.io/eraser-dev/eraser-manager newTag: v1.0.0-beta.3 # DO NOT CHANGE FORMATTING: diff --git a/controllers/configmap/configmap.go b/controllers/configmap/configmap.go index bfb67db6b4..af9543b9b0 100644 --- a/controllers/configmap/configmap.go +++ b/controllers/configmap/configmap.go @@ -20,11 +20,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/Azure/eraser/api/unversioned/config" - eraserv1 "github.com/Azure/eraser/api/v1" - controllerUtils "github.com/Azure/eraser/controllers/util" - "github.com/Azure/eraser/pkg/metrics" - eraserUtils "github.com/Azure/eraser/pkg/utils" + "github.com/eraser-dev/eraser/api/unversioned/config" + eraserv1 "github.com/eraser-dev/eraser/api/v1" + controllerUtils "github.com/eraser-dev/eraser/controllers/util" + "github.com/eraser-dev/eraser/pkg/metrics" + eraserUtils "github.com/eraser-dev/eraser/pkg/utils" sdkmetric "go.opentelemetry.io/otel/sdk/metric" ctrl "sigs.k8s.io/controller-runtime" logf "sigs.k8s.io/controller-runtime/pkg/log" diff --git a/controllers/controller.go b/controllers/controller.go index e149f1b4f7..12cf510ca1 100644 --- a/controllers/controller.go +++ b/controllers/controller.go @@ -3,11 +3,11 @@ package controllers import ( "errors" - "github.com/Azure/eraser/api/unversioned/config" - "github.com/Azure/eraser/controllers/configmap" - "github.com/Azure/eraser/controllers/imagecollector" - "github.com/Azure/eraser/controllers/imagejob" - "github.com/Azure/eraser/controllers/imagelist" + "github.com/eraser-dev/eraser/api/unversioned/config" + "github.com/eraser-dev/eraser/controllers/configmap" + "github.com/eraser-dev/eraser/controllers/imagecollector" + "github.com/eraser-dev/eraser/controllers/imagejob" + "github.com/eraser-dev/eraser/controllers/imagelist" "k8s.io/apimachinery/pkg/api/meta" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/manager" diff --git a/controllers/imagecollector/imagecollector_controller.go b/controllers/imagecollector/imagecollector_controller.go index ad4350101b..169d03bcff 100644 --- a/controllers/imagecollector/imagecollector_controller.go +++ b/controllers/imagecollector/imagecollector_controller.go @@ -36,20 +36,20 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/Azure/eraser/api/unversioned/config" - eraserv1 "github.com/Azure/eraser/api/v1" - eraserv1alpha1 "github.com/Azure/eraser/api/v1alpha1" - "github.com/Azure/eraser/controllers/util" - "github.com/Azure/eraser/pkg/utils" + "github.com/eraser-dev/eraser/api/unversioned/config" + eraserv1 "github.com/eraser-dev/eraser/api/v1" + eraserv1alpha1 "github.com/eraser-dev/eraser/api/v1alpha1" + "github.com/eraser-dev/eraser/controllers/util" + "github.com/eraser-dev/eraser/pkg/utils" "sigs.k8s.io/controller-runtime/pkg/controller" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/source" - "github.com/Azure/eraser/pkg/logger" - "github.com/Azure/eraser/pkg/metrics" - eraserUtils "github.com/Azure/eraser/pkg/utils" + "github.com/eraser-dev/eraser/pkg/logger" + "github.com/eraser-dev/eraser/pkg/metrics" + eraserUtils "github.com/eraser-dev/eraser/pkg/utils" sdkmetric "go.opentelemetry.io/otel/sdk/metric" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/controllers/imagejob/imagejob_controller.go b/controllers/imagejob/imagejob_controller.go index 8678e86f48..3d7d7109e5 100644 --- a/controllers/imagejob/imagejob_controller.go +++ b/controllers/imagejob/imagejob_controller.go @@ -42,10 +42,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/source" "sigs.k8s.io/kind/pkg/errors" - "github.com/Azure/eraser/api/unversioned/config" - eraserv1 "github.com/Azure/eraser/api/v1" - controllerUtils "github.com/Azure/eraser/controllers/util" - eraserUtils "github.com/Azure/eraser/pkg/utils" + "github.com/eraser-dev/eraser/api/unversioned/config" + eraserv1 "github.com/eraser-dev/eraser/api/v1" + controllerUtils "github.com/eraser-dev/eraser/controllers/util" + eraserUtils "github.com/eraser-dev/eraser/pkg/utils" ) const ( diff --git a/controllers/imagelist/imagelist_controller.go b/controllers/imagelist/imagelist_controller.go index 4d29d764ba..ae2687b0d6 100644 --- a/controllers/imagelist/imagelist_controller.go +++ b/controllers/imagelist/imagelist_controller.go @@ -41,13 +41,14 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - "github.com/Azure/eraser/api/unversioned/config" - eraserv1 "github.com/Azure/eraser/api/v1" - "github.com/Azure/eraser/controllers/util" - "github.com/Azure/eraser/pkg/logger" - "github.com/Azure/eraser/pkg/metrics" - "github.com/Azure/eraser/pkg/utils" - eraserUtils "github.com/Azure/eraser/pkg/utils" + "github.com/eraser-dev/eraser/api/unversioned/config" + eraserv1 "github.com/eraser-dev/eraser/api/v1" + "github.com/eraser-dev/eraser/controllers/util" + "github.com/eraser-dev/eraser/pkg/logger" + "github.com/eraser-dev/eraser/pkg/metrics" + "github.com/eraser-dev/eraser/pkg/utils" + eraserUtils "github.com/eraser-dev/eraser/pkg/utils" + sdkmetric "go.opentelemetry.io/otel/sdk/metric" ) diff --git a/controllers/suite_test.go b/controllers/suite_test.go index a6bbebc9c8..f41d705d2e 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -28,7 +28,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - eraserv1alpha2 "github.com/Azure/eraser/api/v1alpha2" + eraserv1alpha2 "github.com/eraser-dev/eraser/api/v1alpha2" //+kubebuilder:scaffold:imports ) diff --git a/controllers/util/util.go b/controllers/util/util.go index 486945028c..34d75cee4c 100644 --- a/controllers/util/util.go +++ b/controllers/util/util.go @@ -5,7 +5,7 @@ import ( "os" "time" - eraserv1 "github.com/Azure/eraser/api/v1" + eraserv1 "github.com/eraser-dev/eraser/api/v1" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/demo/README.md b/demo/README.md index b9f7f1fb56..bda1da5c06 100644 --- a/demo/README.md +++ b/demo/README.md @@ -10,7 +10,7 @@ The following should be installed and pathed: Get Helm repo: ``` -$ helm repo add eraser https://azure.github.io/eraser/charts +$ helm repo add eraser https://eraser-dev.github.io/eraser/charts ``` Run `demo.sh` to start the demo! diff --git a/deploy/eraser.yaml b/deploy/eraser.yaml index faa7a818a2..a9d360c019 100644 --- a/deploy/eraser.yaml +++ b/deploy/eraser.yaml @@ -410,7 +410,7 @@ data: collector: enabled: true image: - repo: ghcr.io/azure/collector + repo: ghcr.io/eraser-dev/collector tag: v1.1.1 request: mem: 25Mi @@ -422,7 +422,7 @@ data: scanner: enabled: true image: - repo: ghcr.io/azure/eraser-trivy-scanner # supply custom image for custom scanner + repo: ghcr.io/eraser-dev/eraser-trivy-scanner # supply custom image for custom scanner tag: v1.1.1 request: mem: 500Mi @@ -458,7 +458,7 @@ data: perImage: 1h remover: image: - repo: ghcr.io/azure/remover + repo: ghcr.io/eraser-dev/remover tag: v1.1.1 request: mem: 25Mi @@ -502,7 +502,7 @@ spec: fieldPath: metadata.namespace - name: OTEL_SERVICE_NAME value: eraser-manager - image: ghcr.io/azure/eraser-manager:v1.1.1 + image: ghcr.io/eraser-dev/eraser-manager:v1.1.1 livenessProbe: httpGet: path: /healthz diff --git a/docs/docs/contributing.md b/docs/docs/contributing.md index e665012a8d..a74c2389ea 100644 --- a/docs/docs/contributing.md +++ b/docs/docs/contributing.md @@ -7,7 +7,7 @@ There are several ways to get involved with Eraser - Join the [mailing list](https://groups.google.com/u/1/g/eraser-dev) to get notifications for releases, security announcements, etc. - Participate in the [biweekly community meetings](https://docs.google.com/document/d/1Sj5u47K3WUGYNPmQHGFpb52auqZb1FxSlWAQnPADhWI/edit) to disucss development, issues, use cases, etc. - Join the `#eraser` channel on the [Kubernetes Slack](https://slack.k8s.io/) -- View the [development setup instructions](https://azure.github.io/eraser/docs/development) +- View the [development setup instructions](https://eraser-dev.github.io/eraser/docs/development) This project welcomes contributions and suggestions. diff --git a/docs/docs/custom-scanner.md b/docs/docs/custom-scanner.md index 952c022f1e..d7235abbde 100644 --- a/docs/docs/custom-scanner.md +++ b/docs/docs/custom-scanner.md @@ -3,7 +3,7 @@ title: Custom Scanner --- ## Creating a Custom Scanner -To create a custom scanner for non-compliant images, use the following [template](https://github.com/Azure/eraser-scanner-template/). +To create a custom scanner for non-compliant images, use the following [template](https://github.com/eraser-dev/eraser-scanner-template/). In order to customize your scanner, start by creating a `NewImageProvider()`. The ImageProvider interface can be found can be found [here](../../pkg/scanners/template/scanner_template.go). diff --git a/docs/docs/customization.md b/docs/docs/customization.md index 0c2237383d..51a9e5bf91 100644 --- a/docs/docs/customization.md +++ b/docs/docs/customization.md @@ -29,7 +29,7 @@ cluster's nodes, and to remove the images you don't want. There are two stages: ### Scheduling -An _ImageJob_ can either be created on-demand (see [Manual Removal](https://azure.github.io/eraser/docs/manual-removal)), +An _ImageJob_ can either be created on-demand (see [Manual Removal](https://eraser-dev.github.io/eraser/docs/manual-removal)), or they can be spawned on a timer like a cron job. On-demand jobs skip the assessment stage and get right down to the business of removing the images you specified. The behavior of an on-demand job is quite different from that of @@ -108,7 +108,7 @@ manager: components: remover: image: - repo: ghcr.io/azure/remover + repo: ghcr.io/eraser-dev/remover tag: v1.0.0 request: mem: 25Mi @@ -125,7 +125,7 @@ components: collector: enabled: true image: - repo: ghcr.io/azure/collector + repo: ghcr.io/eraser-dev/collector tag: v1.0.0 request: mem: 25Mi @@ -136,7 +136,7 @@ components: scanner: enabled: true image: - repo: ghcr.io/azure/eraser-trivy-scanner + repo: ghcr.io/eraser-dev/eraser-trivy-scanner tag: v1.0.0 request: mem: 500Mi @@ -149,7 +149,7 @@ components: # will define their own configuration. see the below remover: image: - repo: ghcr.io/azure/remover + repo: ghcr.io/eraser-dev/remover tag: v1.0.0 request: mem: 25Mi @@ -206,21 +206,21 @@ timeout: | manager.nodeFilter.type | The type of node filter to use. Must be either "exclude" or "include". | exclude | | manager.nodeFilter.selectors | A list of selectors used to filter nodes. | [] | | components.collector.enabled | Whether to enable the collector component. | true | -| components.collector.image.repo | The repository containing the collector image. | ghcr.io/azure/collector | +| components.collector.image.repo | The repository containing the collector image. | ghcr.io/eraser-dev/collector | | components.collector.image.tag | The tag of the collector image. | v1.0.0 | | components.collector.request.mem | The amount of memory to request for the collector container. | 25Mi | | components.collector.request.cpu | The amount of CPU to request for the collector container. | 7m | | components.collector.limit.mem | The maximum amount of memory the collector container is allowed to use. | 500Mi | | components.collector.limit.cpu | The maximum amount of CPU the collector container is allowed to use. | 0 | | components.scanner.enabled | Whether to enable the scanner component. | true | -| components.scanner.image.repo | The repository containing the scanner image. | ghcr.io/azure/eraser-trivy-scanner | +| components.scanner.image.repo | The repository containing the scanner image. | ghcr.io/eraser-dev/eraser-trivy-scanner | | components.scanner.image.tag | The tag of the scanner image. | v1.0.0 | | components.scanner.request.mem | The amount of memory to request for the scanner container. | 500Mi | | components.scanner.request.cpu | The amount of CPU to request for the scanner container. | 1000m | | components.scanner.limit.mem | The maximum amount of memory the scanner container is allowed to use. | 2Gi | | components.scanner.limit.cpu | The maximum amount of CPU the scanner container is allowed to use. | 0 | | components.scanner.config | The configuration to pass to the scanner container, as a YAML string. | See YAML below | -| components.remover.image.repo | The repository containing the remover image. | ghcr.io/azure/remover | +| components.remover.image.repo | The repository containing the remover image. | ghcr.io/eraser-dev/remover | | components.remover.image.tag | The tag of the remover image. | v1.0.0 | | components.remover.request.mem | The amount of memory to request for the remover container. | 25Mi | | components.remover.request.cpu | The amount of CPU to request for the remover container. | 0 | diff --git a/docs/docs/exclusion.md b/docs/docs/exclusion.md index 0d65b15587..b43425d147 100644 --- a/docs/docs/exclusion.md +++ b/docs/docs/exclusion.md @@ -12,7 +12,7 @@ $ cat > sample.json <<"EOF" { "excluded": [ "docker.io/library/*", - "ghcr.io/azure/test:latest" + "ghcr.io/eraser-dev/test:latest" ] } EOF @@ -22,4 +22,4 @@ $ kubectl label configmap excluded eraser.sh/exclude.list=true -n eraser-system ``` ## Exempting Nodes from the Eraser Pipeline -Exempting nodes from cleanup was added in v1.0.0. When deploying Eraser, you can specify whether there is a list of nodes you would like to `include` or `exclude` from the cleanup process using the configmap. For more information, see the section on [customization](https://azure.github.io/eraser/docs/customization). +Exempting nodes from cleanup was added in v1.0.0. When deploying Eraser, you can specify whether there is a list of nodes you would like to `include` or `exclude` from the cleanup process using the configmap. For more information, see the section on [customization](https://eraser-dev.github.io/eraser/docs/customization). diff --git a/docs/docs/faq.md b/docs/docs/faq.md index 124732b559..d0fb4f99e8 100644 --- a/docs/docs/faq.md +++ b/docs/docs/faq.md @@ -2,7 +2,7 @@ title: FAQ --- ## Why am I still seeing vulnerable images? -Eraser currently targets **non-running** images, so any vulnerable images that are currently running will not be removed. In addition, the default vulnerability scanning with Trivy removes images with `CRITICAL` vulnerabilities. Any images with lower vulnerabilities will not be removed. This can be configured using the [configmap](https://azure.github.io/eraser/docs/customization#scanner-options). +Eraser currently targets **non-running** images, so any vulnerable images that are currently running will not be removed. In addition, the default vulnerability scanning with Trivy removes images with `CRITICAL` vulnerabilities. Any images with lower vulnerabilities will not be removed. This can be configured using the [configmap](https://eraser-dev.github.io/eraser/docs/customization#scanner-options). ## How is Eraser different from Kubernetes garbage collection? The native garbage collection in Kubernetes works a bit differently than Eraser. By default, garbage collection begins when disk usage reaches 85%, and stops when it gets down to 80%. More details about Kubernetes garbage collection can be found in the [Kubernetes documentation](https://kubernetes.io/docs/concepts/architecture/garbage-collection/), and configuration options can be found in the [Kubelet documentation](https://kubernetes.io/docs/reference/config-api/kubelet-config.v1beta1/). diff --git a/docs/docs/installation.md b/docs/docs/installation.md index 54a3a8d30b..dbf84f7645 100644 --- a/docs/docs/installation.md +++ b/docs/docs/installation.md @@ -7,9 +7,9 @@ title: Installation To install Eraser with the manifest file, run the following command: ```bash -kubectl apply -f https://raw.githubusercontent.com/Azure/eraser/v1.1.0-beta.0/deploy/eraser.yaml +kubectl apply -f https://raw.githubusercontent.com/eraser-dev/eraser/v1.1.0-beta.0/deploy/eraser.yaml ``` ## Helm -If you'd like to install and manage Eraser with Helm, follow the install instructions [here](https://github.com/Azure/eraser/blob/main/charts/eraser/README.md) +If you'd like to install and manage Eraser with Helm, follow the install instructions [here](https://github.com/eraser-dev/eraser/blob/main/charts/eraser/README.md) diff --git a/docs/docs/metrics.md b/docs/docs/metrics.md index 093cbc08b2..4de1b47f62 100644 --- a/docs/docs/metrics.md +++ b/docs/docs/metrics.md @@ -2,7 +2,7 @@ title: Metrics --- -To view Eraser metrics, you will need to deploy an Open Telemetry collector in the 'eraser-system' namespace, and an exporter. An example collector with a Prometheus exporter is [otelcollector.yaml](https://github.com/Azure/eraser/blob/main/test/e2e/test-data/otelcollector.yaml), and the endpoint can be specified using the [configmap](https://azure.github.io/eraser/docs/customization#universal-options). In this example, we are logging the collected data to the otel-collector pod, and exporting metrics through Prometheus at 'http://localhost:8889/metrics', but a separate exporter can also be configured. +To view Eraser metrics, you will need to deploy an Open Telemetry collector in the 'eraser-system' namespace, and an exporter. An example collector with a Prometheus exporter is [otelcollector.yaml](https://github.com/eraser-dev/eraser/blob/main/test/e2e/test-data/otelcollector.yaml), and the endpoint can be specified using the [configmap](https://eraser-dev.github.io/eraser/docs/customization#universal-options). In this example, we are logging the collected data to the otel-collector pod, and exporting metrics through Prometheus at 'http://localhost:8889/metrics', but a separate exporter can also be configured. Below is the list of metrics provided by Eraser per run: diff --git a/docs/docs/quick-start.md b/docs/docs/quick-start.md index 4155b72267..601e474830 100644 --- a/docs/docs/quick-start.md +++ b/docs/docs/quick-start.md @@ -76,7 +76,7 @@ docker.io/library/alpine@sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511 ## Automatically Cleaning Images -After deploying Eraser, it will automatically clean images in a regular interval. This interval can be set using the `manager.scheduling.repeatInterval` setting in the [configmap](https://azure.github.io/eraser/docs/customization#detailed-options). The default interval is 24 hours (`24h`). Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". +After deploying Eraser, it will automatically clean images in a regular interval. This interval can be set using the `manager.scheduling.repeatInterval` setting in the [configmap](https://eraser-dev.github.io/eraser/docs/customization#detailed-options). The default interval is 24 hours (`24h`). Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". Eraser will schedule eraser pods to each node in the cluster, and each pod will contain 3 containers: collector, scanner, and remover that will run to completion. @@ -91,7 +91,7 @@ eraser-system eraser-controller-manager-86cdb4cbf9-x8d7q 1/1 Runnin The collector container sends the list of all images to the scanner container, which scans and reports non-compliant images to the remover container for removal of images that are non-running. Once all pods are completed, they will be automatically cleaned up. -> If you want to remove all the images periodically, you can skip the scanner container by setting the `components.scanner.enabled` value to `false` using the [configmap](https://azure.github.io/eraser/docs/customization#detailed-options). In this case, each collector pod will hold 2 containers: collector and remover. +> If you want to remove all the images periodically, you can skip the scanner container by setting the `components.scanner.enabled` value to `false` using the [configmap](https://eraser-dev.github.io/eraser/docs/customization#detailed-options). In this case, each collector pod will hold 2 containers: collector and remover. ```shell $ kubectl get pods -n eraser-system diff --git a/docs/docs/releasing.md b/docs/docs/releasing.md index d65fae92d8..52f1fd4142 100644 --- a/docs/docs/releasing.md +++ b/docs/docs/releasing.md @@ -20,8 +20,8 @@ title: Releasing git push origin ``` 6. Pushing the release tag will trigger GitHub Actions to trigger `release` job. - This will build the `ghcr.io/azure/remover`, `ghcr.io/azure/eraser-manager`, `ghcr.io/azure/collector`, and `ghcr.io/azure/eraser-trivy-scanner` images automatically, then publish the new release tag. + This will build the `ghcr.io/eraser-dev/remover`, `ghcr.io/eraser-dev/eraser-manager`, `ghcr.io/eraser-dev/collector`, and `ghcr.io/eraser-dev/eraser-trivy-scanner` images automatically, then publish the new release tag. ## Publishing -1. GitHub Action will create a new release, review and edit it at https://github.com/Azure/eraser/releases \ No newline at end of file +1. GitHub Action will create a new release, review and edit it at https://github.com/eraser-dev/eraser/releases \ No newline at end of file diff --git a/docs/docs/trivy.md b/docs/docs/trivy.md index cc741c2a76..7b531b240c 100644 --- a/docs/docs/trivy.md +++ b/docs/docs/trivy.md @@ -3,4 +3,4 @@ title: Trivy --- ## Trivy Provider Options -The trivy provider is used in Eraser for image scanning and detecting vulnerabilities. See [Customization](https://azure.github.io/eraser/docs/customization#scanner-options) for more details on configuring the scanner. +The trivy provider is used in Eraser for image scanning and detecting vulnerabilities. See [Customization](https://eraser-dev.github.io/eraser/docs/customization#scanner-options) for more details on configuring the scanner. diff --git a/docs/versioned_docs/version-v0.4.x/contributing.md b/docs/versioned_docs/version-v0.4.x/contributing.md index 5d1cdf84c7..160b61f09c 100644 --- a/docs/versioned_docs/version-v0.4.x/contributing.md +++ b/docs/versioned_docs/version-v0.4.x/contributing.md @@ -7,7 +7,7 @@ There are several ways to get involved with Eraser - Join the [mailing list](https://groups.google.com/u/1/g/eraser-dev) to get notifications for releases, security announcements, etc. - Participate in the [biweekly community meetings](https://docs.google.com/document/d/1Sj5u47K3WUGYNPmQHGFpb52auqZb1FxSlWAQnPADhWI/edit) to disucss development, issues, use cases, etc. - Join the `#eraser` channel on the [Kubernetes Slack](https://slack.k8s.io/) -- View the [development setup instructions](https://azure.github.io/eraser/docs/development) +- View the [development setup instructions](https://eraser-dev.github.io/eraser/docs/development) This project welcomes contributions and suggestions. diff --git a/docs/versioned_docs/version-v0.4.x/exclusion.md b/docs/versioned_docs/version-v0.4.x/exclusion.md index 24c7b7c9b0..18727d5b57 100644 --- a/docs/versioned_docs/version-v0.4.x/exclusion.md +++ b/docs/versioned_docs/version-v0.4.x/exclusion.md @@ -9,7 +9,7 @@ To exclude any images or registries from the removal, create configmap(s) with t ```bash $ cat > sample.json < sample.json < sample.json <<"EOF" { "excluded": [ "docker.io/library/*", - "ghcr.io/azure/test:latest" + "ghcr.io/eraser-dev/test:latest" ] } EOF @@ -22,4 +22,4 @@ $ kubectl label configmap excluded eraser.sh/exclude.list=true -n eraser-system ``` ## Exempting Nodes from the Eraser Pipeline -Exempting nodes from cleanup was added in v1.0.0. When deploying Eraser, you can specify whether there is a list of nodes you would like to `include` or `exclude` from the cleanup process using the configmap. For more information, see the section on [customization](https://azure.github.io/eraser/docs/customization). +Exempting nodes from cleanup was added in v1.0.0. When deploying Eraser, you can specify whether there is a list of nodes you would like to `include` or `exclude` from the cleanup process using the configmap. For more information, see the section on [customization](https://eraser-dev.github.io/eraser/docs/customization). diff --git a/docs/versioned_docs/version-v1.0.x/faq.md b/docs/versioned_docs/version-v1.0.x/faq.md index fa6d678342..6e532283a8 100644 --- a/docs/versioned_docs/version-v1.0.x/faq.md +++ b/docs/versioned_docs/version-v1.0.x/faq.md @@ -2,4 +2,4 @@ title: FAQ --- ## Why am I still seeing vulnerable images? -Eraser currently targets **non-running** images, so any vulnerable images that are currently running will not be removed. In addition, the default vulnerability scanning with Trivy removes images with `CRITICAL` vulnerabilities. Any images with lower vulnerabilities will not be removed. This can be configured using the [configmap](https://azure.github.io/eraser/docs/customization#scanner-options). +Eraser currently targets **non-running** images, so any vulnerable images that are currently running will not be removed. In addition, the default vulnerability scanning with Trivy removes images with `CRITICAL` vulnerabilities. Any images with lower vulnerabilities will not be removed. This can be configured using the [configmap](https://eraser-dev.github.io/eraser/docs/customization#scanner-options). diff --git a/docs/versioned_docs/version-v1.0.x/installation.md b/docs/versioned_docs/version-v1.0.x/installation.md index 46e8d519dd..e5f0283a11 100644 --- a/docs/versioned_docs/version-v1.0.x/installation.md +++ b/docs/versioned_docs/version-v1.0.x/installation.md @@ -7,9 +7,9 @@ title: Installation To install Eraser with the manifest file, run the following command: ```bash -kubectl apply -f https://raw.githubusercontent.com/Azure/eraser/v1.0.0/deploy/eraser.yaml +kubectl apply -f https://raw.githubusercontent.com/eraser-dev/eraser/v1.0.0/deploy/eraser.yaml ``` ## Helm -If you'd like to install and manage Eraser with Helm, follow the install instructions [here](https://github.com/Azure/eraser/blob/main/charts/eraser/README.md) +If you'd like to install and manage Eraser with Helm, follow the install instructions [here](https://github.com/eraser-dev/eraser/blob/main/charts/eraser/README.md) diff --git a/docs/versioned_docs/version-v1.0.x/metrics.md b/docs/versioned_docs/version-v1.0.x/metrics.md index 093cbc08b2..4de1b47f62 100644 --- a/docs/versioned_docs/version-v1.0.x/metrics.md +++ b/docs/versioned_docs/version-v1.0.x/metrics.md @@ -2,7 +2,7 @@ title: Metrics --- -To view Eraser metrics, you will need to deploy an Open Telemetry collector in the 'eraser-system' namespace, and an exporter. An example collector with a Prometheus exporter is [otelcollector.yaml](https://github.com/Azure/eraser/blob/main/test/e2e/test-data/otelcollector.yaml), and the endpoint can be specified using the [configmap](https://azure.github.io/eraser/docs/customization#universal-options). In this example, we are logging the collected data to the otel-collector pod, and exporting metrics through Prometheus at 'http://localhost:8889/metrics', but a separate exporter can also be configured. +To view Eraser metrics, you will need to deploy an Open Telemetry collector in the 'eraser-system' namespace, and an exporter. An example collector with a Prometheus exporter is [otelcollector.yaml](https://github.com/eraser-dev/eraser/blob/main/test/e2e/test-data/otelcollector.yaml), and the endpoint can be specified using the [configmap](https://eraser-dev.github.io/eraser/docs/customization#universal-options). In this example, we are logging the collected data to the otel-collector pod, and exporting metrics through Prometheus at 'http://localhost:8889/metrics', but a separate exporter can also be configured. Below is the list of metrics provided by Eraser per run: diff --git a/docs/versioned_docs/version-v1.0.x/quick-start.md b/docs/versioned_docs/version-v1.0.x/quick-start.md index 9cefeae5cf..34b831459d 100644 --- a/docs/versioned_docs/version-v1.0.x/quick-start.md +++ b/docs/versioned_docs/version-v1.0.x/quick-start.md @@ -76,7 +76,7 @@ docker.io/library/alpine@sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511 ## Automatically Cleaning Images -After deploying Eraser, it will automatically clean images in a regular interval. This interval can be set using the `manager.scheduling.repeatInterval` setting in the [configmap](https://azure.github.io/eraser/docs/customization#detailed-options). The default interval is 24 hours (`24h`). Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". +After deploying Eraser, it will automatically clean images in a regular interval. This interval can be set using the `manager.scheduling.repeatInterval` setting in the [configmap](https://eraser-dev.github.io/eraser/docs/customization#detailed-options). The default interval is 24 hours (`24h`). Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". Eraser will schedule collector pods to each node in the cluster, and each pod will contain 3 containers: collector, scanner, and eraser that will run to completion. @@ -91,7 +91,7 @@ eraser-system eraser-controller-manager-86cdb4cbf9-x8d7q 1/1 Runnin The collector container sends the list of all images to the scanner container, which scans and reports non-compliant images to the eraser container for removal of images that are non-running. Once all pods are completed, they will be automatically cleaned up. -> If you want to remove all the images periodically, you can skip the scanner container by setting the `components.scanner.enabled` value to `false` using the [configmap](https://azure.github.io/eraser/docs/customization#detailed-options). In this case, each collector pod will hold 2 containers: collector and eraser. +> If you want to remove all the images periodically, you can skip the scanner container by setting the `components.scanner.enabled` value to `false` using the [configmap](https://eraser-dev.github.io/eraser/docs/customization#detailed-options). In this case, each collector pod will hold 2 containers: collector and eraser. ```shell $ kubectl get pods -n eraser-system diff --git a/docs/versioned_docs/version-v1.0.x/releasing.md b/docs/versioned_docs/version-v1.0.x/releasing.md index ab5e0708be..5f8d29f6b7 100644 --- a/docs/versioned_docs/version-v1.0.x/releasing.md +++ b/docs/versioned_docs/version-v1.0.x/releasing.md @@ -20,8 +20,8 @@ title: Releasing git push origin ``` 6. Pushing the release tag will trigger GitHub Actions to trigger `release` job. - This will build the `ghcr.io/azure/eraser`, `ghcr.io/azure/eraser-manager`, `ghcr.io/azure/collector`, and `ghcr.io/azure/eraser-trivy-scanner` images automatically, then publish the new release tag. + This will build the `ghcr.io/eraser-dev/eraser`, `ghcr.io/eraser-dev/eraser-manager`, `ghcr.io/eraser-dev/collector`, and `ghcr.io/eraser-dev/eraser-trivy-scanner` images automatically, then publish the new release tag. ## Publishing -1. GitHub Action will create a new release, review and edit it at https://github.com/Azure/eraser/releases \ No newline at end of file +1. GitHub Action will create a new release, review and edit it at https://github.com/eraser-dev/eraser/releases \ No newline at end of file diff --git a/docs/versioned_docs/version-v1.0.x/trivy.md b/docs/versioned_docs/version-v1.0.x/trivy.md index cc741c2a76..7b531b240c 100644 --- a/docs/versioned_docs/version-v1.0.x/trivy.md +++ b/docs/versioned_docs/version-v1.0.x/trivy.md @@ -3,4 +3,4 @@ title: Trivy --- ## Trivy Provider Options -The trivy provider is used in Eraser for image scanning and detecting vulnerabilities. See [Customization](https://azure.github.io/eraser/docs/customization#scanner-options) for more details on configuring the scanner. +The trivy provider is used in Eraser for image scanning and detecting vulnerabilities. See [Customization](https://eraser-dev.github.io/eraser/docs/customization#scanner-options) for more details on configuring the scanner. diff --git a/docs/versioned_docs/version-v1.1.x/contributing.md b/docs/versioned_docs/version-v1.1.x/contributing.md index e665012a8d..a74c2389ea 100644 --- a/docs/versioned_docs/version-v1.1.x/contributing.md +++ b/docs/versioned_docs/version-v1.1.x/contributing.md @@ -7,7 +7,7 @@ There are several ways to get involved with Eraser - Join the [mailing list](https://groups.google.com/u/1/g/eraser-dev) to get notifications for releases, security announcements, etc. - Participate in the [biweekly community meetings](https://docs.google.com/document/d/1Sj5u47K3WUGYNPmQHGFpb52auqZb1FxSlWAQnPADhWI/edit) to disucss development, issues, use cases, etc. - Join the `#eraser` channel on the [Kubernetes Slack](https://slack.k8s.io/) -- View the [development setup instructions](https://azure.github.io/eraser/docs/development) +- View the [development setup instructions](https://eraser-dev.github.io/eraser/docs/development) This project welcomes contributions and suggestions. diff --git a/docs/versioned_docs/version-v1.1.x/custom-scanner.md b/docs/versioned_docs/version-v1.1.x/custom-scanner.md index 952c022f1e..d7235abbde 100644 --- a/docs/versioned_docs/version-v1.1.x/custom-scanner.md +++ b/docs/versioned_docs/version-v1.1.x/custom-scanner.md @@ -3,7 +3,7 @@ title: Custom Scanner --- ## Creating a Custom Scanner -To create a custom scanner for non-compliant images, use the following [template](https://github.com/Azure/eraser-scanner-template/). +To create a custom scanner for non-compliant images, use the following [template](https://github.com/eraser-dev/eraser-scanner-template/). In order to customize your scanner, start by creating a `NewImageProvider()`. The ImageProvider interface can be found can be found [here](../../pkg/scanners/template/scanner_template.go). diff --git a/docs/versioned_docs/version-v1.1.x/customization.md b/docs/versioned_docs/version-v1.1.x/customization.md index 0c2237383d..51a9e5bf91 100644 --- a/docs/versioned_docs/version-v1.1.x/customization.md +++ b/docs/versioned_docs/version-v1.1.x/customization.md @@ -29,7 +29,7 @@ cluster's nodes, and to remove the images you don't want. There are two stages: ### Scheduling -An _ImageJob_ can either be created on-demand (see [Manual Removal](https://azure.github.io/eraser/docs/manual-removal)), +An _ImageJob_ can either be created on-demand (see [Manual Removal](https://eraser-dev.github.io/eraser/docs/manual-removal)), or they can be spawned on a timer like a cron job. On-demand jobs skip the assessment stage and get right down to the business of removing the images you specified. The behavior of an on-demand job is quite different from that of @@ -108,7 +108,7 @@ manager: components: remover: image: - repo: ghcr.io/azure/remover + repo: ghcr.io/eraser-dev/remover tag: v1.0.0 request: mem: 25Mi @@ -125,7 +125,7 @@ components: collector: enabled: true image: - repo: ghcr.io/azure/collector + repo: ghcr.io/eraser-dev/collector tag: v1.0.0 request: mem: 25Mi @@ -136,7 +136,7 @@ components: scanner: enabled: true image: - repo: ghcr.io/azure/eraser-trivy-scanner + repo: ghcr.io/eraser-dev/eraser-trivy-scanner tag: v1.0.0 request: mem: 500Mi @@ -149,7 +149,7 @@ components: # will define their own configuration. see the below remover: image: - repo: ghcr.io/azure/remover + repo: ghcr.io/eraser-dev/remover tag: v1.0.0 request: mem: 25Mi @@ -206,21 +206,21 @@ timeout: | manager.nodeFilter.type | The type of node filter to use. Must be either "exclude" or "include". | exclude | | manager.nodeFilter.selectors | A list of selectors used to filter nodes. | [] | | components.collector.enabled | Whether to enable the collector component. | true | -| components.collector.image.repo | The repository containing the collector image. | ghcr.io/azure/collector | +| components.collector.image.repo | The repository containing the collector image. | ghcr.io/eraser-dev/collector | | components.collector.image.tag | The tag of the collector image. | v1.0.0 | | components.collector.request.mem | The amount of memory to request for the collector container. | 25Mi | | components.collector.request.cpu | The amount of CPU to request for the collector container. | 7m | | components.collector.limit.mem | The maximum amount of memory the collector container is allowed to use. | 500Mi | | components.collector.limit.cpu | The maximum amount of CPU the collector container is allowed to use. | 0 | | components.scanner.enabled | Whether to enable the scanner component. | true | -| components.scanner.image.repo | The repository containing the scanner image. | ghcr.io/azure/eraser-trivy-scanner | +| components.scanner.image.repo | The repository containing the scanner image. | ghcr.io/eraser-dev/eraser-trivy-scanner | | components.scanner.image.tag | The tag of the scanner image. | v1.0.0 | | components.scanner.request.mem | The amount of memory to request for the scanner container. | 500Mi | | components.scanner.request.cpu | The amount of CPU to request for the scanner container. | 1000m | | components.scanner.limit.mem | The maximum amount of memory the scanner container is allowed to use. | 2Gi | | components.scanner.limit.cpu | The maximum amount of CPU the scanner container is allowed to use. | 0 | | components.scanner.config | The configuration to pass to the scanner container, as a YAML string. | See YAML below | -| components.remover.image.repo | The repository containing the remover image. | ghcr.io/azure/remover | +| components.remover.image.repo | The repository containing the remover image. | ghcr.io/eraser-dev/remover | | components.remover.image.tag | The tag of the remover image. | v1.0.0 | | components.remover.request.mem | The amount of memory to request for the remover container. | 25Mi | | components.remover.request.cpu | The amount of CPU to request for the remover container. | 0 | diff --git a/docs/versioned_docs/version-v1.1.x/exclusion.md b/docs/versioned_docs/version-v1.1.x/exclusion.md index 0d65b15587..b43425d147 100644 --- a/docs/versioned_docs/version-v1.1.x/exclusion.md +++ b/docs/versioned_docs/version-v1.1.x/exclusion.md @@ -12,7 +12,7 @@ $ cat > sample.json <<"EOF" { "excluded": [ "docker.io/library/*", - "ghcr.io/azure/test:latest" + "ghcr.io/eraser-dev/test:latest" ] } EOF @@ -22,4 +22,4 @@ $ kubectl label configmap excluded eraser.sh/exclude.list=true -n eraser-system ``` ## Exempting Nodes from the Eraser Pipeline -Exempting nodes from cleanup was added in v1.0.0. When deploying Eraser, you can specify whether there is a list of nodes you would like to `include` or `exclude` from the cleanup process using the configmap. For more information, see the section on [customization](https://azure.github.io/eraser/docs/customization). +Exempting nodes from cleanup was added in v1.0.0. When deploying Eraser, you can specify whether there is a list of nodes you would like to `include` or `exclude` from the cleanup process using the configmap. For more information, see the section on [customization](https://eraser-dev.github.io/eraser/docs/customization). diff --git a/docs/versioned_docs/version-v1.1.x/faq.md b/docs/versioned_docs/version-v1.1.x/faq.md index 124732b559..d0fb4f99e8 100644 --- a/docs/versioned_docs/version-v1.1.x/faq.md +++ b/docs/versioned_docs/version-v1.1.x/faq.md @@ -2,7 +2,7 @@ title: FAQ --- ## Why am I still seeing vulnerable images? -Eraser currently targets **non-running** images, so any vulnerable images that are currently running will not be removed. In addition, the default vulnerability scanning with Trivy removes images with `CRITICAL` vulnerabilities. Any images with lower vulnerabilities will not be removed. This can be configured using the [configmap](https://azure.github.io/eraser/docs/customization#scanner-options). +Eraser currently targets **non-running** images, so any vulnerable images that are currently running will not be removed. In addition, the default vulnerability scanning with Trivy removes images with `CRITICAL` vulnerabilities. Any images with lower vulnerabilities will not be removed. This can be configured using the [configmap](https://eraser-dev.github.io/eraser/docs/customization#scanner-options). ## How is Eraser different from Kubernetes garbage collection? The native garbage collection in Kubernetes works a bit differently than Eraser. By default, garbage collection begins when disk usage reaches 85%, and stops when it gets down to 80%. More details about Kubernetes garbage collection can be found in the [Kubernetes documentation](https://kubernetes.io/docs/concepts/architecture/garbage-collection/), and configuration options can be found in the [Kubelet documentation](https://kubernetes.io/docs/reference/config-api/kubelet-config.v1beta1/). diff --git a/docs/versioned_docs/version-v1.1.x/installation.md b/docs/versioned_docs/version-v1.1.x/installation.md index 249858f47d..5bf027864a 100644 --- a/docs/versioned_docs/version-v1.1.x/installation.md +++ b/docs/versioned_docs/version-v1.1.x/installation.md @@ -7,9 +7,9 @@ title: Installation To install Eraser with the manifest file, run the following command: ```bash -kubectl apply -f https://raw.githubusercontent.com/Azure/eraser/v1.1.0/deploy/eraser.yaml +kubectl apply -f https://raw.githubusercontent.com/eraser-dev/eraser/v1.1.0/deploy/eraser.yaml ``` ## Helm -If you'd like to install and manage Eraser with Helm, follow the install instructions [here](https://github.com/Azure/eraser/blob/main/charts/eraser/README.md) +If you'd like to install and manage Eraser with Helm, follow the install instructions [here](https://github.com/eraser-dev/eraser/blob/main/charts/eraser/README.md) diff --git a/docs/versioned_docs/version-v1.1.x/metrics.md b/docs/versioned_docs/version-v1.1.x/metrics.md index 093cbc08b2..4de1b47f62 100644 --- a/docs/versioned_docs/version-v1.1.x/metrics.md +++ b/docs/versioned_docs/version-v1.1.x/metrics.md @@ -2,7 +2,7 @@ title: Metrics --- -To view Eraser metrics, you will need to deploy an Open Telemetry collector in the 'eraser-system' namespace, and an exporter. An example collector with a Prometheus exporter is [otelcollector.yaml](https://github.com/Azure/eraser/blob/main/test/e2e/test-data/otelcollector.yaml), and the endpoint can be specified using the [configmap](https://azure.github.io/eraser/docs/customization#universal-options). In this example, we are logging the collected data to the otel-collector pod, and exporting metrics through Prometheus at 'http://localhost:8889/metrics', but a separate exporter can also be configured. +To view Eraser metrics, you will need to deploy an Open Telemetry collector in the 'eraser-system' namespace, and an exporter. An example collector with a Prometheus exporter is [otelcollector.yaml](https://github.com/eraser-dev/eraser/blob/main/test/e2e/test-data/otelcollector.yaml), and the endpoint can be specified using the [configmap](https://eraser-dev.github.io/eraser/docs/customization#universal-options). In this example, we are logging the collected data to the otel-collector pod, and exporting metrics through Prometheus at 'http://localhost:8889/metrics', but a separate exporter can also be configured. Below is the list of metrics provided by Eraser per run: diff --git a/docs/versioned_docs/version-v1.1.x/quick-start.md b/docs/versioned_docs/version-v1.1.x/quick-start.md index 4155b72267..601e474830 100644 --- a/docs/versioned_docs/version-v1.1.x/quick-start.md +++ b/docs/versioned_docs/version-v1.1.x/quick-start.md @@ -76,7 +76,7 @@ docker.io/library/alpine@sha256:8421d9a84432575381bfabd248f1eb56f3aa21d9d7cd2511 ## Automatically Cleaning Images -After deploying Eraser, it will automatically clean images in a regular interval. This interval can be set using the `manager.scheduling.repeatInterval` setting in the [configmap](https://azure.github.io/eraser/docs/customization#detailed-options). The default interval is 24 hours (`24h`). Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". +After deploying Eraser, it will automatically clean images in a regular interval. This interval can be set using the `manager.scheduling.repeatInterval` setting in the [configmap](https://eraser-dev.github.io/eraser/docs/customization#detailed-options). The default interval is 24 hours (`24h`). Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". Eraser will schedule eraser pods to each node in the cluster, and each pod will contain 3 containers: collector, scanner, and remover that will run to completion. @@ -91,7 +91,7 @@ eraser-system eraser-controller-manager-86cdb4cbf9-x8d7q 1/1 Runnin The collector container sends the list of all images to the scanner container, which scans and reports non-compliant images to the remover container for removal of images that are non-running. Once all pods are completed, they will be automatically cleaned up. -> If you want to remove all the images periodically, you can skip the scanner container by setting the `components.scanner.enabled` value to `false` using the [configmap](https://azure.github.io/eraser/docs/customization#detailed-options). In this case, each collector pod will hold 2 containers: collector and remover. +> If you want to remove all the images periodically, you can skip the scanner container by setting the `components.scanner.enabled` value to `false` using the [configmap](https://eraser-dev.github.io/eraser/docs/customization#detailed-options). In this case, each collector pod will hold 2 containers: collector and remover. ```shell $ kubectl get pods -n eraser-system diff --git a/docs/versioned_docs/version-v1.1.x/releasing.md b/docs/versioned_docs/version-v1.1.x/releasing.md index d65fae92d8..52f1fd4142 100644 --- a/docs/versioned_docs/version-v1.1.x/releasing.md +++ b/docs/versioned_docs/version-v1.1.x/releasing.md @@ -20,8 +20,8 @@ title: Releasing git push origin ``` 6. Pushing the release tag will trigger GitHub Actions to trigger `release` job. - This will build the `ghcr.io/azure/remover`, `ghcr.io/azure/eraser-manager`, `ghcr.io/azure/collector`, and `ghcr.io/azure/eraser-trivy-scanner` images automatically, then publish the new release tag. + This will build the `ghcr.io/eraser-dev/remover`, `ghcr.io/eraser-dev/eraser-manager`, `ghcr.io/eraser-dev/collector`, and `ghcr.io/eraser-dev/eraser-trivy-scanner` images automatically, then publish the new release tag. ## Publishing -1. GitHub Action will create a new release, review and edit it at https://github.com/Azure/eraser/releases \ No newline at end of file +1. GitHub Action will create a new release, review and edit it at https://github.com/eraser-dev/eraser/releases \ No newline at end of file diff --git a/docs/versioned_docs/version-v1.1.x/trivy.md b/docs/versioned_docs/version-v1.1.x/trivy.md index cc741c2a76..7b531b240c 100644 --- a/docs/versioned_docs/version-v1.1.x/trivy.md +++ b/docs/versioned_docs/version-v1.1.x/trivy.md @@ -3,4 +3,4 @@ title: Trivy --- ## Trivy Provider Options -The trivy provider is used in Eraser for image scanning and detecting vulnerabilities. See [Customization](https://azure.github.io/eraser/docs/customization#scanner-options) for more details on configuring the scanner. +The trivy provider is used in Eraser for image scanning and detecting vulnerabilities. See [Customization](https://eraser-dev.github.io/eraser/docs/customization#scanner-options) for more details on configuring the scanner. diff --git a/go.mod b/go.mod index 101fee1ab3..ad608ae90f 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/Azure/eraser +module github.com/eraser-dev/eraser go 1.18 @@ -101,7 +101,6 @@ require ( github.com/spf13/cobra v1.7.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/vladimirvivien/gexe v0.1.1 // indirect - go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.2 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.34.0 // indirect go.opentelemetry.io/otel/trace v1.14.0 // indirect @@ -109,8 +108,6 @@ require ( go.uber.org/atomic v1.10.0 // indirect go.uber.org/goleak v1.2.1 // indirect go.uber.org/multierr v1.9.0 // indirect - golang.org/x/crypto v0.9.0 // indirect - golang.org/x/mod v0.10.0 // indirect golang.org/x/net v0.10.0 // indirect golang.org/x/oauth2 v0.7.0 // indirect golang.org/x/sync v0.2.0 // indirect @@ -125,7 +122,6 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - gotest.tools/v3 v3.4.0 // indirect k8s.io/apiextensions-apiserver v0.26.0 // indirect k8s.io/apiserver v0.26.0 // indirect k8s.io/component-base v0.26.0 // indirect diff --git a/go.sum b/go.sum index bd9b735ca7..3112ddc47f 100644 --- a/go.sum +++ b/go.sum @@ -201,7 +201,6 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= @@ -357,7 +356,6 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/vladimirvivien/gexe v0.1.1 h1:2A0SBaOSKH+cwLVdt6H+KkHZotZWRNLlWygANGw5DxE= @@ -374,8 +372,7 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= -go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM= go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU= go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.2 h1:htgM8vZIF8oPSCxa341e3IZ4yr/sKxgu8KZYllByiVY= @@ -413,8 +410,7 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= -golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= +golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -447,8 +443,7 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= -golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -478,7 +473,6 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= @@ -531,7 +525,6 @@ golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -599,7 +592,6 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -680,7 +672,6 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= @@ -721,8 +712,8 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= -gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= +gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/main.go b/main.go index 48e1bfa0f0..bdfcdbea19 100644 --- a/main.go +++ b/main.go @@ -39,16 +39,16 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/healthz" - "github.com/Azure/eraser/api/unversioned" - "github.com/Azure/eraser/api/unversioned/config" - eraserv1 "github.com/Azure/eraser/api/v1" - eraserv1alpha1 "github.com/Azure/eraser/api/v1alpha1" - v1alpha1Config "github.com/Azure/eraser/api/v1alpha1/config" - eraserv1alpha2 "github.com/Azure/eraser/api/v1alpha2" - v1alpha2Config "github.com/Azure/eraser/api/v1alpha2/config" - "github.com/Azure/eraser/controllers" - "github.com/Azure/eraser/pkg/logger" - "github.com/Azure/eraser/version" + "github.com/eraser-dev/eraser/api/unversioned" + "github.com/eraser-dev/eraser/api/unversioned/config" + eraserv1 "github.com/eraser-dev/eraser/api/v1" + eraserv1alpha1 "github.com/eraser-dev/eraser/api/v1alpha1" + v1alpha1Config "github.com/eraser-dev/eraser/api/v1alpha1/config" + eraserv1alpha2 "github.com/eraser-dev/eraser/api/v1alpha2" + v1alpha2Config "github.com/eraser-dev/eraser/api/v1alpha2/config" + "github.com/eraser-dev/eraser/controllers" + "github.com/eraser-dev/eraser/pkg/logger" + "github.com/eraser-dev/eraser/version" //+kubebuilder:scaffold:imports ) diff --git a/manifest_staging/charts/eraser/Chart.yaml b/manifest_staging/charts/eraser/Chart.yaml index 1c7befdf8b..9d54b1799c 100644 --- a/manifest_staging/charts/eraser/Chart.yaml +++ b/manifest_staging/charts/eraser/Chart.yaml @@ -4,6 +4,6 @@ description: A Helm chart for Eraser type: application version: 1.1.1 appVersion: v1.1.1 -home: https://github.com/Azure/eraser +home: https://github.com/eraser-dev/eraser sources: - - https://github.com/Azure/eraser.git + - https://github.com/eraser-dev/eraser.git diff --git a/manifest_staging/charts/eraser/README.md b/manifest_staging/charts/eraser/README.md index 47ae1a4dc3..a2ad3ced96 100644 --- a/manifest_staging/charts/eraser/README.md +++ b/manifest_staging/charts/eraser/README.md @@ -7,7 +7,7 @@ This Helm chart is autogenerated from the Eraser static manifest. The generator ## Get Repo Info ```console -helm repo add eraser https://azure.github.io/eraser/charts +helm repo add eraser https://eraser-dev.github.io/eraser/charts helm repo update ``` @@ -49,7 +49,7 @@ _See [helm install](https://helm.sh/docs/helm/helm_install/) for command documen | runtimeConfig.components.collector | Settings for the collector component. | `{ enabled: false }` | | runtimeConfig.components.scanner | Settings for the scanner component. | `{ enabled: false }` | | runtimeConfig.components.eraser | Settings for the eraser component. | `{}` | -| deploy.image.repo | Repository for the image. | `ghcr.io/azure/eraser-manager` | +| deploy.image.repo | Repository for the image. | `ghcr.io/eraser-dev/eraser-manager` | | deploy.image.pullPolicy | Policy for pulling the image. | `IfNotPresent` | | deploy.image.tag | Overrides the default image tag. | `""` | | deploy.additionalArgs | Additional arguments to pass to the command. | `[]` | diff --git a/manifest_staging/charts/eraser/values.yaml b/manifest_staging/charts/eraser/values.yaml index 7369c2f79d..a55fc2b2bb 100644 --- a/manifest_staging/charts/eraser/values.yaml +++ b/manifest_staging/charts/eraser/values.yaml @@ -88,7 +88,7 @@ runtimeConfig: deploy: image: - repo: ghcr.io/azure/eraser-manager + repo: ghcr.io/eraser-dev/eraser-manager pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: "v1.1.1" diff --git a/manifest_staging/deploy/eraser.yaml b/manifest_staging/deploy/eraser.yaml index 6e30c4bf59..01cead398d 100644 --- a/manifest_staging/deploy/eraser.yaml +++ b/manifest_staging/deploy/eraser.yaml @@ -410,7 +410,7 @@ data: collector: enabled: true image: - repo: ghcr.io/azure/collector + repo: ghcr.io/eraser-dev/collector tag: v1.1.1 request: mem: 25Mi @@ -422,7 +422,7 @@ data: scanner: enabled: true image: - repo: ghcr.io/azure/eraser-trivy-scanner # supply custom image for custom scanner + repo: ghcr.io/eraser-dev/eraser-trivy-scanner # supply custom image for custom scanner tag: v1.1.1 request: mem: 500Mi @@ -458,7 +458,7 @@ data: perImage: 1h remover: image: - repo: ghcr.io/azure/remover + repo: ghcr.io/eraser-dev/remover tag: v1.1.1 request: mem: 25Mi @@ -502,7 +502,7 @@ spec: fieldPath: metadata.namespace - name: OTEL_SERVICE_NAME value: eraser-manager - image: ghcr.io/azure/eraser-manager:v1.1.1 + image: ghcr.io/eraser-dev/eraser-manager:v1.1.1 livenessProbe: httpGet: path: /healthz diff --git a/pkg/collector/collector.go b/pkg/collector/collector.go index 2cd52d8b94..09c2c81641 100644 --- a/pkg/collector/collector.go +++ b/pkg/collector/collector.go @@ -10,12 +10,12 @@ import ( "os" "time" - "github.com/Azure/eraser/pkg/cri" - "github.com/Azure/eraser/pkg/logger" + "github.com/eraser-dev/eraser/pkg/cri" + "github.com/eraser-dev/eraser/pkg/logger" "golang.org/x/sys/unix" logf "sigs.k8s.io/controller-runtime/pkg/log" - util "github.com/Azure/eraser/pkg/utils" + util "github.com/eraser-dev/eraser/pkg/utils" ) var ( diff --git a/pkg/collector/helpers.go b/pkg/collector/helpers.go index e7bbac14e6..4bb52456d9 100644 --- a/pkg/collector/helpers.go +++ b/pkg/collector/helpers.go @@ -3,9 +3,9 @@ package main import ( "context" - "github.com/Azure/eraser/api/unversioned" - "github.com/Azure/eraser/pkg/cri" - util "github.com/Azure/eraser/pkg/utils" + "github.com/eraser-dev/eraser/api/unversioned" + "github.com/eraser-dev/eraser/pkg/cri" + util "github.com/eraser-dev/eraser/pkg/utils" ) func getImages(c cri.Collector) ([]unversioned.Image, error) { diff --git a/pkg/cri/client.go b/pkg/cri/client.go index fdae721fc1..b556e99919 100644 --- a/pkg/cri/client.go +++ b/pkg/cri/client.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/Azure/eraser/pkg/utils" + "github.com/eraser-dev/eraser/pkg/utils" "google.golang.org/grpc" v1 "k8s.io/cri-api/pkg/apis/runtime/v1" v1alpha2 "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" diff --git a/pkg/remover/helpers.go b/pkg/remover/helpers.go index 718eed8aa0..9d16e1d7d6 100644 --- a/pkg/remover/helpers.go +++ b/pkg/remover/helpers.go @@ -3,9 +3,9 @@ package main import ( "context" - "github.com/Azure/eraser/api/unversioned" - "github.com/Azure/eraser/pkg/cri" - util "github.com/Azure/eraser/pkg/utils" + "github.com/eraser-dev/eraser/api/unversioned" + "github.com/eraser-dev/eraser/pkg/cri" + util "github.com/eraser-dev/eraser/pkg/utils" ) func removeImages(c cri.Remover, targetImages []string) (int, error) { diff --git a/pkg/remover/remover.go b/pkg/remover/remover.go index d70831dd12..a4228c6b67 100644 --- a/pkg/remover/remover.go +++ b/pkg/remover/remover.go @@ -17,12 +17,12 @@ import ( "go.opentelemetry.io/otel/metric/global" logf "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/Azure/eraser/pkg/cri" - "github.com/Azure/eraser/pkg/logger" - "github.com/Azure/eraser/pkg/metrics" + "github.com/eraser-dev/eraser/pkg/cri" + "github.com/eraser-dev/eraser/pkg/logger" + "github.com/eraser-dev/eraser/pkg/metrics" - "github.com/Azure/eraser/api/unversioned" - util "github.com/Azure/eraser/pkg/utils" + "github.com/eraser-dev/eraser/api/unversioned" + util "github.com/eraser-dev/eraser/pkg/utils" ) var ( diff --git a/pkg/remover/test_client_test.go b/pkg/remover/test_client_test.go index aac30465c0..799c93e6a4 100644 --- a/pkg/remover/test_client_test.go +++ b/pkg/remover/test_client_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/Azure/eraser/pkg/cri" + "github.com/eraser-dev/eraser/pkg/cri" v1 "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/scanners/template/scanner_template.go b/pkg/scanners/template/scanner_template.go index 80941dc9cc..bf005668c2 100644 --- a/pkg/scanners/template/scanner_template.go +++ b/pkg/scanners/template/scanner_template.go @@ -7,12 +7,12 @@ import ( "os/signal" "syscall" - "github.com/Azure/eraser/api/unversioned" + "github.com/eraser-dev/eraser/api/unversioned" "github.com/go-logr/logr" "golang.org/x/sys/unix" - "github.com/Azure/eraser/pkg/metrics" - util "github.com/Azure/eraser/pkg/utils" + "github.com/eraser-dev/eraser/pkg/metrics" + util "github.com/eraser-dev/eraser/pkg/utils" "go.opentelemetry.io/otel/metric/global" logf "sigs.k8s.io/controller-runtime/pkg/log" ) diff --git a/pkg/scanners/trivy/helpers.go b/pkg/scanners/trivy/helpers.go index 06e4976045..248e891d0a 100644 --- a/pkg/scanners/trivy/helpers.go +++ b/pkg/scanners/trivy/helpers.go @@ -3,7 +3,7 @@ package main import ( "os" - unversioned "github.com/Azure/eraser/api/unversioned" + unversioned "github.com/eraser-dev/eraser/api/unversioned" "k8s.io/apimachinery/pkg/util/yaml" ) diff --git a/pkg/scanners/trivy/trivy.go b/pkg/scanners/trivy/trivy.go index 77d9a0c58a..71bf330a73 100644 --- a/pkg/scanners/trivy/trivy.go +++ b/pkg/scanners/trivy/trivy.go @@ -9,15 +9,15 @@ import ( "os" "time" - "github.com/Azure/eraser/api/unversioned" + "github.com/eraser-dev/eraser/api/unversioned" "go.uber.org/zap" _ "net/http/pprof" - "github.com/Azure/eraser/pkg/logger" - "github.com/Azure/eraser/pkg/scanners/template" - "github.com/Azure/eraser/pkg/utils" trivylogger "github.com/aquasecurity/trivy/pkg/log" + "github.com/eraser-dev/eraser/pkg/logger" + "github.com/eraser-dev/eraser/pkg/scanners/template" + "github.com/eraser-dev/eraser/pkg/utils" logf "sigs.k8s.io/controller-runtime/pkg/log" ) diff --git a/pkg/scanners/trivy/types.go b/pkg/scanners/trivy/types.go index 2f19851fa0..3d91a22514 100644 --- a/pkg/scanners/trivy/types.go +++ b/pkg/scanners/trivy/types.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/Azure/eraser/api/unversioned" trivyTypes "github.com/aquasecurity/trivy/pkg/types" + "github.com/eraser-dev/eraser/api/unversioned" ) const ( diff --git a/pkg/scanners/trivy/types_test.go b/pkg/scanners/trivy/types_test.go index d836423bbd..d3e6f19260 100644 --- a/pkg/scanners/trivy/types_test.go +++ b/pkg/scanners/trivy/types_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/Azure/eraser/api/unversioned" + "github.com/eraser-dev/eraser/api/unversioned" ) const ref = "image:tag" diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index f262f9ed1c..01a9555ca8 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -17,7 +17,7 @@ import ( "google.golang.org/grpc/credentials/insecure" v1 "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/Azure/eraser/api/unversioned" + "github.com/eraser-dev/eraser/api/unversioned" ) const ( diff --git a/test/e2e/tests/collector_delete_deployment/eraser_test.go b/test/e2e/tests/collector_delete_deployment/eraser_test.go index dbb99ded70..88dca785cc 100644 --- a/test/e2e/tests/collector_delete_deployment/eraser_test.go +++ b/test/e2e/tests/collector_delete_deployment/eraser_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "github.com/Azure/eraser/test/e2e/util" + "github.com/eraser-dev/eraser/test/e2e/util" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/tests/collector_delete_deployment/main_test.go b/test/e2e/tests/collector_delete_deployment/main_test.go index 1099e4b6d5..f92c8320e0 100644 --- a/test/e2e/tests/collector_delete_deployment/main_test.go +++ b/test/e2e/tests/collector_delete_deployment/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - eraserv1alpha1 "github.com/Azure/eraser/api/v1alpha1" - "github.com/Azure/eraser/test/e2e/util" + eraserv1alpha1 "github.com/eraser-dev/eraser/api/v1alpha1" + "github.com/eraser-dev/eraser/test/e2e/util" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/e2e-framework/pkg/env" diff --git a/test/e2e/tests/collector_disable_scan/eraser_test.go b/test/e2e/tests/collector_disable_scan/eraser_test.go index 80388b75a7..203d6a97f1 100644 --- a/test/e2e/tests/collector_disable_scan/eraser_test.go +++ b/test/e2e/tests/collector_disable_scan/eraser_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "github.com/Azure/eraser/test/e2e/util" + "github.com/eraser-dev/eraser/test/e2e/util" "sigs.k8s.io/e2e-framework/pkg/envconf" "sigs.k8s.io/e2e-framework/pkg/features" diff --git a/test/e2e/tests/collector_disable_scan/main_test.go b/test/e2e/tests/collector_disable_scan/main_test.go index 4610aba8b0..b7c23bbe05 100644 --- a/test/e2e/tests/collector_disable_scan/main_test.go +++ b/test/e2e/tests/collector_disable_scan/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - eraserv1alpha1 "github.com/Azure/eraser/api/v1alpha1" - "github.com/Azure/eraser/test/e2e/util" + eraserv1alpha1 "github.com/eraser-dev/eraser/api/v1alpha1" + "github.com/eraser-dev/eraser/test/e2e/util" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/e2e-framework/pkg/env" diff --git a/test/e2e/tests/collector_ensure_scan/eraser_test.go b/test/e2e/tests/collector_ensure_scan/eraser_test.go index 38934c3c72..78b6b2ff8c 100644 --- a/test/e2e/tests/collector_ensure_scan/eraser_test.go +++ b/test/e2e/tests/collector_ensure_scan/eraser_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "github.com/Azure/eraser/test/e2e/util" + "github.com/eraser-dev/eraser/test/e2e/util" "sigs.k8s.io/e2e-framework/pkg/envconf" "sigs.k8s.io/e2e-framework/pkg/features" diff --git a/test/e2e/tests/collector_ensure_scan/main_test.go b/test/e2e/tests/collector_ensure_scan/main_test.go index 5819ec2dfe..24edd6ea93 100644 --- a/test/e2e/tests/collector_ensure_scan/main_test.go +++ b/test/e2e/tests/collector_ensure_scan/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - eraserv1alpha1 "github.com/Azure/eraser/api/v1alpha1" - "github.com/Azure/eraser/test/e2e/util" + eraserv1alpha1 "github.com/eraser-dev/eraser/api/v1alpha1" + "github.com/eraser-dev/eraser/test/e2e/util" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/e2e-framework/pkg/env" diff --git a/test/e2e/tests/collector_pipeline/eraser_test.go b/test/e2e/tests/collector_pipeline/eraser_test.go index d807d56d8b..60249c8c64 100644 --- a/test/e2e/tests/collector_pipeline/eraser_test.go +++ b/test/e2e/tests/collector_pipeline/eraser_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "github.com/Azure/eraser/test/e2e/util" + "github.com/eraser-dev/eraser/test/e2e/util" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/test/e2e/tests/collector_pipeline/main_test.go b/test/e2e/tests/collector_pipeline/main_test.go index bf81be7e2a..43a3293bfb 100644 --- a/test/e2e/tests/collector_pipeline/main_test.go +++ b/test/e2e/tests/collector_pipeline/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - eraserv1alpha1 "github.com/Azure/eraser/api/v1alpha1" - "github.com/Azure/eraser/test/e2e/util" + eraserv1alpha1 "github.com/eraser-dev/eraser/api/v1alpha1" + "github.com/eraser-dev/eraser/test/e2e/util" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/e2e-framework/pkg/env" diff --git a/test/e2e/tests/collector_skip_excluded/eraser_test.go b/test/e2e/tests/collector_skip_excluded/eraser_test.go index 7834e14055..785ddac305 100644 --- a/test/e2e/tests/collector_skip_excluded/eraser_test.go +++ b/test/e2e/tests/collector_skip_excluded/eraser_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/Azure/eraser/test/e2e/util" + "github.com/eraser-dev/eraser/test/e2e/util" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/tests/collector_skip_excluded/main_test.go b/test/e2e/tests/collector_skip_excluded/main_test.go index 47f057b7c4..22ea2d9c41 100644 --- a/test/e2e/tests/collector_skip_excluded/main_test.go +++ b/test/e2e/tests/collector_skip_excluded/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - eraserv1alpha1 "github.com/Azure/eraser/api/v1alpha1" - "github.com/Azure/eraser/test/e2e/util" + eraserv1alpha1 "github.com/eraser-dev/eraser/api/v1alpha1" + "github.com/eraser-dev/eraser/test/e2e/util" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/e2e-framework/pkg/env" diff --git a/test/e2e/tests/configmap_update/eraser_test.go b/test/e2e/tests/configmap_update/eraser_test.go index 00b0bb2a1e..872d1c4e58 100644 --- a/test/e2e/tests/configmap_update/eraser_test.go +++ b/test/e2e/tests/configmap_update/eraser_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/Azure/eraser/test/e2e/util" + "github.com/eraser-dev/eraser/test/e2e/util" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/tests/configmap_update/main_test.go b/test/e2e/tests/configmap_update/main_test.go index 2912190c9a..ccde31ca37 100644 --- a/test/e2e/tests/configmap_update/main_test.go +++ b/test/e2e/tests/configmap_update/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - eraserv1alpha1 "github.com/Azure/eraser/api/v1alpha1" - "github.com/Azure/eraser/test/e2e/util" + eraserv1alpha1 "github.com/eraser-dev/eraser/api/v1alpha1" + "github.com/eraser-dev/eraser/test/e2e/util" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/e2e-framework/pkg/env" diff --git a/test/e2e/tests/helm_pull_secret/eraser_test.go b/test/e2e/tests/helm_pull_secret/eraser_test.go index b7b18825e5..15203f6a78 100644 --- a/test/e2e/tests/helm_pull_secret/eraser_test.go +++ b/test/e2e/tests/helm_pull_secret/eraser_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/Azure/eraser/test/e2e/util" + "github.com/eraser-dev/eraser/test/e2e/util" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/tests/helm_pull_secret/main_test.go b/test/e2e/tests/helm_pull_secret/main_test.go index ad558edbb1..1ea3777144 100644 --- a/test/e2e/tests/helm_pull_secret/main_test.go +++ b/test/e2e/tests/helm_pull_secret/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - eraserv1alpha1 "github.com/Azure/eraser/api/v1alpha1" - "github.com/Azure/eraser/test/e2e/util" + eraserv1alpha1 "github.com/eraser-dev/eraser/api/v1alpha1" + "github.com/eraser-dev/eraser/test/e2e/util" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/e2e-framework/pkg/env" diff --git a/test/e2e/tests/helm_pull_secret_imagelist/eraser_test.go b/test/e2e/tests/helm_pull_secret_imagelist/eraser_test.go index a4103ee3fb..f59eb3f177 100644 --- a/test/e2e/tests/helm_pull_secret_imagelist/eraser_test.go +++ b/test/e2e/tests/helm_pull_secret_imagelist/eraser_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/Azure/eraser/test/e2e/util" + "github.com/eraser-dev/eraser/test/e2e/util" - eraserv1 "github.com/Azure/eraser/api/v1" + eraserv1 "github.com/eraser-dev/eraser/api/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/test/e2e/tests/helm_pull_secret_imagelist/main_test.go b/test/e2e/tests/helm_pull_secret_imagelist/main_test.go index 67dfad4673..5d1d0e475e 100644 --- a/test/e2e/tests/helm_pull_secret_imagelist/main_test.go +++ b/test/e2e/tests/helm_pull_secret_imagelist/main_test.go @@ -7,9 +7,9 @@ import ( "os" "testing" - eraserv1 "github.com/Azure/eraser/api/v1" - eraserv1alpha1 "github.com/Azure/eraser/api/v1alpha1" - "github.com/Azure/eraser/test/e2e/util" + eraserv1 "github.com/eraser-dev/eraser/api/v1" + eraserv1alpha1 "github.com/eraser-dev/eraser/api/v1alpha1" + "github.com/eraser-dev/eraser/test/e2e/util" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/e2e-framework/pkg/env" diff --git a/test/e2e/tests/imagelist_alias/eraser_test.go b/test/e2e/tests/imagelist_alias/eraser_test.go index 3544f84da7..212b472d7d 100644 --- a/test/e2e/tests/imagelist_alias/eraser_test.go +++ b/test/e2e/tests/imagelist_alias/eraser_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - eraserv1 "github.com/Azure/eraser/api/v1" - "github.com/Azure/eraser/test/e2e/util" + eraserv1 "github.com/eraser-dev/eraser/api/v1" + "github.com/eraser-dev/eraser/test/e2e/util" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -41,7 +41,7 @@ func TestEnsureAliasedImageRemoved(t *testing.T) { // but each pod refers to that same image by a different tag. nodeName := util.GetClusterNodes(t)[0] - // At ghcr.io/azure/eraser/e2e-test/nginx there is a repository + // At ghcr.io/eraser-dev/eraser/e2e-test/nginx there is a repository // containing three tags. The three tags are `latest`, `one` and // `two`. They are all aliases for the same image; only the name // differs. These images are maintained there in order to avoid diff --git a/test/e2e/tests/imagelist_alias/main_test.go b/test/e2e/tests/imagelist_alias/main_test.go index f805cf1b1b..c183cbf87c 100644 --- a/test/e2e/tests/imagelist_alias/main_test.go +++ b/test/e2e/tests/imagelist_alias/main_test.go @@ -7,9 +7,9 @@ import ( "os" "testing" - eraserv1 "github.com/Azure/eraser/api/v1" - eraserv1alpha1 "github.com/Azure/eraser/api/v1alpha1" - "github.com/Azure/eraser/test/e2e/util" + eraserv1 "github.com/eraser-dev/eraser/api/v1" + eraserv1alpha1 "github.com/eraser-dev/eraser/api/v1alpha1" + "github.com/eraser-dev/eraser/test/e2e/util" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/e2e-framework/pkg/env" diff --git a/test/e2e/tests/imagelist_change/eraser_test.go b/test/e2e/tests/imagelist_change/eraser_test.go index 2f17027c68..a9a6df28d6 100644 --- a/test/e2e/tests/imagelist_change/eraser_test.go +++ b/test/e2e/tests/imagelist_change/eraser_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "github.com/Azure/eraser/test/e2e/util" + "github.com/eraser-dev/eraser/test/e2e/util" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/tests/imagelist_change/main_test.go b/test/e2e/tests/imagelist_change/main_test.go index 8a7faddd79..c874aaed84 100644 --- a/test/e2e/tests/imagelist_change/main_test.go +++ b/test/e2e/tests/imagelist_change/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - eraserv1alpha1 "github.com/Azure/eraser/api/v1alpha1" - "github.com/Azure/eraser/test/e2e/util" + eraserv1alpha1 "github.com/eraser-dev/eraser/api/v1alpha1" + "github.com/eraser-dev/eraser/test/e2e/util" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/e2e-framework/pkg/env" diff --git a/test/e2e/tests/imagelist_exclusion_list/eraser_test.go b/test/e2e/tests/imagelist_exclusion_list/eraser_test.go index 439a26a09d..eabdb51ee7 100644 --- a/test/e2e/tests/imagelist_exclusion_list/eraser_test.go +++ b/test/e2e/tests/imagelist_exclusion_list/eraser_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "github.com/Azure/eraser/test/e2e/util" + "github.com/eraser-dev/eraser/test/e2e/util" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/tests/imagelist_exclusion_list/main_test.go b/test/e2e/tests/imagelist_exclusion_list/main_test.go index c2a33ce8a5..bf717fbf38 100644 --- a/test/e2e/tests/imagelist_exclusion_list/main_test.go +++ b/test/e2e/tests/imagelist_exclusion_list/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - eraserv1alpha1 "github.com/Azure/eraser/api/v1alpha1" - "github.com/Azure/eraser/test/e2e/util" + eraserv1alpha1 "github.com/eraser-dev/eraser/api/v1alpha1" + "github.com/eraser-dev/eraser/test/e2e/util" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/e2e-framework/pkg/env" diff --git a/test/e2e/tests/imagelist_include_nodes/eraser_test.go b/test/e2e/tests/imagelist_include_nodes/eraser_test.go index 9a0bad7a21..0e07f9e282 100644 --- a/test/e2e/tests/imagelist_include_nodes/eraser_test.go +++ b/test/e2e/tests/imagelist_include_nodes/eraser_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "github.com/Azure/eraser/test/e2e/util" + "github.com/eraser-dev/eraser/test/e2e/util" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/tests/imagelist_include_nodes/main_test.go b/test/e2e/tests/imagelist_include_nodes/main_test.go index 2ebc5d8854..98b9fcb12a 100644 --- a/test/e2e/tests/imagelist_include_nodes/main_test.go +++ b/test/e2e/tests/imagelist_include_nodes/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - eraserv1alpha1 "github.com/Azure/eraser/api/v1alpha1" - "github.com/Azure/eraser/test/e2e/util" + eraserv1alpha1 "github.com/eraser-dev/eraser/api/v1alpha1" + "github.com/eraser-dev/eraser/test/e2e/util" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/e2e-framework/pkg/env" diff --git a/test/e2e/tests/imagelist_prune_images/eraser_test.go b/test/e2e/tests/imagelist_prune_images/eraser_test.go index ddd5530114..1885502a3f 100644 --- a/test/e2e/tests/imagelist_prune_images/eraser_test.go +++ b/test/e2e/tests/imagelist_prune_images/eraser_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - eraserv1 "github.com/Azure/eraser/api/v1" - "github.com/Azure/eraser/test/e2e/util" + eraserv1 "github.com/eraser-dev/eraser/api/v1" + "github.com/eraser-dev/eraser/test/e2e/util" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/tests/imagelist_prune_images/main_test.go b/test/e2e/tests/imagelist_prune_images/main_test.go index e67f8dd520..61937e8a4c 100644 --- a/test/e2e/tests/imagelist_prune_images/main_test.go +++ b/test/e2e/tests/imagelist_prune_images/main_test.go @@ -7,9 +7,9 @@ import ( "os" "testing" - eraserv1 "github.com/Azure/eraser/api/v1" - eraserv1alpha1 "github.com/Azure/eraser/api/v1alpha1" - "github.com/Azure/eraser/test/e2e/util" + eraserv1 "github.com/eraser-dev/eraser/api/v1" + eraserv1alpha1 "github.com/eraser-dev/eraser/api/v1alpha1" + "github.com/eraser-dev/eraser/test/e2e/util" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/e2e-framework/pkg/env" diff --git a/test/e2e/tests/imagelist_rm_images/eraser_test.go b/test/e2e/tests/imagelist_rm_images/eraser_test.go index 2292af94c3..219457cc03 100644 --- a/test/e2e/tests/imagelist_rm_images/eraser_test.go +++ b/test/e2e/tests/imagelist_rm_images/eraser_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/Azure/eraser/test/e2e/util" + "github.com/eraser-dev/eraser/test/e2e/util" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/tests/imagelist_rm_images/main_test.go b/test/e2e/tests/imagelist_rm_images/main_test.go index 3e24b43ccc..fa041e1c4e 100644 --- a/test/e2e/tests/imagelist_rm_images/main_test.go +++ b/test/e2e/tests/imagelist_rm_images/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - eraserv1alpha1 "github.com/Azure/eraser/api/v1alpha1" - "github.com/Azure/eraser/test/e2e/util" + eraserv1alpha1 "github.com/eraser-dev/eraser/api/v1alpha1" + "github.com/eraser-dev/eraser/test/e2e/util" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/e2e-framework/pkg/env" diff --git a/test/e2e/tests/imagelist_skip_nodes/eraser_test.go b/test/e2e/tests/imagelist_skip_nodes/eraser_test.go index 0fc42dc8fd..dd8d2aff15 100644 --- a/test/e2e/tests/imagelist_skip_nodes/eraser_test.go +++ b/test/e2e/tests/imagelist_skip_nodes/eraser_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "github.com/Azure/eraser/test/e2e/util" + "github.com/eraser-dev/eraser/test/e2e/util" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/e2e/tests/imagelist_skip_nodes/main_test.go b/test/e2e/tests/imagelist_skip_nodes/main_test.go index c2a33ce8a5..bf717fbf38 100644 --- a/test/e2e/tests/imagelist_skip_nodes/main_test.go +++ b/test/e2e/tests/imagelist_skip_nodes/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - eraserv1alpha1 "github.com/Azure/eraser/api/v1alpha1" - "github.com/Azure/eraser/test/e2e/util" + eraserv1alpha1 "github.com/eraser-dev/eraser/api/v1alpha1" + "github.com/eraser-dev/eraser/test/e2e/util" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/e2e-framework/pkg/env" diff --git a/test/e2e/tests/metrics_test_disable_scanner/eraser_test.go b/test/e2e/tests/metrics_test_disable_scanner/eraser_test.go index f41d92bd8e..2b737824b2 100644 --- a/test/e2e/tests/metrics_test_disable_scanner/eraser_test.go +++ b/test/e2e/tests/metrics_test_disable_scanner/eraser_test.go @@ -9,7 +9,7 @@ import ( "strconv" "testing" - "github.com/Azure/eraser/test/e2e/util" + "github.com/eraser-dev/eraser/test/e2e/util" "sigs.k8s.io/e2e-framework/pkg/envconf" "sigs.k8s.io/e2e-framework/pkg/features" diff --git a/test/e2e/tests/metrics_test_disable_scanner/main_test.go b/test/e2e/tests/metrics_test_disable_scanner/main_test.go index c5368859f5..112a8137c0 100644 --- a/test/e2e/tests/metrics_test_disable_scanner/main_test.go +++ b/test/e2e/tests/metrics_test_disable_scanner/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - eraserv1alpha1 "github.com/Azure/eraser/api/v1alpha1" - "github.com/Azure/eraser/test/e2e/util" + eraserv1alpha1 "github.com/eraser-dev/eraser/api/v1alpha1" + "github.com/eraser-dev/eraser/test/e2e/util" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/e2e-framework/pkg/env" diff --git a/test/e2e/tests/metrics_test_eraser/eraser_test.go b/test/e2e/tests/metrics_test_eraser/eraser_test.go index 5ee02578ad..5b8302d97b 100644 --- a/test/e2e/tests/metrics_test_eraser/eraser_test.go +++ b/test/e2e/tests/metrics_test_eraser/eraser_test.go @@ -9,7 +9,7 @@ import ( "strconv" "testing" - "github.com/Azure/eraser/test/e2e/util" + "github.com/eraser-dev/eraser/test/e2e/util" "sigs.k8s.io/e2e-framework/pkg/envconf" "sigs.k8s.io/e2e-framework/pkg/features" diff --git a/test/e2e/tests/metrics_test_eraser/main_test.go b/test/e2e/tests/metrics_test_eraser/main_test.go index c59431692e..711aa2f3b1 100644 --- a/test/e2e/tests/metrics_test_eraser/main_test.go +++ b/test/e2e/tests/metrics_test_eraser/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - eraserv1alpha1 "github.com/Azure/eraser/api/v1alpha1" - "github.com/Azure/eraser/test/e2e/util" + eraserv1alpha1 "github.com/eraser-dev/eraser/api/v1alpha1" + "github.com/eraser-dev/eraser/test/e2e/util" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/e2e-framework/pkg/env" diff --git a/test/e2e/tests/metrics_test_scanner/eraser_test.go b/test/e2e/tests/metrics_test_scanner/eraser_test.go index ae8a9db1ff..a282ba1680 100644 --- a/test/e2e/tests/metrics_test_scanner/eraser_test.go +++ b/test/e2e/tests/metrics_test_scanner/eraser_test.go @@ -9,7 +9,7 @@ import ( "strconv" "testing" - "github.com/Azure/eraser/test/e2e/util" + "github.com/eraser-dev/eraser/test/e2e/util" "sigs.k8s.io/e2e-framework/pkg/envconf" "sigs.k8s.io/e2e-framework/pkg/features" diff --git a/test/e2e/tests/metrics_test_scanner/main_test.go b/test/e2e/tests/metrics_test_scanner/main_test.go index e1ffcb71b6..7935c29798 100644 --- a/test/e2e/tests/metrics_test_scanner/main_test.go +++ b/test/e2e/tests/metrics_test_scanner/main_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - eraserv1alpha1 "github.com/Azure/eraser/api/v1alpha1" - "github.com/Azure/eraser/test/e2e/util" + eraserv1alpha1 "github.com/eraser-dev/eraser/api/v1alpha1" + "github.com/eraser-dev/eraser/test/e2e/util" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/e2e-framework/pkg/env" diff --git a/test/e2e/util/utils.go b/test/e2e/util/utils.go index 08b11f500c..0c3616eddf 100644 --- a/test/e2e/util/utils.go +++ b/test/e2e/util/utils.go @@ -26,24 +26,24 @@ import ( "sigs.k8s.io/e2e-framework/pkg/envfuncs" "sigs.k8s.io/kind/pkg/cluster" - eraserv1 "github.com/Azure/eraser/api/v1" + eraserv1 "github.com/eraser-dev/eraser/api/v1" - pkgUtil "github.com/Azure/eraser/pkg/utils" + pkgUtil "github.com/eraser-dev/eraser/pkg/utils" ) const ( providerResourceChartDir = "manifest_staging/charts" providerResourceDeployDir = "manifest_staging/deploy" - publishedHelmRepo = "https://azure.github.io/eraser/charts" + publishedHelmRepo = "https://eraser-dev.github.io/eraser/charts" KindClusterName = "eraser-e2e-test" ProviderResource = "eraser.yaml" Alpine = "alpine" Nginx = "nginx" - NginxLatest = "ghcr.io/azure/eraser/e2e-test/nginx:latest" - NginxAliasOne = "ghcr.io/azure/eraser/e2e-test/nginx:one" - NginxAliasTwo = "ghcr.io/azure/eraser/e2e-test/nginx:two" + NginxLatest = "ghcr.io/eraser-dev/eraser/e2e-test/nginx:latest" + NginxAliasOne = "ghcr.io/eraser-dev/eraser/e2e-test/nginx:one" + NginxAliasTwo = "ghcr.io/eraser-dev/eraser/e2e-test/nginx:two" Redis = "redis" Caddy = "caddy" diff --git a/third_party/open-policy-agent/gatekeeper/helmify/static/Chart.yaml b/third_party/open-policy-agent/gatekeeper/helmify/static/Chart.yaml index 1c7befdf8b..9d54b1799c 100644 --- a/third_party/open-policy-agent/gatekeeper/helmify/static/Chart.yaml +++ b/third_party/open-policy-agent/gatekeeper/helmify/static/Chart.yaml @@ -4,6 +4,6 @@ description: A Helm chart for Eraser type: application version: 1.1.1 appVersion: v1.1.1 -home: https://github.com/Azure/eraser +home: https://github.com/eraser-dev/eraser sources: - - https://github.com/Azure/eraser.git + - https://github.com/eraser-dev/eraser.git diff --git a/third_party/open-policy-agent/gatekeeper/helmify/static/README.md b/third_party/open-policy-agent/gatekeeper/helmify/static/README.md index 47ae1a4dc3..a2ad3ced96 100644 --- a/third_party/open-policy-agent/gatekeeper/helmify/static/README.md +++ b/third_party/open-policy-agent/gatekeeper/helmify/static/README.md @@ -7,7 +7,7 @@ This Helm chart is autogenerated from the Eraser static manifest. The generator ## Get Repo Info ```console -helm repo add eraser https://azure.github.io/eraser/charts +helm repo add eraser https://eraser-dev.github.io/eraser/charts helm repo update ``` @@ -49,7 +49,7 @@ _See [helm install](https://helm.sh/docs/helm/helm_install/) for command documen | runtimeConfig.components.collector | Settings for the collector component. | `{ enabled: false }` | | runtimeConfig.components.scanner | Settings for the scanner component. | `{ enabled: false }` | | runtimeConfig.components.eraser | Settings for the eraser component. | `{}` | -| deploy.image.repo | Repository for the image. | `ghcr.io/azure/eraser-manager` | +| deploy.image.repo | Repository for the image. | `ghcr.io/eraser-dev/eraser-manager` | | deploy.image.pullPolicy | Policy for pulling the image. | `IfNotPresent` | | deploy.image.tag | Overrides the default image tag. | `""` | | deploy.additionalArgs | Additional arguments to pass to the command. | `[]` | diff --git a/third_party/open-policy-agent/gatekeeper/helmify/static/values.yaml b/third_party/open-policy-agent/gatekeeper/helmify/static/values.yaml index 7369c2f79d..a55fc2b2bb 100644 --- a/third_party/open-policy-agent/gatekeeper/helmify/static/values.yaml +++ b/third_party/open-policy-agent/gatekeeper/helmify/static/values.yaml @@ -88,7 +88,7 @@ runtimeConfig: deploy: image: - repo: ghcr.io/azure/eraser-manager + repo: ghcr.io/eraser-dev/eraser-manager pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: "v1.1.1" diff --git a/version/version.go b/version/version.go index 268050c1e0..dea7b3c3b1 100644 --- a/version/version.go +++ b/version/version.go @@ -9,7 +9,7 @@ var ( // BuildVersion is version set on build. BuildVersion string // DefaultRepo is the default repo for images. - DefaultRepo = "ghcr.io/azure" + DefaultRepo = "ghcr.io/eraser-dev" // buildTime is the date for the binary build. buildTime string // vcsCommit is the commit hash for the binary build.