Skip to content

Commit

Permalink
Merge pull request #193 from flux-framework/fix-incorrect-go-mod
Browse files Browse the repository at this point in the history
very funny oversight that module is missing github.com!
  • Loading branch information
vsoch committed Jul 4, 2023
2 parents 30fb9bb + dbdfdf4 commit ef47268
Show file tree
Hide file tree
Showing 21 changed files with 27 additions and 24 deletions.
2 changes: 1 addition & 1 deletion controllers/core/core.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SPDX-License-Identifier: Apache-2.0
package core

import (
controllers "flux-framework/flux-operator/controllers/flux"
controllers "github.com/flux-framework/flux-operator/controllers/flux"

"k8s.io/client-go/rest"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down
2 changes: 1 addition & 1 deletion controllers/flux/certs.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"context"
"fmt"

api "flux-framework/flux-operator/api/v1alpha1"
api "github.com/flux-framework/flux-operator/api/v1alpha1"
)

// getCurveCert generates a pod to run a single command and get a curve certificate
Expand Down
2 changes: 1 addition & 1 deletion controllers/flux/containers.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

corev1 "k8s.io/api/core/v1"

api "flux-framework/flux-operator/api/v1alpha1"
api "github.com/flux-framework/flux-operator/api/v1alpha1"
)

// getContainers gets containers for a MiniCluster job or external service
Expand Down
4 changes: 2 additions & 2 deletions controllers/flux/events.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ package controllers
// 3. (Optionally) the Reconciler Client can be inherited directly

import (
jobctrl "flux-framework/flux-operator/pkg/job"
jobctrl "github.com/flux-framework/flux-operator/pkg/job"

api "flux-framework/flux-operator/api/v1alpha1"
api "github.com/flux-framework/flux-operator/api/v1alpha1"

"k8s.io/klog/v2"
"sigs.k8s.io/controller-runtime/pkg/event"
Expand Down
2 changes: 1 addition & 1 deletion controllers/flux/extra.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

api "flux-framework/flux-operator/api/v1alpha1"
api "github.com/flux-framework/flux-operator/api/v1alpha1"
)

// Use a global variable for now to quickly return when broker ready
Expand Down
2 changes: 1 addition & 1 deletion controllers/flux/job.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
ctrl "sigs.k8s.io/controller-runtime"

api "flux-framework/flux-operator/api/v1alpha1"
api "github.com/flux-framework/flux-operator/api/v1alpha1"
)

// newMiniCluster is used to create the MiniCluster Job
Expand Down
3 changes: 2 additions & 1 deletion controllers/flux/labels.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ package controllers
import (
"context"
"encoding/json"
api "flux-framework/flux-operator/api/v1alpha1"
"fmt"
"strings"

api "github.com/flux-framework/flux-operator/api/v1alpha1"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/kubernetes"
Expand Down
4 changes: 2 additions & 2 deletions controllers/flux/minicluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"strings"
"text/template"

jobctrl "flux-framework/flux-operator/pkg/job"
jobctrl "github.com/flux-framework/flux-operator/pkg/job"

"github.com/google/uuid"
batchv1 "k8s.io/api/batch/v1"
Expand All @@ -29,7 +29,7 @@ import (
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/types"

api "flux-framework/flux-operator/api/v1alpha1"
api "github.com/flux-framework/flux-operator/api/v1alpha1"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion controllers/flux/minicluster_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

"k8s.io/apimachinery/pkg/api/errors"

api "flux-framework/flux-operator/api/v1alpha1"
api "github.com/flux-framework/flux-operator/api/v1alpha1"
)

// This interface allows us to define a NotifyMiniClusterUpdate function
Expand Down
2 changes: 1 addition & 1 deletion controllers/flux/pods.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/types"

api "flux-framework/flux-operator/api/v1alpha1"
api "github.com/flux-framework/flux-operator/api/v1alpha1"
)

// Get labels for any pod in the cluster
Expand Down
3 changes: 2 additions & 1 deletion controllers/flux/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ SPDX-License-Identifier: Apache-2.0
package controllers

import (
api "flux-framework/flux-operator/api/v1alpha1"
"fmt"

api "github.com/flux-framework/flux-operator/api/v1alpha1"

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/util/intstr"
Expand Down
2 changes: 1 addition & 1 deletion controllers/flux/scale.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

api "flux-framework/flux-operator/api/v1alpha1"
api "github.com/flux-framework/flux-operator/api/v1alpha1"
)

// addScaleSelector populates the fields the horizontal auto scaler needs.
Expand Down
2 changes: 1 addition & 1 deletion controllers/flux/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/types"

api "flux-framework/flux-operator/api/v1alpha1"
api "github.com/flux-framework/flux-operator/api/v1alpha1"
)

// exposeService will expose services - one for the port 5000 forward, and the other for job networking (headless)
Expand Down
2 changes: 1 addition & 1 deletion controllers/flux/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ package controllers
import (
corev1 "k8s.io/api/core/v1"

api "flux-framework/flux-operator/api/v1alpha1"
api "github.com/flux-framework/flux-operator/api/v1alpha1"
)

// createContainerLifecycle adds lifecycle commands to help with moving cluster state
Expand Down
2 changes: 1 addition & 1 deletion controllers/flux/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

mydomainv1alpha1 "flux-framework/flux-operator/api/v1alpha1"
mydomainv1alpha1 "github.com/flux-framework/flux-operator/api/v1alpha1"
//+kubebuilder:scaffold:imports
)

Expand Down
2 changes: 1 addition & 1 deletion controllers/flux/templates.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SPDX-License-Identifier: Apache-2.0
package controllers

import (
api "flux-framework/flux-operator/api/v1alpha1"
api "github.com/flux-framework/flux-operator/api/v1alpha1"

_ "embed"
)
Expand Down
3 changes: 2 additions & 1 deletion controllers/flux/volumes.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ package controllers

import (
"context"
api "flux-framework/flux-operator/api/v1alpha1"
"fmt"
"path"

api "github.com/flux-framework/flux-operator/api/v1alpha1"

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/resource"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module flux-framework/flux-operator
module github.com/flux-framework/flux-operator

go 1.18

Expand Down
2 changes: 1 addition & 1 deletion hack/python-sdk/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"k8s.io/kube-openapi/pkg/common"
"k8s.io/kube-openapi/pkg/validation/spec"

api "flux-framework/flux-operator/api/v1alpha1"
api "github.com/flux-framework/flux-operator/api/v1alpha1"
)

// Generate OpenAPI spec definitions for MPIJob Resource
Expand Down
4 changes: 2 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

api "flux-framework/flux-operator/api/v1alpha1"
api "github.com/flux-framework/flux-operator/api/v1alpha1"

"flux-framework/flux-operator/controllers/core"
"github.com/flux-framework/flux-operator/controllers/core"
//+kubebuilder:scaffold:imports
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/job/job.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SPDX-License-Identifier: Apache-2.0
package job

import (
api "flux-framework/flux-operator/api/v1alpha1"
api "github.com/flux-framework/flux-operator/api/v1alpha1"

batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
Expand Down

0 comments on commit ef47268

Please sign in to comment.