Skip to content
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.

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

Depre Bytebase and imagehub. #4273

Merged
merged 6 commits into from
Nov 8, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/controllers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ jobs:
- { name: terminal, path: terminal }
- { name: account, path: account }
- { name: app, path: app }
- { name: db-bytebase, path: db/bytebase }
- { name: db-adminer, path: db/adminer }
- { name: license, path: license }
- { name: job-init, path: job/init }
Expand Down Expand Up @@ -196,7 +195,6 @@ jobs:
- { name: terminal, path: terminal }
- { name: account, path: account }
- { name: app, path: app }
- { name: db-bytebase, path: db/bytebase }
- { name: db-adminer, path: db/adminer }
- { name: license, path: license }
- { name: job-init, path: job/init }
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ jobs:
providers/template,
providers/adminer,
providers/applaunchpad,
providers/bytebase,
providers/imagehub,
providers/terminal,
providers/dbprovider,
Expand Down Expand Up @@ -158,7 +157,6 @@ jobs:
providers/template,
providers/adminer,
providers/applaunchpad,
providers/bytebase,
providers/imagehub,
providers/terminal,
providers/dbprovider,
Expand Down
7 changes: 3 additions & 4 deletions frontend/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ buildTargets := \
desktop \
providers/terminal \
providers/adminer \
providers/bytebase \
providers/costcenter \
providers/dbprovider \
providers/applaunchpad \
Expand Down Expand Up @@ -60,12 +59,12 @@ image-prebuild: pnpm-lock.yaml
docker build --platform=linux/amd64 --target deps . -t $(imageOwner)sealos-deps:dev

image-build-providers/%: image-prebuild
docker build --platform=linux/amd64 -t $(imageOwner)sealos-$*:$(imageTag) --build-arg path=providers/$* --build-arg name=$* .
docker build --platform=linux/amd64 -t $(imageOwner)sealos-$*:$(imageTag) --build-arg path=providers/$* --build-arg name=$* .
image-build-%: image-prebuild
docker build --platform=linux/amd64 -t $(imageOwner)sealos-$*:$(imageTag) --build-arg path=$* --build-arg name=$* .
docker build --platform=linux/amd64 -t $(imageOwner)sealos-$*:$(imageTag) --build-arg path=$* --build-arg name=$* .

image-push-providers/%: image-build-providers/%
docker push $(imageOwner)sealos-$*:$(imageTag)
docker push $(imageOwner)sealos-$*:$(imageTag)
image-push-%: image-build-%
docker push $(imageOwner)sealos-$*:$(imageTag)
# Default target to run all builds.
67 changes: 0 additions & 67 deletions frontend/pnpm-lock.yaml

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

2 changes: 1 addition & 1 deletion go.work
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use (
./controllers/admission
./controllers/app
./controllers/db/adminer
./controllers/db/bytebase
./controllers/terminal
./controllers/node
./controllers/user
Expand All @@ -21,6 +20,7 @@ use (
./staging/src/github.com/labring/lvscare
./staging/src/github.com/labring/controllers/imagehub
./staging/src/github.com/labring/controllers/cluster
./staging/src/github.com/labring/controllers/db/bytebase
./staging/src/github.com/labring/controllers/infra
./staging/src/github.com/labring/controllers/metering
./webhooks/whitelist
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ limitations under the License.
package v1

import (
"github.com/labring/sealos/controllers/db/bytebase/client/api"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"

"github.com/labring/sealos/controllers/db/bytebase/client/api"
)

// +kubebuilder:validation:Enum=nginx;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/log"

"github.com/go-logr/logr"

bbv1 "github.com/labring/sealos/controllers/db/bytebase/apis/bytebase/v1"
bbclient "github.com/labring/sealos/controllers/db/bytebase/client"
api "github.com/labring/sealos/controllers/db/bytebase/client/api"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ limitations under the License.
package bytebase

import (
bbv1 "github.com/labring/sealos/controllers/db/bytebase/apis/bytebase/v1"
networkingv1 "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

bbv1 "github.com/labring/sealos/controllers/db/bytebase/apis/bytebase/v1"
)

func (r *Reconciler) createNginxIngress(bytebase *bbv1.Bytebase, host string, snippet string) *networkingv1.Ingress {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@ import (
"context"
"fmt"

api "github.com/labring/sealos/controllers/db/bytebase/client/api"
corev1 "k8s.io/api/core/v1"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/log"

api "github.com/labring/sealos/controllers/db/bytebase/client/api"
)

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/jaevor/go-nanoid"
bbv1 "github.com/labring/sealos/controllers/db/bytebase/apis/bytebase/v1"
"k8s.io/apimachinery/pkg/api/resource"

bbv1 "github.com/labring/sealos/controllers/db/bytebase/apis/bytebase/v1"

"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# sealos bytebase

@Note: Deprecated, If one want to build bytebase frontend, please copy this dir into `frontend/providers/bytebase`, to have sealos workspace support.

## directory

```
Expand Down