Skip to content

Commit

Permalink
rename module and all references from azure to eraser-dev (#805)
Browse files Browse the repository at this point in the history
Co-authored-by: Sertac Ozercan <[email protected]>
  • Loading branch information
Xander Grzywinski and sozercan authored Aug 1, 2023
1 parent 900786e commit c1cc274
Show file tree
Hide file tree
Showing 126 changed files with 281 additions and 293 deletions.
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
18 changes: 9 additions & 9 deletions PROJECT
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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.

Expand All @@ -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.
4 changes: 2 additions & 2 deletions api/unversioned/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion api/v1/doc.go
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion api/v1/zz_generated.conversion.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions api/v1alpha1/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/doc.go
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion api/v1alpha1/eraserconfig_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/zz_generated.conversion.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions api/v1alpha2/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha2/doc.go
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion api/v1alpha2/zz_generated.conversion.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}'"
)
}

Expand Down
4 changes: 2 additions & 2 deletions charts/eraser/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions charts/eraser/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down Expand Up @@ -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. | `[]` |
Expand Down
2 changes: 1 addition & 1 deletion charts/eraser/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions controllers/configmap/configmap.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions controllers/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
16 changes: 8 additions & 8 deletions controllers/imagecollector/imagecollector_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions controllers/imagejob/imagejob_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
15 changes: 8 additions & 7 deletions controllers/imagelist/imagelist_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion controllers/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion controllers/util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion demo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down
Loading

0 comments on commit c1cc274

Please sign in to comment.