Rename go module name and its usage

This commit is contained in:
Akshay Gaikwad
2022-06-08 15:44:19 +05:30
parent b4287fe73d
commit b67fcacf87
218 changed files with 594 additions and 594 deletions

View File

@@ -62,7 +62,7 @@ jobs:
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
- name: Extract metadata (tags, labels) for Docker (rcloud-base-init) - name: Extract metadata (tags, labels) for Docker (paralus-init)
id: meta-init id: meta-init
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
with: with:
@@ -73,7 +73,7 @@ jobs:
type=ref,event=pr type=ref,event=pr
type=sha type=sha
- name: Build and push Docker image (rcloud-base-init) - name: Build and push Docker image (paralus-init)
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with: with:
context: . context: .
@@ -82,7 +82,7 @@ jobs:
tags: ${{ steps.meta-init.outputs.tags }} tags: ${{ steps.meta-init.outputs.tags }}
labels: ${{ steps.meta-init.outputs.labels }} labels: ${{ steps.meta-init.outputs.labels }}
- name: Extract metadata (tags, labels) for Docker (rcloud-base-sync) - name: Extract metadata (tags, labels) for Docker (kratos-sync)
id: meta-sync id: meta-sync
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
with: with:
@@ -93,7 +93,7 @@ jobs:
type=ref,event=pr type=ref,event=pr
type=sha type=sha
- name: Build and push Docker image (rcloud-base-sync) - name: Build and push Docker image (kratos-sync)
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
with: with:
context: . context: .

View File

@@ -8,12 +8,12 @@ COPY go.sum .
RUN go mod download RUN go mod download
COPY . . COPY . .
RUN go build github.com/RafayLabs/rcloud-base RUN go build github.com/paralus/paralus
FROM alpine:latest as runtime FROM alpine:latest as runtime
LABEL description="Run container" LABEL description="Run container"
COPY --from=build /build/rcloud-base /usr/bin/rcloud-base COPY --from=build /build/paralus /usr/bin/paralus
WORKDIR /usr/bin WORKDIR /usr/bin
# Copying data for running migrations # Copying data for running migrations
# TODO: Support rcloud-base binary to run migrations # TODO: Support rcloud-base binary to run migrations

View File

@@ -4,12 +4,12 @@ LABEL description="Build container"
ENV CGO_ENABLED 0 ENV CGO_ENABLED 0
COPY . /build COPY . /build
WORKDIR /build WORKDIR /build
RUN go build -o rcloud-init scripts/initialize/main.go RUN go build -o paralus-init scripts/initialize/main.go
FROM alpine:latest as runtime FROM alpine:latest as runtime
LABEL description="Run container" LABEL description="Run container"
WORKDIR /usr/bin WORKDIR /usr/bin
COPY --from=build /build/rcloud-init /usr/bin/rcloud-init COPY --from=build /build/paralus-init /usr/bin/paralus-init
COPY --from=build /build/scripts/initialize/ /usr/bin/scripts/initialize/ COPY --from=build /build/scripts/initialize/ /usr/bin/scripts/initialize/
ENTRYPOINT ["./rcloud-init"] ENTRYPOINT ["./paralus-init"]

View File

@@ -1,6 +1,6 @@
.PHONY: tidy .PHONY: tidy
tidy: tidy:
GOPRIVATE=github.com/RafayLabs/* go mod tidy GOPRIVATE=github.com/paralus/* go mod tidy
.PHONY: vendor .PHONY: vendor
vendor: vendor:
go mod vendor go mod vendor
@@ -16,13 +16,13 @@ gen-proto:
.PHONY: test .PHONY: test
test: test:
go test ./... go test ./...
.PHONY: check .PHONY: check
check: check:
go fmt ./... go fmt ./...
go vet ./... go vet ./...
.PHONY: clean .PHONY: clean
clean: clean:
rm -rf ./**/gen rm -rf ./**/gen

View File

@@ -3,7 +3,7 @@ package main
import ( import (
"time" "time"
"github.com/RafayLabs/rcloud-base/_kratos/development/pkg" "github.com/paralus/paralus/_kratos/development/pkg"
ory "github.com/ory/kratos-client-go" ory "github.com/ory/kratos-client-go"
) )

View File

@@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" "github.com/paralus/paralus/api/def/clients/sentry/models"
) )
// AuditInformationLookupClusterReader is a Reader for the AuditInformationLookupCluster structure. // AuditInformationLookupClusterReader is a Reader for the AuditInformationLookupCluster structure.

View File

@@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" "github.com/paralus/paralus/api/def/clients/sentry/models"
) )
// AuditInformationLookupUserReader is a Reader for the AuditInformationLookupUser structure. // AuditInformationLookupUserReader is a Reader for the AuditInformationLookupUser structure.

View File

@@ -15,7 +15,7 @@ import (
cr "github.com/go-openapi/runtime/client" cr "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" "github.com/paralus/paralus/api/def/clients/sentry/models"
) )
// NewBootstrapCreateBootstrapAgentParams creates a new BootstrapCreateBootstrapAgentParams object, // NewBootstrapCreateBootstrapAgentParams creates a new BootstrapCreateBootstrapAgentParams object,

View File

@@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" "github.com/paralus/paralus/api/def/clients/sentry/models"
) )
// BootstrapCreateBootstrapAgentReader is a Reader for the BootstrapCreateBootstrapAgent structure. // BootstrapCreateBootstrapAgentReader is a Reader for the BootstrapCreateBootstrapAgent structure.

View File

@@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" "github.com/paralus/paralus/api/def/clients/sentry/models"
) )
// BootstrapDeleteBootstrapAgentReader is a Reader for the BootstrapDeleteBootstrapAgent structure. // BootstrapDeleteBootstrapAgentReader is a Reader for the BootstrapDeleteBootstrapAgent structure.

View File

@@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" "github.com/paralus/paralus/api/def/clients/sentry/models"
) )
// BootstrapGetBootstrapAgentConfigReader is a Reader for the BootstrapGetBootstrapAgentConfig structure. // BootstrapGetBootstrapAgentConfigReader is a Reader for the BootstrapGetBootstrapAgentConfig structure.

View File

@@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" "github.com/paralus/paralus/api/def/clients/sentry/models"
) )
// BootstrapGetBootstrapAgentReader is a Reader for the BootstrapGetBootstrapAgent structure. // BootstrapGetBootstrapAgentReader is a Reader for the BootstrapGetBootstrapAgent structure.

View File

@@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" "github.com/paralus/paralus/api/def/clients/sentry/models"
) )
// BootstrapGetBootstrapAgentTemplateReader is a Reader for the BootstrapGetBootstrapAgentTemplate structure. // BootstrapGetBootstrapAgentTemplateReader is a Reader for the BootstrapGetBootstrapAgentTemplate structure.

View File

