Skip to content

Commit

Permalink
update blueprint-operator package import to latest (#90)
Browse files Browse the repository at this point in the history
  • Loading branch information
RaunakShah authored Oct 9, 2024
1 parent cf597a2 commit 8162720
Show file tree
Hide file tree
Showing 22 changed files with 302 additions and 56 deletions.
2 changes: 1 addition & 1 deletion boundlessclientset/addon.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"

"github.com/mirantiscontainers/boundless-operator/api/v1alpha1"
"github.com/mirantiscontainers/blueprint-operator/api/v1alpha1"
)

// AddonInterface is an interface containing the operations that can be done on Addons
Expand Down
2 changes: 1 addition & 1 deletion boundlessclientset/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"

"github.com/mirantiscontainers/boundless-operator/api/v1alpha1"
"github.com/mirantiscontainers/blueprint-operator/api/v1alpha1"
)

// TODO: generate the client code instead or use a dynamic client
Expand Down
2 changes: 1 addition & 1 deletion boundlessclientset/manifest.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"

"github.com/mirantiscontainers/boundless-operator/api/v1alpha1"
"github.com/mirantiscontainers/blueprint-operator/api/v1alpha1"
)

// ManifestInterface is an interface containing the operations that can be done on Manifests
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/k0sproject/version v0.6.0
github.com/k3s-io/helm-controller v0.15.4
github.com/mattn/go-colorable v0.1.13
github.com/mirantiscontainers/boundless-operator v1.0.6
github.com/mirantiscontainers/blueprint-operator v1.0.15
github.com/onsi/ginkgo/v2 v2.20.1
github.com/onsi/gomega v1.34.2
github.com/rs/zerolog v1.31.0
Expand Down Expand Up @@ -93,7 +93,7 @@ require (
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.31.0 // indirect
k8s.io/apiextensions-apiserver v0.31.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/mirantiscontainers/boundless-operator v1.0.6 h1:iFdhsk0Wh+JaGjVT/Oi+p4RfeoPsfiHvuaZKsFXVvcY=
github.com/mirantiscontainers/boundless-operator v1.0.6/go.mod h1:KrcrjhYU4kioP8ayBPlY/ku/1UygdaP8fox7ksBrmaY=
github.com/mirantiscontainers/blueprint-operator v1.0.15 h1:S1Ps3QjX/UxcdhB1fKzAlIiHCkG9NPHYM/0OG5XCGwY=
github.com/mirantiscontainers/blueprint-operator v1.0.15/go.mod h1:NmKyma63bgO/+JiGjyDtwAmi1UfEC8I8w+tHpi8DkU4=
github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
Expand Down Expand Up @@ -297,8 +297,8 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU=
k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI=
k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk=
k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk=
k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/N6E40=
k8s.io/apiextensions-apiserver v0.31.1/go.mod h1:tWMPR3sgW+jsl2xm9v7lAyRF1rYEK71i9G5dRtkknoQ=
k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U=
k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
k8s.io/cli-runtime v0.31.1 h1:/ZmKhmZ6hNqDM+yf9s3Y4KEYakNXUn5sod2LWGGwCuk=
Expand Down
2 changes: 1 addition & 1 deletion pkg/commands/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"strings"

"github.com/mirantiscontainers/boundless-operator/api/v1alpha1"
"github.com/mirantiscontainers/blueprint-operator/api/v1alpha1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
Expand Down
2 changes: 1 addition & 1 deletion pkg/components/components.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
k8sYaml "k8s.io/apimachinery/pkg/util/yaml"

"github.com/mirantiscontainers/boundless-operator/api/v1alpha1"
"github.com/mirantiscontainers/blueprint-operator/api/v1alpha1"

"github.com/mirantiscontainers/boundless-cli/pkg/constants"
"github.com/mirantiscontainers/boundless-cli/pkg/k8s"
Expand Down
3 changes: 0 additions & 3 deletions pkg/constants/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ package constants
import "time"

const (
// ManifestUrlLatest is the URL of the latest manifest YAML for the Blueprint Operator
ManifestUrlLatest = "https://raw.githubusercontent.com/mirantiscontainers/boundless/main/deploy/static/boundless-operator.yaml"

// NamespaceBlueprint is the system namespace where the Blueprint Operator and its components are installed
NamespaceBlueprint = "blueprint-system"

Expand Down
4 changes: 2 additions & 2 deletions pkg/k8s/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"k8s.io/client-go/rest"

operatorv1alpha1 "github.com/mirantiscontainers/boundless-operator/api/v1alpha1"
operatorv1alpha1 "github.com/mirantiscontainers/blueprint-operator/api/v1alpha1"
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
)
Expand All @@ -14,7 +14,7 @@ import (
func CreateOrUpdate(config *KubeConfig, obj client.Object) error {
// TODO (ranyodh): This is currently using in-cluster client. We should switch to:
// - either a dynamic client,
// - or generate a client in the `boundless-operator` to be used here
// - or generate a client in the `blueprint-operator` to be used here
scheme := runtime.NewScheme()
_ = operatorv1alpha1.AddToScheme(scheme)

Expand Down
2 changes: 1 addition & 1 deletion pkg/k8s/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"k8s.io/client-go/rest"

operatorv1alpha1 "github.com/mirantiscontainers/boundless-operator/api/v1alpha1"
operatorv1alpha1 "github.com/mirantiscontainers/blueprint-operator/api/v1alpha1"
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/types/blueprint.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"

"github.com/k0sproject/dig"
"github.com/mirantiscontainers/boundless-operator/api/v1alpha1"
"github.com/mirantiscontainers/blueprint-operator/api/v1alpha1"
"k8s.io/apimachinery/pkg/util/intstr"

"github.com/mirantiscontainers/boundless-cli/pkg/constants"
Expand Down
2 changes: 1 addition & 1 deletion pkg/types/cert_management.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package types
import (
"fmt"

"github.com/mirantiscontainers/boundless-operator/api/v1alpha1"
"github.com/mirantiscontainers/blueprint-operator/api/v1alpha1"
)

// CertManagement defines the desired state of cert-manager resources
Expand Down
201 changes: 201 additions & 0 deletions vendor/github.com/mirantiscontainers/blueprint-operator/LICENSE

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

Loading

0 comments on commit 8162720

Please sign in to comment.