diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 646c320..378cb44 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -16,9 +16,6 @@ jobs: - uses: actions/setup-go@v5 with: go-version-file: go.mod - - run: hack/setup-git-redirect.sh - env: - GITHUB_PAT: ${{ secrets.BOT_PAT }} - name: golangci-lint uses: golangci/golangci-lint-action@v4 with: diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index 7f7b19f..fae5294 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -70,5 +70,3 @@ jobs: platforms: ${{env.platforms}} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - secrets: | - "github_pat=${{ secrets.BOT_PAT }}" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 34f7a55..5539a6b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,14 +17,5 @@ jobs: - uses: actions/setup-go@v5 with: go-version-file: go.mod - - run: | - mkdir -p ~/.ssh - for key in rsa ecdsa ed25519; do - ssh-keyscan -t $key github.com 2>/dev/null >> ~/.ssh/known_hosts - done - - uses: webfactory/ssh-agent@v0.9.0 - with: - ssh-private-key: ${{ secrets.BOT_PRIVATE_KEY }} - - run: ./hack/setup-git-redirect.sh - run: make build - run: make test diff --git a/controllers/controllers_test.go b/controllers/controllers_test.go index d0d232d..ec6004b 100644 --- a/controllers/controllers_test.go +++ b/controllers/controllers_test.go @@ -25,9 +25,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/metrics/server" + ipamv1alpha1 "github.com/ironcore-dev/ipam/api/v1alpha1" oobv1alpha1 "github.com/ironcore-dev/oob/api/v1alpha1" "github.com/ironcore-dev/oob/internal/log" - ipamv1alpha1 "github.com/onmetal/ipam/api/v1alpha1" ) var ( diff --git a/controllers/ip_controller.go b/controllers/ip_controller.go index b4ff550..4f3b56e 100644 --- a/controllers/ip_controller.go +++ b/controllers/ip_controller.go @@ -16,11 +16,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/predicate" + ipamv1alpha1 "github.com/ironcore-dev/ipam/api/v1alpha1" oobv1alpha1 "github.com/ironcore-dev/oob/api/v1alpha1" "github.com/ironcore-dev/oob/internal/condition" "github.com/ironcore-dev/oob/internal/log" "github.com/ironcore-dev/oob/internal/rand" - ipamv1alpha1 "github.com/onmetal/ipam/api/v1alpha1" ) //+kubebuilder:rbac:groups=ipam.onmetal.de,resources=ips,verbs=get;list;watch diff --git a/controllers/ip_controller_test.go b/controllers/ip_controller_test.go index 34eea33..639b000 100644 --- a/controllers/ip_controller_test.go +++ b/controllers/ip_controller_test.go @@ -17,8 +17,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" + ipamv1alpha1 "github.com/ironcore-dev/ipam/api/v1alpha1" oobv1alpha1 "github.com/ironcore-dev/oob/api/v1alpha1" - ipamv1alpha1 "github.com/onmetal/ipam/api/v1alpha1" ) var _ = Describe("IP controller", func() { diff --git a/go.mod b/go.mod index 654620a..3f06b2d 100644 --- a/go.mod +++ b/go.mod @@ -11,9 +11,9 @@ require ( github.com/google/uuid v1.6.0 github.com/gorilla/mux v1.8.1 github.com/hashicorp/go-multierror v1.1.1 + github.com/ironcore-dev/ipam v0.0.26 github.com/ironcore-dev/ironcore v0.1.2-0.20240222224633-e553da0ae687 github.com/ironcore-dev/vgopath v0.1.4 - github.com/onmetal/ipam v0.0.26 github.com/onsi/ginkgo/v2 v2.15.0 github.com/onsi/gomega v1.31.1 github.com/rs/zerolog v1.32.0 diff --git a/main.go b/main.go index 6b41122..7971b24 100644 --- a/main.go +++ b/main.go @@ -25,12 +25,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/metrics/server" + ipamv1alpha1 "github.com/ironcore-dev/ipam/api/v1alpha1" computev1alpha1 "github.com/ironcore-dev/ironcore/api/compute/v1alpha1" oobv1alpha1 "github.com/ironcore-dev/oob/api/v1alpha1" "github.com/ironcore-dev/oob/controllers" "github.com/ironcore-dev/oob/internal/log" "github.com/ironcore-dev/oob/servers" - ipamv1alpha1 "github.com/onmetal/ipam/api/v1alpha1" ) func usage() {