@@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" "github.com/paralus/paralus/api/def/clients/sentry/models"
) )
// BootstrapGetBootstrapAgentTemplatesReader is a Reader for the BootstrapGetBootstrapAgentTemplates structure. // BootstrapGetBootstrapAgentTemplatesReader is a Reader for the BootstrapGetBootstrapAgentTemplates structure.

View File

@@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" "github.com/paralus/paralus/api/def/clients/sentry/models"
) )
// BootstrapGetBootstrapAgentsReader is a Reader for the BootstrapGetBootstrapAgents structure. // BootstrapGetBootstrapAgentsReader is a Reader for the BootstrapGetBootstrapAgents structure.

View File

@@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" "github.com/paralus/paralus/api/def/clients/sentry/models"
) )
// BootstrapGetBootstrapInfraReader is a Reader for the BootstrapGetBootstrapInfra structure. // BootstrapGetBootstrapInfraReader is a Reader for the BootstrapGetBootstrapInfra structure.

View File

@@ -15,7 +15,7 @@ import (
cr "github.com/go-openapi/runtime/client" cr "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" "github.com/paralus/paralus/api/def/clients/sentry/models"
) )
// NewBootstrapPatchBootstrapAgentTemplateParams creates a new BootstrapPatchBootstrapAgentTemplateParams object, // NewBootstrapPatchBootstrapAgentTemplateParams creates a new BootstrapPatchBootstrapAgentTemplateParams object,

View File

@@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" "github.com/paralus/paralus/api/def/clients/sentry/models"
) )
// BootstrapPatchBootstrapAgentTemplateReader is a Reader for the BootstrapPatchBootstrapAgentTemplate structure. // BootstrapPatchBootstrapAgentTemplateReader is a Reader for the BootstrapPatchBootstrapAgentTemplate structure.

View File

@@ -15,7 +15,7 @@ import (
cr "github.com/go-openapi/runtime/client" cr "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" "github.com/paralus/paralus/api/def/clients/sentry/models"
) )
// NewBootstrapPatchBootstrapInfraParams creates a new BootstrapPatchBootstrapInfraParams object, // NewBootstrapPatchBootstrapInfraParams creates a new BootstrapPatchBootstrapInfraParams object,

View File

@@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" "github.com/paralus/paralus/api/def/clients/sentry/models"
) )
// BootstrapPatchBootstrapInfraReader is a Reader for the BootstrapPatchBootstrapInfra structure. // BootstrapPatchBootstrapInfraReader is a Reader for the BootstrapPatchBootstrapInfra structure.

View File

@@ -14,7 +14,7 @@ import (
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/go-openapi/swag" "github.com/go-openapi/swag"
"github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" "github.com/paralus/paralus/api/def/clients/sentry/models"
) )
// BootstrapRegisterBootstrapAgentReader is a Reader for the BootstrapRegisterBootstrapAgent structure. // BootstrapRegisterBootstrapAgentReader is a Reader for the BootstrapRegisterBootstrapAgent structure.

View File

@@ -15,7 +15,7 @@ import (
cr "github.com/go-openapi/runtime/client" cr "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" "github.com/paralus/paralus/api/def/clients/sentry/models"
) )
// NewBootstrapUpdateBootstrapAgentParams creates a new BootstrapUpdateBootstrapAgentParams object, // NewBootstrapUpdateBootstrapAgentParams creates a new BootstrapUpdateBootstrapAgentParams object,

View File

@@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" "github.com/paralus/paralus/api/def/clients/sentry/models"
) )
// BootstrapUpdateBootstrapAgentReader is a Reader for the BootstrapUpdateBootstrapAgent structure. // BootstrapUpdateBootstrapAgentReader is a Reader for the BootstrapUpdateBootstrapAgent structure.

View File

@@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" "github.com/paralus/paralus/api/def/clients/sentry/models"
) )
// ClusterAuthorizationGetUserAuthorizationReader is a Reader for the ClusterAuthorizationGetUserAuthorization structure. // ClusterAuthorizationGetUserAuthorizationReader is a Reader for the ClusterAuthorizationGetUserAuthorization structure.

View File

@@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" "github.com/paralus/paralus/api/def/clients/sentry/models"
) )
// KubectlClusterSettingsGetKubectlClusterSettingsReader is a Reader for the KubectlClusterSettingsGetKubectlClusterSettings structure. // KubectlClusterSettingsGetKubectlClusterSettingsReader is a Reader for the KubectlClusterSettingsGetKubectlClusterSettings structure.

View File

@@ -15,7 +15,7 @@ import (
cr "github.com/go-openapi/runtime/client" cr "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" "github.com/paralus/paralus/api/def/clients/sentry/models"
) )
// NewKubectlClusterSettingsUpdateKubectlClusterSettingsParams creates a new KubectlClusterSettingsUpdateKubectlClusterSettingsParams object, // NewKubectlClusterSettingsUpdateKubectlClusterSettingsParams creates a new KubectlClusterSettingsUpdateKubectlClusterSettingsParams object,

View File

@@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/RafayLabs/rcloud-base/api/def/clients/sentry/models" "github.com/paralus/paralus/api/def/clients/sentry/models"
) )
// KubectlClusterSettingsUpdateKubectlClusterSettingsReader is a Reader for the KubectlClusterSettingsUpdateKubectlClusterSettings structure. // KubectlClusterSettingsUpdateKubectlClusterSettingsReader is a Reader for the KubectlClusterSettingsUpdateKubectlClusterSettings structure.

View File

@@ -10,7 +10,7 @@ import (
httptransport "github.com/go-openapi/runtime/client" httptransport "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/RafayLabs/rcloud-base/api/def/clients/sentry/client/bootstrap" "github.com/paralus/paralus/api/def/clients/sentry/client/bootstrap"
) )
// Default sentry bootstrap service HTTP client. // Default sentry bootstrap service HTTP client.

View File

@@ -2,12 +2,12 @@ version: v1
managed: managed:
enabled: true enabled: true
go_package_prefix: go_package_prefix:
default: github.com/RafayLabs/rcloud-base default: github.com/paralus/paralus
except: except:
- buf.build/googleapis/googleapis - buf.build/googleapis/googleapis
- buf.build/grpc-ecosystem/grpc-gateway - buf.build/grpc-ecosystem/grpc-gateway
- buf.build/gogo/protobuf - buf.build/gogo/protobuf
- buf.build/rafay/k8s - buf.build/paralus/k8s
plugins: plugins:
- name: go - name: go
out: . out: .

View File

