Skip to content

Commit

Permalink
Switch to public ipam reference
Browse files Browse the repository at this point in the history
  • Loading branch information
damyan committed Feb 28, 2024
1 parent 54afbe1 commit ed5a7a3
Show file tree
Hide file tree
Showing 8 changed files with 5 additions and 19 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/publish-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,3 @@ jobs:
platforms: ${{env.platforms}}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
secrets: |
"github_pat=${{ secrets.BOT_PAT }}"
9 changes: 0 additions & 9 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
with:
ssh-private-key: ${{ secrets.BOT_PRIVATE_KEY }}
- run: ./hack/setup-git-redirect.sh
- run: make build
- run: make test
2 changes: 1 addition & 1 deletion controllers/controllers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion controllers/ip_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion controllers/ip_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Check failure on line 28 in main.go

View workflow job for this annotation

GitHub Actions / run

missing go.sum entry for module providing package github.com/ironcore-dev/ipam/api/v1alpha1 (imported by github.com/ironcore-dev/oob); to add:
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() {
Expand Down

0 comments on commit ed5a7a3

Please sign in to comment.