Skip to content

Convert apis and controllers to multi-group #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Convert apis and controllers to multi-group #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN go mod download

# Copy the go source
COPY main.go main.go
COPY api/ api/
COPY apis/ apis/
COPY controllers/ controllers/

# Build
Expand Down
5 changes: 3 additions & 2 deletions PROJECT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
domain: zachfi
layout:
- go.kubebuilder.io/v3
multigroup: true
projectName: nodemanager
repo: github.com/zachfi/nodemanager
resources:
Expand All @@ -11,7 +12,7 @@ resources:
domain: zachfi
group: common
kind: ConfigSet
path: github.com/zachfi/nodemanager/api/v1
path: github.com/zachfi/nodemanager/apis/common/v1
version: v1
- api:
crdVersion: v1
Expand All @@ -20,6 +21,6 @@ resources:
domain: zachfi
group: common
kind: ManagedNode
path: github.com/zachfi/nodemanager/api/v1
path: github.com/zachfi/nodemanager/apis/common/v1
version: v1
version: "3"
0 api/v1/configset_types.go → apis/common/v1/configset_types.go
View file
Open in desktop
File renamed without changes.
0 api/v1/groupversion_info.go → apis/common/v1/groupversion_info.go
View file
Open in desktop
File renamed without changes.
0 api/v1/managednode_types.go → apis/common/v1/managednode_types.go
View file
Open in desktop
File renamed without changes.
0 api/v1/zz_generated.deepcopy.go → apis/common/v1/zz_generated.deepcopy.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions controllers/common.go → controllers/common/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package controllers
package common

import (
"context"
"fmt"
"os"

commonv1 "github.com/zachfi/nodemanager/api/v1"
commonv1 "github.com/zachfi/nodemanager/apis/common/v1"

"github.com/go-logr/logr"
"github.com/pkg/errors"
Expand Down
4 changes: 2 additions & 2 deletions controllers/configset_controller.go → controllers/common/configset_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package controllers
package common

import (
"bytes"
Expand All @@ -37,7 +37,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/log"

commonv1 "github.com/zachfi/nodemanager/api/v1"
commonv1 "github.com/zachfi/nodemanager/apis/common/v1"

"github.com/zachfi/nodemanager/pkg/common"
)
Expand Down
2 changes: 1 addition & 1 deletion controllers/errors.go → controllers/common/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package controllers
package common

import "fmt"

Expand Down
4 changes: 2 additions & 2 deletions controllers/managednode_controller.go → controllers/common/managednode_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package controllers
package common

import (
"context"
Expand All @@ -29,7 +29,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/log"

commonv1 "github.com/zachfi/nodemanager/api/v1"
commonv1 "github.com/zachfi/nodemanager/apis/common/v1"
"github.com/zachfi/nodemanager/pkg/common"
)

Expand Down
6 changes: 3 additions & 3 deletions controllers/suite_test.go → controllers/common/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package controllers
package common

import (
"path/filepath"
Expand All @@ -31,7 +31,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

commonv1 "github.com/zachfi/nodemanager/api/v1"
commonv1 "github.com/zachfi/nodemanager/apis/common/v1"
//+kubebuilder:scaffold:imports
)

Expand All @@ -55,7 +55,7 @@ var _ = BeforeSuite(func() {

By("bootstrapping test environment")
testEnv = &envtest.Environment{
CRDDirectoryPaths: []string{filepath.Join("..", "config", "crd", "bases")},
CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")},
ErrorIfCRDPathMissing: true,
}

Expand Down
8 changes: 4 additions & 4 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import (

"go.opentelemetry.io/otel"

commonv1 "github.com/zachfi/nodemanager/api/v1"
"github.com/zachfi/nodemanager/controllers"
commonv1 "github.com/zachfi/nodemanager/apis/common/v1"
commoncontrollers "github.com/zachfi/nodemanager/controllers/common"

//+kubebuilder:scaffold:imports

Expand Down Expand Up @@ -132,15 +132,15 @@ func main() {
os.Exit(1)
}

if err = (&controllers.ConfigSetReconciler{
if err = (&commoncontrollers.ConfigSetReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Tracer: otel.Tracer("ConfigSet"),
}).SetupWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "ConfigSet")
os.Exit(1)
}
if err = (&controllers.ManagedNodeReconciler{
if err = (&commoncontrollers.ManagedNodeReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Tracer: otel.Tracer("ManagedNode"),
Expand Down