@@ -5,20 +5,20 @@ deps:
owner: googleapis owner: googleapis
repository: googleapis repository: googleapis
branch: main branch: main
commit: bcdcd1dee95c4277b2edbae6c21332a2 commit: c8fa45ea6c1248769dbbcb53e49d8ee4
digest: b1-QAdxfRqCgCBZPaGaRiY8Ms_jKvwZrONQXfaOSvL2lB8= digest: b1-_uLy2wpZAWZAxd2_vn_b7Mnf6hg1G7ib5M1flA-oLs4=
create_time: 2022-02-26T15:04:31.725057Z create_time: 2022-06-07T15:06:56.944952Z
- remote: buf.build - remote: buf.build
owner: grpc-ecosystem owner: grpc-ecosystem
repository: grpc-gateway repository: grpc-gateway
branch: main branch: main
commit: ff83506eb9cc4cf8972f49ce87e6ed3e commit: 00116f302b12478b85deb33b734e026c
digest: b1-iLPHgLaoeWWinMiXXqPnxqE4BThtY3eSbswVGh9GOGI= digest: b1-iUfkmqGjUB1hlbTkiPKUUeVcFd9pAJ_qRn2oJ4nYpls=
create_time: 2021-10-23T16:26:52.283938Z create_time: 2022-05-23T22:50:17.0393Z
- remote: buf.build - remote: buf.build
owner: rafay owner: paralus
repository: k8s repository: k8s
branch: main branch: main
commit: b96f66eb56bc4f279431f4b2187a2fee commit: 6d45aa151ee44c47933787fb5fdebc71
digest: b1-U7KVig2Fgpf6eRczjqxrYFa3p6HLqgtEy5QJAOVB8BI= digest: b1-U7KVig2Fgpf6eRczjqxrYFa3p6HLqgtEy5QJAOVB8BI=
create_time: 2022-02-09T08:44:35.431677Z create_time: 2022-06-07T13:30:44.2613Z

View File

@@ -1,9 +1,9 @@
version: v1 version: v1
name: buf.build/rafay/common name: buf.build/paralus/paralus
deps: deps:
- buf.build/googleapis/googleapis - buf.build/googleapis/googleapis
- buf.build/grpc-ecosystem/grpc-gateway - buf.build/grpc-ecosystem/grpc-gateway
- buf.build/rafay/k8s - buf.build/paralus/k8s
breaking: breaking:
use: use:
- FILE - FILE

View File

@@ -3,11 +3,11 @@ version: '3.7'
services: services:
postgresd: postgresd:
image: postgres:13.4 image: postgres:13.4
container_name: rcloud_postgres_13 container_name: paralus_postgres_13
ports: ports:
- "$DB_PORT:$DB_PORT" - "$DB_PORT:$DB_PORT"
volumes: volumes:
- rcloud_db_data:/var/lib/postgresql/data - paralus_db_data:/var/lib/postgresql/data
environment: environment:
POSTGRES_USER: $DB_USER POSTGRES_USER: $DB_USER
POSTGRES_DB: $DB_NAME POSTGRES_DB: $DB_NAME
@@ -15,11 +15,11 @@ services:
elasticsearch: elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:8.0.0 image: docker.elastic.co/elasticsearch/elasticsearch:8.0.0
container_name: rcloud_elasticsearch_8 container_name: paralus_elasticsearch_8
ports: ports:
- '${ES_PORT:-9200}:9200' - '${ES_PORT:-9200}:9200'
volumes: volumes:
- rcloud_es_data:/usr/share/elasticsearch/data - paralus_es_data:/usr/share/elasticsearch/data
environment: environment:
- discovery.type=single-node - discovery.type=single-node
- xpack.security.enabled=false # disable auth for local dev - xpack.security.enabled=false # disable auth for local dev
@@ -70,5 +70,5 @@ services:
- '4437:4437' - '4437:4437'
volumes: volumes:
rcloud_db_data: paralus_db_data:
rcloud_es_data: paralus_es_data:

2
go.mod
View File

@@ -1,4 +1,4 @@
module github.com/RafayLabs/rcloud-base module github.com/paralus/paralus
go 1.17 go 1.17

View File

@@ -8,12 +8,12 @@ import (
"regexp" "regexp"
"strings" "strings"
"github.com/RafayLabs/rcloud-base/internal/cluster/constants" "github.com/paralus/paralus/internal/cluster/constants"
"github.com/RafayLabs/rcloud-base/internal/cluster/fixtures" "github.com/paralus/paralus/internal/cluster/fixtures"
"github.com/RafayLabs/rcloud-base/internal/cluster/util" "github.com/paralus/paralus/internal/cluster/util"
"github.com/RafayLabs/rcloud-base/pkg/common" "github.com/paralus/paralus/pkg/common"
"github.com/RafayLabs/rcloud-base/pkg/log" "github.com/paralus/paralus/pkg/log"
infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" infrav3 "github.com/paralus/paralus/proto/types/infrapb/v3"
) )
var _log = log.GetLogger() var _log = log.GetLogger()

View File

@@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"strings" "strings"
infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" infrav3 "github.com/paralus/paralus/proto/types/infrapb/v3"
) )
const ( const (

View File

@@ -3,10 +3,10 @@ package cluster
import ( import (
"time" "time"
"github.com/RafayLabs/rcloud-base/internal/cluster/constants" "github.com/paralus/paralus/internal/cluster/constants"
commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" commonv3 "github.com/paralus/paralus/proto/types/commonpb/v3"
infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" infrav3 "github.com/paralus/paralus/proto/types/infrapb/v3"
"github.com/RafayLabs/rcloud-base/proto/types/scheduler" "github.com/paralus/paralus/proto/types/scheduler"
"google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/timestamppb"
) )

View File

@@ -3,7 +3,7 @@ package constants
import ( import (
"regexp" "regexp"
commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" commonv3 "github.com/paralus/paralus/proto/types/commonpb/v3"
) )
type ClusterGeneration int type ClusterGeneration int

View File

@@ -5,10 +5,10 @@ import (
"strings" "strings"
"time" "time"
"github.com/RafayLabs/rcloud-base/internal/cluster/constants" "github.com/paralus/paralus/internal/cluster/constants"
"github.com/RafayLabs/rcloud-base/internal/dao" "github.com/paralus/paralus/internal/dao"
"github.com/RafayLabs/rcloud-base/internal/models" "github.com/paralus/paralus/internal/models"
commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" commonv3 "github.com/paralus/paralus/proto/types/commonpb/v3"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/uptrace/bun" "github.com/uptrace/bun"
) )

View File

@@ -3,9 +3,9 @@ package dao
import ( import (
"context" "context"
"github.com/RafayLabs/rcloud-base/internal/dao" "github.com/paralus/paralus/internal/dao"
"github.com/RafayLabs/rcloud-base/internal/models" "github.com/paralus/paralus/internal/models"
"github.com/RafayLabs/rcloud-base/pkg/log" "github.com/paralus/paralus/pkg/log"
"github.com/uptrace/bun" "github.com/uptrace/bun"
) )

View File

@@ -4,9 +4,9 @@ import (
"context" "context"
"errors" "errors"
"github.com/RafayLabs/rcloud-base/internal/dao" "github.com/paralus/paralus/internal/dao"
"github.com/RafayLabs/rcloud-base/internal/models" "github.com/paralus/paralus/internal/models"
infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" infrav3 "github.com/paralus/paralus/proto/types/infrapb/v3"
"github.com/rs/xid" "github.com/rs/xid"
"github.com/uptrace/bun" "github.com/uptrace/bun"
) )

View File

@@ -3,10 +3,10 @@ package dao
import ( import (
"context" "context"
"github.com/RafayLabs/rcloud-base/internal/dao" "github.com/paralus/paralus/internal/dao"
"github.com/RafayLabs/rcloud-base/internal/models" "github.com/paralus/paralus/internal/models"
"github.com/RafayLabs/rcloud-base/pkg/query" "github.com/paralus/paralus/pkg/query"
commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" commonv3 "github.com/paralus/paralus/proto/types/commonpb/v3"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/uptrace/bun" "github.com/uptrace/bun"
) )

View File

@@ -5,7 +5,7 @@ import (
"regexp" "regexp"
"strings" "strings"
"github.com/RafayLabs/rcloud-base/internal/cluster/constants" "github.com/paralus/paralus/internal/cluster/constants"
) )
func IsValidKubernetesLabelNameValueRegex(input string) bool { func IsValidKubernetesLabelNameValueRegex(input string) bool {

View File

@@ -6,11 +6,11 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/RafayLabs/rcloud-base/internal/models" "github.com/paralus/paralus/internal/models"
"github.com/RafayLabs/rcloud-base/internal/random" "github.com/paralus/paralus/internal/random"
"github.com/RafayLabs/rcloud-base/pkg/query" "github.com/paralus/paralus/pkg/query"
commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" commonv3 "github.com/paralus/paralus/proto/types/commonpb/v3"
"github.com/RafayLabs/rcloud-base/proto/types/sentry" "github.com/paralus/paralus/proto/types/sentry"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/uptrace/bun" "github.com/uptrace/bun"
) )

View File

@@ -3,8 +3,8 @@ package dao
import ( import (
"context" "context"
"github.com/RafayLabs/rcloud-base/internal/models" "github.com/paralus/paralus/internal/models"
userv3 "github.com/RafayLabs/rcloud-base/proto/types/userpb/v3" userv3 "github.com/paralus/paralus/proto/types/userpb/v3"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/uptrace/bun" "github.com/uptrace/bun"
) )

View File

@@ -4,8 +4,8 @@ import (
"context" "context"
"time" "time"
"github.com/RafayLabs/rcloud-base/internal/models" "github.com/paralus/paralus/internal/models"
"github.com/RafayLabs/rcloud-base/proto/types/sentry" "github.com/paralus/paralus/proto/types/sentry"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/uptrace/bun" "github.com/uptrace/bun"
) )

View File

@@ -4,7 +4,7 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/RafayLabs/rcloud-base/internal/models" "github.com/paralus/paralus/internal/models"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/uptrace/bun" "github.com/uptrace/bun"
) )

View File

@@ -4,7 +4,7 @@ import (
"context" "context"
"database/sql" "database/sql"
"github.com/RafayLabs/rcloud-base/internal/models" "github.com/paralus/paralus/internal/models"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/uptrace/bun" "github.com/uptrace/bun"
) )

View File

@@ -3,7 +3,7 @@ package dao
import ( import (
"context" "context"
"github.com/RafayLabs/rcloud-base/internal/models" "github.com/paralus/paralus/internal/models"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/uptrace/bun" "github.com/uptrace/bun"
) )

View File

@@ -3,8 +3,8 @@ package dao
import ( import (
"context" "context"
"github.com/RafayLabs/rcloud-base/internal/models" "github.com/paralus/paralus/internal/models"
userv3 "github.com/RafayLabs/rcloud-base/proto/types/userpb/v3" userv3 "github.com/paralus/paralus/proto/types/userpb/v3"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/uptrace/bun" "github.com/uptrace/bun"
) )

View File

@@ -4,7 +4,7 @@ import (
"context" "context"
"strings" "strings"
"github.com/RafayLabs/rcloud-base/internal/models" "github.com/paralus/paralus/internal/models"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/uptrace/bun" "github.com/uptrace/bun"
) )

View File

@@ -4,8 +4,8 @@ import (
"context" "context"
"database/sql" "database/sql"
"github.com/RafayLabs/rcloud-base/internal/models" "github.com/paralus/paralus/internal/models"
userv3 "github.com/RafayLabs/rcloud-base/proto/types/userpb/v3" userv3 "github.com/paralus/paralus/proto/types/userpb/v3"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/uptrace/bun" "github.com/uptrace/bun"
) )

View File

@@ -9,14 +9,14 @@ import (
"crypto/x509/pkix" "crypto/x509/pkix"
"github.com/RafayLabs/rcloud-base/pkg/sentry/cryptoutil" "github.com/paralus/paralus/pkg/sentry/cryptoutil"
"github.com/RafayLabs/rcloud-base/pkg/service" "github.com/paralus/paralus/pkg/service"
"github.com/rs/xid" "github.com/rs/xid"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
"github.com/RafayLabs/rcloud-base/pkg/log" "github.com/paralus/paralus/pkg/log"
commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" commonv3 "github.com/paralus/paralus/proto/types/commonpb/v3"
sentry "github.com/RafayLabs/rcloud-base/proto/types/sentry" sentry "github.com/paralus/paralus/proto/types/sentry"
"github.com/shurcooL/httpfs/vfsutil" "github.com/shurcooL/httpfs/vfsutil"
) )

42
main.go
View File

@@ -12,27 +12,27 @@ import (
"sync" "sync"
"time" "time"
"github.com/RafayLabs/rcloud-base/internal/fixtures" "github.com/paralus/paralus/internal/fixtures"
providers "github.com/RafayLabs/rcloud-base/internal/provider/kratos" providers "github.com/paralus/paralus/internal/provider/kratos"
"github.com/RafayLabs/rcloud-base/pkg/audit" "github.com/paralus/paralus/pkg/audit"
authv3 "github.com/RafayLabs/rcloud-base/pkg/auth/v3" authv3 "github.com/paralus/paralus/pkg/auth/v3"
"github.com/RafayLabs/rcloud-base/pkg/common" "github.com/paralus/paralus/pkg/common"
"github.com/RafayLabs/rcloud-base/pkg/enforcer" "github.com/paralus/paralus/pkg/enforcer"
"github.com/RafayLabs/rcloud-base/pkg/gateway" "github.com/paralus/paralus/pkg/gateway"
"github.com/RafayLabs/rcloud-base/pkg/grpc" "github.com/paralus/paralus/pkg/grpc"
"github.com/RafayLabs/rcloud-base/pkg/log" "github.com/paralus/paralus/pkg/log"
"github.com/RafayLabs/rcloud-base/pkg/notify" "github.com/paralus/paralus/pkg/notify"
"github.com/RafayLabs/rcloud-base/pkg/reconcile" "github.com/paralus/paralus/pkg/reconcile"
"github.com/RafayLabs/rcloud-base/pkg/sentry/peering" "github.com/paralus/paralus/pkg/sentry/peering"
"github.com/RafayLabs/rcloud-base/pkg/service" "github.com/paralus/paralus/pkg/service"
auditrpc "github.com/RafayLabs/rcloud-base/proto/rpc/audit" auditrpc "github.com/paralus/paralus/proto/rpc/audit"
rolerpc "github.com/RafayLabs/rcloud-base/proto/rpc/role" rolerpc "github.com/paralus/paralus/proto/rpc/role"
schedulerrpc "github.com/RafayLabs/rcloud-base/proto/rpc/scheduler" schedulerrpc "github.com/paralus/paralus/proto/rpc/scheduler"
sentryrpc "github.com/RafayLabs/rcloud-base/proto/rpc/sentry" sentryrpc "github.com/paralus/paralus/proto/rpc/sentry"
systemrpc "github.com/RafayLabs/rcloud-base/proto/rpc/system" systemrpc "github.com/paralus/paralus/proto/rpc/system"
userrpc "github.com/RafayLabs/rcloud-base/proto/rpc/user" userrpc "github.com/paralus/paralus/proto/rpc/user"
authrpc "github.com/RafayLabs/rcloud-base/proto/rpc/v3" authrpc "github.com/paralus/paralus/proto/rpc/v3"
"github.com/RafayLabs/rcloud-base/server" "github.com/paralus/paralus/server"
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
kclient "github.com/ory/kratos-client-go" kclient "github.com/ory/kratos-client-go"
"github.com/spf13/viper" "github.com/spf13/viper"

View File

@@ -228,9 +228,9 @@ metadata:
name: :cluster name: :cluster
description: this is a test cluster description: this is a test cluster
labels: labels:
rafay.dev/clusterLocation: coimbatore-hq paralus.dev/clusterLocation: coimbatore-hq
rafay.dev/clusterName: testcluster paralus.dev/clusterName: testcluster
rafay.dev/clusterType: imported paralus.dev/clusterType: imported
project: myproject project: myproject
organization: finmanorg organization: finmanorg
partner: finman partner: finman
@@ -241,7 +241,7 @@ spec:
city: :city city: :city
state: :state state: :state
country: :country country: :country
overrideSelector: rafay.dev/overrideCluster=dummycluster overrideSelector: paralus.dev/overrideCluster=dummycluster
proxyConfig: proxyConfig:
httpProxy: http:localhost:8080/proxy httpProxy: http:localhost:8080/proxy

View File

@@ -7,8 +7,8 @@ import (
"strings" "strings"
"time" "time"
logv2 "github.com/RafayLabs/rcloud-base/pkg/log" logv2 "github.com/paralus/paralus/pkg/log"
commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" commonv3 "github.com/paralus/paralus/proto/types/commonpb/v3"
"go.uber.org/zap" "go.uber.org/zap"
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"
) )

View File

@@ -5,9 +5,9 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/RafayLabs/rcloud-base/pkg/enforcer" "github.com/paralus/paralus/pkg/enforcer"
logv2 "github.com/RafayLabs/rcloud-base/pkg/log" logv2 "github.com/paralus/paralus/pkg/log"
"github.com/RafayLabs/rcloud-base/pkg/service" "github.com/paralus/paralus/pkg/service"
kclient "github.com/ory/kratos-client-go" kclient "github.com/ory/kratos-client-go"
"github.com/uptrace/bun" "github.com/uptrace/bun"
"go.uber.org/zap" "go.uber.org/zap"

View File

@@ -7,10 +7,10 @@ import (
"errors" "errors"
"strings" "strings"
"github.com/RafayLabs/rcloud-base/internal/dao" "github.com/paralus/paralus/internal/dao"
rpcv3 "github.com/RafayLabs/rcloud-base/proto/rpc/user" rpcv3 "github.com/paralus/paralus/proto/rpc/user"
authzv1 "github.com/RafayLabs/rcloud-base/proto/types/authz" authzv1 "github.com/paralus/paralus/proto/types/authz"
commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" commonv3 "github.com/paralus/paralus/proto/types/commonpb/v3"
"github.com/google/uuid" "github.com/google/uuid"
) )

View File

@@ -4,10 +4,10 @@ import (
context "context" context "context"
"strings" "strings"
"github.com/RafayLabs/rcloud-base/pkg/common" "github.com/paralus/paralus/pkg/common"
"github.com/RafayLabs/rcloud-base/pkg/gateway" "github.com/paralus/paralus/pkg/gateway"
"github.com/RafayLabs/rcloud-base/pkg/utils" "github.com/paralus/paralus/pkg/utils"
commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" commonv3 "github.com/paralus/paralus/proto/types/commonpb/v3"
grpc "google.golang.org/grpc" grpc "google.golang.org/grpc"
codes "google.golang.org/grpc/codes" codes "google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"

View File

@@ -7,10 +7,10 @@ import (
"regexp" "regexp"
"strings" "strings"
"github.com/RafayLabs/rcloud-base/internal/dao" "github.com/paralus/paralus/internal/dao"
"github.com/RafayLabs/rcloud-base/pkg/common" "github.com/paralus/paralus/pkg/common"
rpcv3 "github.com/RafayLabs/rcloud-base/proto/rpc/v3" rpcv3 "github.com/paralus/paralus/proto/rpc/v3"
commonpbv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" commonpbv3 "github.com/paralus/paralus/proto/types/commonpb/v3"
"github.com/uptrace/bun" "github.com/uptrace/bun"
"github.com/uptrace/bun/dialect/pgdialect" "github.com/uptrace/bun/dialect/pgdialect"
"github.com/uptrace/bun/driver/pgdriver" "github.com/uptrace/bun/driver/pgdriver"

View File

@@ -1,8 +1,8 @@
package authv3 package authv3
import ( import (
"github.com/RafayLabs/rcloud-base/pkg/pool" "github.com/paralus/paralus/pkg/pool"
rpcv3 "github.com/RafayLabs/rcloud-base/proto/rpc/v3" rpcv3 "github.com/paralus/paralus/proto/rpc/v3"
"context" "context"

View File

@@ -3,7 +3,7 @@ package authv3
import ( import (
"context" "context"
commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" commonv3 "github.com/paralus/paralus/proto/types/commonpb/v3"
) )
type authService struct { type authService struct {

View File

@@ -7,10 +7,10 @@ import (
"strings" "strings"
"time" "time"
"github.com/RafayLabs/rcloud-base/pkg/controller/client" "github.com/paralus/paralus/pkg/controller/client"
scheme "github.com/RafayLabs/rcloud-base/pkg/controller/scheme" scheme "github.com/paralus/paralus/pkg/controller/scheme"
"github.com/RafayLabs/rcloud-base/pkg/controller/util" "github.com/paralus/paralus/pkg/controller/util"
clusterv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" clusterv2 "github.com/paralus/paralus/proto/types/controller"
apixv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" apixv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
apierrs "k8s.io/apimachinery/pkg/api/errors" apierrs "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/meta"

View File

@@ -12,8 +12,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
cruntime "github.com/RafayLabs/rcloud-base/pkg/controller/runtime" cruntime "github.com/paralus/paralus/pkg/controller/runtime"
clusterv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" clusterv2 "github.com/paralus/paralus/proto/types/controller"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
) )

View File

@@ -4,8 +4,8 @@ import (
"bytes" "bytes"
"fmt" "fmt"
"github.com/RafayLabs/rcloud-base/pkg/controller/scheme" "github.com/paralus/paralus/pkg/controller/scheme"
"github.com/RafayLabs/rcloud-base/pkg/controller/util" "github.com/paralus/paralus/pkg/controller/util"
sp "k8s.io/apimachinery/pkg/util/strategicpatch" sp "k8s.io/apimachinery/pkg/util/strategicpatch"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"

View File

@@ -7,12 +7,12 @@ import (
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"github.com/RafayLabs/rcloud-base/pkg/controller/scheme" "github.com/paralus/paralus/pkg/controller/scheme"
clusterv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" clusterv2 "github.com/paralus/paralus/proto/types/controller"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
cruntime "github.com/RafayLabs/rcloud-base/pkg/controller/runtime" cruntime "github.com/paralus/paralus/pkg/controller/runtime"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
) )

View File

@@ -3,7 +3,7 @@ package apply
import ( import (
"testing" "testing"
clusterv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" clusterv2 "github.com/paralus/paralus/proto/types/controller"
) )
func TestGetGVK(t *testing.T) { func TestGetGVK(t *testing.T) {

View File

@@ -3,7 +3,7 @@ package client
import ( import (
"time" "time"
"github.com/RafayLabs/rcloud-base/pkg/controller/scheme" "github.com/paralus/paralus/pkg/controller/scheme"
"sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/apiutil" "sigs.k8s.io/controller-runtime/pkg/client/apiutil"
"sigs.k8s.io/controller-runtime/pkg/client/config" "sigs.k8s.io/controller-runtime/pkg/client/config"

View File

@@ -4,8 +4,8 @@ import (
"bytes" "bytes"
"errors" "errors"
"github.com/RafayLabs/rcloud-base/pkg/controller/scheme" "github.com/paralus/paralus/pkg/controller/scheme"
apiv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" apiv2 "github.com/paralus/paralus/proto/types/controller"
rbacv1 "k8s.io/api/rbac/v1" rbacv1 "k8s.io/api/rbac/v1"
apixv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" apixv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
@@ -14,7 +14,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"github.com/RafayLabs/rcloud-base/pkg/controller/util" "github.com/paralus/paralus/pkg/controller/util"
) )
var ( var (

View File

@@ -7,7 +7,7 @@ import (
"reflect" "reflect"
"testing" "testing"
apiv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" apiv2 "github.com/paralus/paralus/proto/types/controller"
appsv1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
) )

View File

@@ -3,7 +3,7 @@ package scheme
import ( import (
"sync" "sync"
apiv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" apiv2 "github.com/paralus/paralus/proto/types/controller"
// DO NOT UPDATE // DO NOT UPDATE
// API Extensions v1 is not available in k8s v1.14.x // API Extensions v1 is not available in k8s v1.14.x
apixv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" apixv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"

View File

@@ -3,7 +3,7 @@ package step
import ( import (
"fmt" "fmt"
clusterv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" clusterv2 "github.com/paralus/paralus/proto/types/controller"
appsv1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
batchv1 "k8s.io/api/batch/v1" batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"

View File

@@ -3,12 +3,12 @@ package step
import ( import (
"context" "context"
"github.com/RafayLabs/rcloud-base/pkg/controller/apply" "github.com/paralus/paralus/pkg/controller/apply"
cr "github.com/RafayLabs/rcloud-base/pkg/controller/runtime" cr "github.com/paralus/paralus/pkg/controller/runtime"
"github.com/RafayLabs/rcloud-base/pkg/controller/scheme" "github.com/paralus/paralus/pkg/controller/scheme"
"github.com/RafayLabs/rcloud-base/pkg/controller/util" "github.com/paralus/paralus/pkg/controller/util"
hash "github.com/RafayLabs/rcloud-base/pkg/hasher" hash "github.com/paralus/paralus/pkg/hasher"
clusterv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" clusterv2 "github.com/paralus/paralus/proto/types/controller"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
apierrs "k8s.io/apimachinery/pkg/api/errors" apierrs "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/api/meta"

View File

@@ -1,7 +1,7 @@
package util package util
import ( import (
"github.com/RafayLabs/rcloud-base/pkg/controller/scheme" "github.com/paralus/paralus/pkg/controller/scheme"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client"

View File

@@ -4,13 +4,13 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/RafayLabs/rcloud-base/pkg/controller/scheme" "github.com/paralus/paralus/pkg/controller/scheme"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/controller-runtime/pkg/client/apiutil" "sigs.k8s.io/controller-runtime/pkg/client/apiutil"
clusterv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" clusterv2 "github.com/paralus/paralus/proto/types/controller"
ctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
) )

View File

@@ -3,10 +3,10 @@ package util
import ( import (
"fmt" "fmt"
clusterv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" clusterv2 "github.com/paralus/paralus/proto/types/controller"
apixv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apixv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"github.com/RafayLabs/rcloud-base/pkg/controller/scheme" "github.com/paralus/paralus/pkg/controller/scheme"
jp "github.com/evanphx/json-patch" jp "github.com/evanphx/json-patch"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
jmp "k8s.io/apimachinery/pkg/util/jsonmergepatch" jmp "k8s.io/apimachinery/pkg/util/jsonmergepatch"

View File

@@ -5,9 +5,9 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"github.com/RafayLabs/rcloud-base/pkg/controller/scheme" "github.com/paralus/paralus/pkg/controller/scheme"
apiv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" apiv2 "github.com/paralus/paralus/proto/types/controller"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"

View File

@@ -1,7 +1,7 @@
package util package util
import ( import (
clusterv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" clusterv2 "github.com/paralus/paralus/proto/types/controller"
) )
const ( const (

View File

@@ -5,10 +5,10 @@ import (
"fmt" "fmt"
"strings" "strings"
runtimeutil "github.com/RafayLabs/rcloud-base/pkg/controller/runtime" runtimeutil "github.com/paralus/paralus/pkg/controller/runtime"
"github.com/RafayLabs/rcloud-base/pkg/log" "github.com/paralus/paralus/pkg/log"
controllerv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" controllerv2 "github.com/paralus/paralus/proto/types/controller"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"

View File

@@ -3,7 +3,7 @@ package converter
import ( import (
gojson "encoding/json" gojson "encoding/json"
apiv2 "github.com/RafayLabs/rcloud-base/proto/types/controller" apiv2 "github.com/paralus/paralus/proto/types/controller"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
) )

View File

@@ -3,7 +3,7 @@ package event
import ( import (
"sync" "sync"
"github.com/RafayLabs/rcloud-base/pkg/log" "github.com/paralus/paralus/pkg/log"
) )
const ( const (

View File

@@ -1,7 +1,7 @@
package gateway package gateway
import ( import (
common "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" common "github.com/paralus/paralus/proto/types/commonpb/v3"
"github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
) )

View File

@@ -4,8 +4,8 @@ import (
"bytes" "bytes"
"testing" "testing"
"github.com/RafayLabs/rcloud-base/pkg/gateway" "github.com/paralus/paralus/pkg/gateway"
"github.com/RafayLabs/rcloud-base/pkg/gateway/testdata" "github.com/paralus/paralus/pkg/gateway/testdata"
"google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/timestamppb"
) )

View File

@@ -9,8 +9,8 @@ import (
"net/http" "net/http"
"testing" "testing"
"github.com/RafayLabs/rcloud-base/pkg/gateway" "github.com/paralus/paralus/pkg/gateway"
"github.com/RafayLabs/rcloud-base/pkg/grpc" "github.com/paralus/paralus/pkg/grpc"
"github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/grpc-ecosystem/grpc-gateway/runtime"
) )

View File

@@ -4,8 +4,8 @@ import (
"bytes" "bytes"
"testing" "testing"
"github.com/RafayLabs/rcloud-base/pkg/gateway" "github.com/paralus/paralus/pkg/gateway"
"github.com/RafayLabs/rcloud-base/pkg/gateway/testdata" "github.com/paralus/paralus/pkg/gateway/testdata"
"google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/timestamppb"
) )

View File

@@ -3,7 +3,7 @@ package leaderelection
import ( import (
"context" "context"
log "github.com/RafayLabs/rcloud-base/pkg/log" log "github.com/paralus/paralus/pkg/log"
le "k8s.io/client-go/tools/leaderelection" le "k8s.io/client-go/tools/leaderelection"
rl "k8s.io/client-go/tools/leaderelection/resourcelock" rl "k8s.io/client-go/tools/leaderelection/resourcelock"
) )

View File

@@ -1,8 +1,8 @@
package match package match
import ( import (
"github.com/RafayLabs/rcloud-base/pkg/query" "github.com/paralus/paralus/pkg/query"
commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" commonv3 "github.com/paralus/paralus/proto/types/commonpb/v3"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
) )

View File

@@ -8,12 +8,12 @@ import (
"sync" "sync"
"time" "time"
"github.com/RafayLabs/rcloud-base/pkg/log" "github.com/paralus/paralus/pkg/log"
"github.com/RafayLabs/rcloud-base/pkg/match" "github.com/paralus/paralus/pkg/match"
"github.com/RafayLabs/rcloud-base/pkg/query" "github.com/paralus/paralus/pkg/query"
"github.com/RafayLabs/rcloud-base/pkg/service" "github.com/paralus/paralus/pkg/service"
commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" commonv3 "github.com/paralus/paralus/proto/types/commonpb/v3"
infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" infrav3 "github.com/paralus/paralus/proto/types/infrapb/v3"
) )
var ( var (

View File

@@ -3,9 +3,9 @@ package patch
import ( import (
"encoding/json" "encoding/json"
sp "github.com/RafayLabs/rcloud-base/pkg/controller/strategicpatch" sp "github.com/paralus/paralus/pkg/controller/strategicpatch"
infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" infrav3 "github.com/paralus/paralus/proto/types/infrapb/v3"
"github.com/RafayLabs/rcloud-base/proto/types/scheduler" "github.com/paralus/paralus/proto/types/scheduler"
) )
type clusterConditions struct { type clusterConditions struct {

View File

@@ -5,8 +5,8 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/RafayLabs/rcloud-base/internal/random" "github.com/paralus/paralus/internal/random"
commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" commonv3 "github.com/paralus/paralus/proto/types/commonpb/v3"
"github.com/uptrace/bun" "github.com/uptrace/bun"
) )

View File

@@ -1,7 +1,7 @@
package query package query
import ( import (
commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" commonv3 "github.com/paralus/paralus/proto/types/commonpb/v3"
"github.com/uptrace/bun" "github.com/uptrace/bun"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/selection" "k8s.io/apimachinery/pkg/selection"

View File

@@ -3,9 +3,9 @@ package reconcile
import ( import (
"context" "context"
"github.com/RafayLabs/rcloud-base/pkg/log" "github.com/paralus/paralus/pkg/log"
"github.com/RafayLabs/rcloud-base/pkg/service" "github.com/paralus/paralus/pkg/service"
infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" infrav3 "github.com/paralus/paralus/proto/types/infrapb/v3"
) )
var _log = log.GetLogger() var _log = log.GetLogger()

View File

@@ -4,11 +4,11 @@ import (
"context" "context"
"time" "time"
"github.com/RafayLabs/rcloud-base/pkg/event" "github.com/paralus/paralus/pkg/event"
"github.com/RafayLabs/rcloud-base/pkg/query" "github.com/paralus/paralus/pkg/query"
"github.com/RafayLabs/rcloud-base/pkg/service" "github.com/paralus/paralus/pkg/service"
commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" commonv3 "github.com/paralus/paralus/proto/types/commonpb/v3"
infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" infrav3 "github.com/paralus/paralus/proto/types/infrapb/v3"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/util/workqueue" "k8s.io/client-go/util/workqueue"
) )

View File

@@ -5,12 +5,12 @@ import (
"fmt" "fmt"
"time" "time"
clstrutil "github.com/RafayLabs/rcloud-base/internal/cluster" clstrutil "github.com/paralus/paralus/internal/cluster"
"github.com/RafayLabs/rcloud-base/internal/cluster/constants" "github.com/paralus/paralus/internal/cluster/constants"
"github.com/RafayLabs/rcloud-base/pkg/service" "github.com/paralus/paralus/pkg/service"
infrav3 "github.com/RafayLabs/rcloud-base/proto/types/infrapb/v3" infrav3 "github.com/paralus/paralus/proto/types/infrapb/v3"
"github.com/RafayLabs/rcloud-base/pkg/query" "github.com/paralus/paralus/pkg/query"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

View File

@@ -3,7 +3,7 @@ package reconcile
import ( import (
"encoding/json" "encoding/json"
"github.com/RafayLabs/rcloud-base/pkg/event" "github.com/paralus/paralus/pkg/event"
) )
func resourceToKey(r event.Resource) string { func resourceToKey(r event.Resource) string {

View File

@@ -7,16 +7,16 @@ import (
"strings" "strings"
"time" "time"
"github.com/RafayLabs/rcloud-base/internal/constants" "github.com/paralus/paralus/internal/constants"
"github.com/RafayLabs/rcloud-base/pkg/controller/runtime" "github.com/paralus/paralus/pkg/controller/runtime"
"github.com/RafayLabs/rcloud-base/pkg/log" "github.com/paralus/paralus/pkg/log"
"github.com/RafayLabs/rcloud-base/pkg/query" "github.com/paralus/paralus/pkg/query"
"github.com/RafayLabs/rcloud-base/pkg/sentry/kubeconfig" "github.com/paralus/paralus/pkg/sentry/kubeconfig"
"github.com/RafayLabs/rcloud-base/pkg/service" "github.com/paralus/paralus/pkg/service"
sentryrpc "github.com/RafayLabs/rcloud-base/proto/rpc/sentry" sentryrpc "github.com/paralus/paralus/proto/rpc/sentry"
commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" commonv3 "github.com/paralus/paralus/proto/types/commonpb/v3"
"github.com/RafayLabs/rcloud-base/proto/types/controller" "github.com/paralus/paralus/proto/types/controller"
"github.com/RafayLabs/rcloud-base/proto/types/sentry" "github.com/paralus/paralus/proto/types/sentry"
"github.com/google/uuid" "github.com/google/uuid"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1" rbacv1 "k8s.io/api/rbac/v1"

View File

@@ -9,21 +9,21 @@ import (
"strings" "strings"
"time" "time"
"github.com/RafayLabs/rcloud-base/pkg/log" "github.com/paralus/paralus/pkg/log"
"github.com/RafayLabs/rcloud-base/pkg/query" "github.com/paralus/paralus/pkg/query"
sentryrpc "github.com/RafayLabs/rcloud-base/proto/rpc/sentry" sentryrpc "github.com/paralus/paralus/proto/rpc/sentry"
rpcv3 "github.com/RafayLabs/rcloud-base/proto/rpc/user" rpcv3 "github.com/paralus/paralus/proto/rpc/user"
commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" commonv3 "github.com/paralus/paralus/proto/types/commonpb/v3"
sentry "github.com/RafayLabs/rcloud-base/proto/types/sentry" sentry "github.com/paralus/paralus/proto/types/sentry"
"github.com/google/uuid" "github.com/google/uuid"
clientcmdapiv1 "k8s.io/client-go/tools/clientcmd/api/v1" clientcmdapiv1 "k8s.io/client-go/tools/clientcmd/api/v1"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
"github.com/RafayLabs/rcloud-base/internal/constants" "github.com/paralus/paralus/internal/constants"
"github.com/RafayLabs/rcloud-base/pkg/sentry/cryptoutil" "github.com/paralus/paralus/pkg/sentry/cryptoutil"
"github.com/RafayLabs/rcloud-base/pkg/sentry/util" "github.com/paralus/paralus/pkg/sentry/util"
"github.com/RafayLabs/rcloud-base/pkg/service" "github.com/paralus/paralus/pkg/service"
) )
const ( const (

View File

@@ -10,13 +10,13 @@ import (
"regexp" "regexp"
"time" "time"
"github.com/RafayLabs/rcloud-base/pkg/log" "github.com/paralus/paralus/pkg/log"
"github.com/RafayLabs/rcloud-base/pkg/query" "github.com/paralus/paralus/pkg/query"
"github.com/RafayLabs/rcloud-base/pkg/sentry/cryptoutil" "github.com/paralus/paralus/pkg/sentry/cryptoutil"
"github.com/RafayLabs/rcloud-base/pkg/sentry/register" "github.com/paralus/paralus/pkg/sentry/register"
"github.com/RafayLabs/rcloud-base/pkg/service" "github.com/paralus/paralus/pkg/service"
sentryrpc "github.com/RafayLabs/rcloud-base/proto/rpc/sentry" sentryrpc "github.com/paralus/paralus/proto/rpc/sentry"
"github.com/RafayLabs/rcloud-base/proto/types/sentry" "github.com/paralus/paralus/proto/types/sentry"
"github.com/dgraph-io/ristretto" "github.com/dgraph-io/ristretto"
"github.com/rs/xid" "github.com/rs/xid"
) )

View File

@@ -10,18 +10,18 @@ import (
"os" "os"
"strings" "strings"
"github.com/RafayLabs/rcloud-base/pkg/sentry/cryptoutil" "github.com/paralus/paralus/pkg/sentry/cryptoutil"
sentryrpc "github.com/RafayLabs/rcloud-base/proto/rpc/sentry" sentryrpc "github.com/paralus/paralus/proto/rpc/sentry"
commonv3 "github.com/RafayLabs/rcloud-base/proto/types/commonpb/v3" commonv3 "github.com/paralus/paralus/proto/types/commonpb/v3"
"github.com/RafayLabs/rcloud-base/proto/types/sentry" "github.com/paralus/paralus/proto/types/sentry"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rs/xid" "github.com/rs/xid"
bootstrapclientv2 "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/client" bootstrapclientv2 "github.com/paralus/paralus/api/def/clients/sentry/client"
bootstrapapiv2 "github.com/RafayLabs/rcloud-base/api/def/clients/sentry/client/bootstrap" bootstrapapiv2 "github.com/paralus/paralus/api/def/clients/sentry/client/bootstrap"
"github.com/RafayLabs/rcloud-base/pkg/log" "github.com/paralus/paralus/pkg/log"
"github.com/RafayLabs/rcloud-base/pkg/sentry/util" "github.com/paralus/paralus/pkg/sentry/util"
) )
var ( var (

View File

@@ -4,9 +4,9 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"github.com/RafayLabs/rcloud-base/internal/dao" "github.com/paralus/paralus/internal/dao"
"github.com/RafayLabs/rcloud-base/internal/models" "github.com/paralus/paralus/internal/models"
"github.com/RafayLabs/rcloud-base/proto/types/sentry" "github.com/paralus/paralus/proto/types/sentry"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/uptrace/bun" "github.com/uptrace/bun"
"google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/timestamppb"

View File

@@ -5,10 +5,10 @@ import (
"database/sql" "database/sql"
"time" "time"
"github.com/RafayLabs/rcloud-base/internal/dao" "github.com/paralus/paralus/internal/dao"
"github.com/RafayLabs/rcloud-base/internal/models" "github.com/paralus/paralus/internal/models"
"github.com/RafayLabs/rcloud-base/pkg/crypto" "github.com/paralus/paralus/pkg/crypto"
rpcv3 "github.com/RafayLabs/rcloud-base/proto/rpc/user" rpcv3 "github.com/paralus/paralus/proto/rpc/user"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/uptrace/bun" "github.com/uptrace/bun"
"go.uber.org/zap" "go.uber.org/zap"

Some files were not shown because too many files have changed in this diff Show More