Skip to content
This repository has been archived by the owner on May 13, 2024. It is now read-only.

Commit

Permalink
refactor: rename fsm to fsm-classic
Browse files Browse the repository at this point in the history
Signed-off-by: Lin Yang <reaver@flomesh.io>
  • Loading branch information
reaver-flomesh committed May 27, 2023
1 parent f5dd1c1 commit 7ef44b8
Show file tree
Hide file tree
Showing 172 changed files with 555 additions and 555 deletions.
4 changes: 2 additions & 2 deletions apis/cluster/v1alpha1/cluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
package v1alpha1

import (
"github.com/flomesh-io/fsm/pkg/commons"
"github.com/flomesh-io/fsm/pkg/util"
"github.com/flomesh-io/fsm-classic/pkg/commons"
"github.com/flomesh-io/fsm-classic/pkg/util"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/proxyprofile/v1alpha1/helper/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ package helper

import (
"fmt"
"github.com/flomesh-io/fsm/pkg/config"
"github.com/flomesh-io/fsm-classic/pkg/config"
)

func GetProxyProfileParentPath(mc *config.MeshConfig) string {
Expand Down
4 changes: 2 additions & 2 deletions apis/proxyprofile/v1alpha1/proxyprofile_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ package v1alpha1

import (
"fmt"
"github.com/flomesh-io/fsm/pkg/commons"
"github.com/flomesh-io/fsm/pkg/util"
"github.com/flomesh-io/fsm-classic/pkg/commons"
"github.com/flomesh-io/fsm-classic/pkg/util"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
Expand Down
2 changes: 1 addition & 1 deletion apis/serviceexport/v1alpha1/serviceexport_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
package v1alpha1

import (
"github.com/flomesh-io/fsm/pkg/route"
"github.com/flomesh-io/fsm-classic/pkg/route"
networkingv1 "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"context"
_ "embed"
"fmt"
"github.com/flomesh-io/fsm/pkg/kube"
"github.com/flomesh-io/fsm-classic/pkg/kube"
"github.com/pkg/errors"
"github.com/spf13/cobra"
helm "helm.sh/helm/v3/pkg/action"
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/uninstall.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ package cmd
import (
"bufio"
"fmt"
"github.com/flomesh-io/fsm/pkg/kube"
"github.com/flomesh-io/fsm-classic/pkg/kube"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"helm.sh/helm/v3/pkg/action"
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ package cmd

import (
"fmt"
"github.com/flomesh-io/fsm/pkg/version"
"github.com/flomesh-io/fsm-classic/pkg/version"
"github.com/spf13/cobra"
"io"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ package main

import (
"fmt"
"github.com/flomesh-io/fsm/cli/cmd"
"github.com/flomesh-io/fsm-classic/cli/cmd"
"os"
)

Expand Down
8 changes: 4 additions & 4 deletions cmd/ingress-pipy/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ import (
"context"
"flag"
"fmt"
"github.com/flomesh-io/fsm/pkg/commons"
"github.com/flomesh-io/fsm/pkg/config"
"github.com/flomesh-io/fsm/pkg/kube"
"github.com/flomesh-io/fsm/pkg/version"
"github.com/flomesh-io/fsm-classic/pkg/commons"
"github.com/flomesh-io/fsm-classic/pkg/config"
"github.com/flomesh-io/fsm-classic/pkg/kube"
"github.com/flomesh-io/fsm-classic/pkg/version"
"github.com/gin-gonic/gin"
"github.com/pkg/errors"
"github.com/spf13/pflag"
Expand Down
12 changes: 6 additions & 6 deletions cmd/manager/eventhandlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ package main

import (
"context"
"github.com/flomesh-io/fsm/pkg/certificate"
"github.com/flomesh-io/fsm/pkg/config"
"github.com/flomesh-io/fsm/pkg/config/listener"
lcfg "github.com/flomesh-io/fsm/pkg/config/listener/config"
"github.com/flomesh-io/fsm/pkg/kube"
"github.com/flomesh-io/fsm/pkg/repo"
"github.com/flomesh-io/fsm-classic/pkg/certificate"
"github.com/flomesh-io/fsm-classic/pkg/config"
"github.com/flomesh-io/fsm-classic/pkg/config/listener"
lcfg "github.com/flomesh-io/fsm-classic/pkg/config/listener/config"
"github.com/flomesh-io/fsm-classic/pkg/kube"
"github.com/flomesh-io/fsm-classic/pkg/repo"
corev1 "k8s.io/api/core/v1"
"k8s.io/klog/v2"
"os"
Expand Down
8 changes: 4 additions & 4 deletions cmd/manager/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
package main

import (
"github.com/flomesh-io/fsm/pkg/commons"
"github.com/flomesh-io/fsm/pkg/config"
"github.com/flomesh-io/fsm/pkg/config/utils"
"github.com/flomesh-io/fsm/pkg/repo"
"github.com/flomesh-io/fsm-classic/pkg/commons"
"github.com/flomesh-io/fsm-classic/pkg/config"
"github.com/flomesh-io/fsm-classic/pkg/config/utils"
"github.com/flomesh-io/fsm-classic/pkg/repo"
"os"
)

Expand Down
10 changes: 5 additions & 5 deletions cmd/manager/logging.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
package main

import (
"github.com/flomesh-io/fsm/pkg/commons"
"github.com/flomesh-io/fsm/pkg/config"
"github.com/flomesh-io/fsm/pkg/config/utils"
"github.com/flomesh-io/fsm/pkg/kube"
"github.com/flomesh-io/fsm/pkg/repo"
"github.com/flomesh-io/fsm-classic/pkg/commons"
"github.com/flomesh-io/fsm-classic/pkg/config"
"github.com/flomesh-io/fsm-classic/pkg/config/utils"
"github.com/flomesh-io/fsm-classic/pkg/kube"
"github.com/flomesh-io/fsm-classic/pkg/repo"
"os"
)

Expand Down
18 changes: 9 additions & 9 deletions cmd/manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ import (
"context"
"flag"
"fmt"
"github.com/flomesh-io/fsm/pkg/commons"
"github.com/flomesh-io/fsm/pkg/config"
"github.com/flomesh-io/fsm/pkg/event"
"github.com/flomesh-io/fsm/pkg/kube"
"github.com/flomesh-io/fsm/pkg/repo"
"github.com/flomesh-io/fsm/pkg/util"
"github.com/flomesh-io/fsm/pkg/util/tls"
"github.com/flomesh-io/fsm/pkg/version"
"github.com/flomesh-io/fsm-classic/pkg/commons"
"github.com/flomesh-io/fsm-classic/pkg/config"
"github.com/flomesh-io/fsm-classic/pkg/event"
"github.com/flomesh-io/fsm-classic/pkg/kube"
"github.com/flomesh-io/fsm-classic/pkg/repo"
"github.com/flomesh-io/fsm-classic/pkg/util"
"github.com/flomesh-io/fsm-classic/pkg/util/tls"
"github.com/flomesh-io/fsm-classic/pkg/version"
"github.com/spf13/pflag"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/rest"
Expand All @@ -50,7 +50,7 @@ import (
// to ensure that exec-entrypoint and run can make use of them.
_ "k8s.io/client-go/plugin/pkg/client/auth"

flomeshscheme "github.com/flomesh-io/fsm/pkg/generated/clientset/versioned/scheme"
flomeshscheme "github.com/flomesh-io/fsm-classic/pkg/generated/clientset/versioned/scheme"
"k8s.io/apimachinery/pkg/runtime"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
Expand Down
26 changes: 13 additions & 13 deletions cmd/manager/reconcilers.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@
package main

import (
clusterv1alpha1 "github.com/flomesh-io/fsm/controllers/cluster/v1alpha1"
"github.com/flomesh-io/fsm/controllers/flb"
gatewayv1beta1 "github.com/flomesh-io/fsm/controllers/gateway/v1beta1"
nsigv1alpha1 "github.com/flomesh-io/fsm/controllers/namespacedingress/v1alpha1"
proxyprofilev1alpha1 "github.com/flomesh-io/fsm/controllers/proxyprofile/v1alpha1"
svcexpv1alpha1 "github.com/flomesh-io/fsm/controllers/serviceexport/v1alpha1"
svcimpv1alpha1 "github.com/flomesh-io/fsm/controllers/serviceimport/v1alpha1"
svclb "github.com/flomesh-io/fsm/controllers/servicelb"
"github.com/flomesh-io/fsm/pkg/certificate"
"github.com/flomesh-io/fsm/pkg/config"
"github.com/flomesh-io/fsm/pkg/event"
"github.com/flomesh-io/fsm/pkg/kube"
"github.com/flomesh-io/fsm/pkg/util"
clusterv1alpha1 "github.com/flomesh-io/fsm-classic/controllers/cluster/v1alpha1"
"github.com/flomesh-io/fsm-classic/controllers/flb"
gatewayv1beta1 "github.com/flomesh-io/fsm-classic/controllers/gateway/v1beta1"
nsigv1alpha1 "github.com/flomesh-io/fsm-classic/controllers/namespacedingress/v1alpha1"
proxyprofilev1alpha1 "github.com/flomesh-io/fsm-classic/controllers/proxyprofile/v1alpha1"
svcexpv1alpha1 "github.com/flomesh-io/fsm-classic/controllers/serviceexport/v1alpha1"
svcimpv1alpha1 "github.com/flomesh-io/fsm-classic/controllers/serviceimport/v1alpha1"
svclb "github.com/flomesh-io/fsm-classic/controllers/servicelb"
"github.com/flomesh-io/fsm-classic/pkg/certificate"
"github.com/flomesh-io/fsm-classic/pkg/config"
"github.com/flomesh-io/fsm-classic/pkg/event"
"github.com/flomesh-io/fsm-classic/pkg/kube"
"github.com/flomesh-io/fsm-classic/pkg/util"
"k8s.io/klog/v2"
"os"
"sigs.k8s.io/controller-runtime/pkg/manager"
Expand Down
2 changes: 1 addition & 1 deletion cmd/manager/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ package main

import (
"fmt"
"github.com/flomesh-io/fsm/pkg/repo"
"github.com/flomesh-io/fsm-classic/pkg/repo"
"io/ioutil"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/klog/v2"
Expand Down
10 changes: 5 additions & 5 deletions cmd/manager/tls.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
package main

import (
"github.com/flomesh-io/fsm/pkg/certificate"
"github.com/flomesh-io/fsm/pkg/commons"
"github.com/flomesh-io/fsm/pkg/config"
"github.com/flomesh-io/fsm/pkg/config/utils"
"github.com/flomesh-io/fsm/pkg/repo"
"github.com/flomesh-io/fsm-classic/pkg/certificate"
"github.com/flomesh-io/fsm-classic/pkg/commons"
"github.com/flomesh-io/fsm-classic/pkg/config"
"github.com/flomesh-io/fsm-classic/pkg/config/utils"
"github.com/flomesh-io/fsm-classic/pkg/repo"
"k8s.io/klog/v2"
"os"
)
Expand Down
48 changes: 24 additions & 24 deletions cmd/manager/webhooks.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,30 +27,30 @@ package main
import (
"context"
"fmt"
flomeshadmission "github.com/flomesh-io/fsm/pkg/admission"
"github.com/flomesh-io/fsm/pkg/certificate"
"github.com/flomesh-io/fsm/pkg/commons"
"github.com/flomesh-io/fsm/pkg/config"
"github.com/flomesh-io/fsm/pkg/injector"
"github.com/flomesh-io/fsm/pkg/kube"
"github.com/flomesh-io/fsm/pkg/webhooks"
clusterwh "github.com/flomesh-io/fsm/pkg/webhooks/cluster"
cmwh "github.com/flomesh-io/fsm/pkg/webhooks/cm"
flbsecretwh "github.com/flomesh-io/fsm/pkg/webhooks/flb/secret"
flbsvcwh "github.com/flomesh-io/fsm/pkg/webhooks/flb/service"
gatewaywh "github.com/flomesh-io/fsm/pkg/webhooks/gateway"
gatewayclasswh "github.com/flomesh-io/fsm/pkg/webhooks/gatewayclass"
gtpwh "github.com/flomesh-io/fsm/pkg/webhooks/globaltrafficpolicy"
httproutewh "github.com/flomesh-io/fsm/pkg/webhooks/httproute"
ingwh "github.com/flomesh-io/fsm/pkg/webhooks/ingress"
idwh "github.com/flomesh-io/fsm/pkg/webhooks/namespacedingress"
pfwh "github.com/flomesh-io/fsm/pkg/webhooks/proxyprofile"
referencepolicywh "github.com/flomesh-io/fsm/pkg/webhooks/referencepolicy"
svcexpwh "github.com/flomesh-io/fsm/pkg/webhooks/serviceexport"
svcimpwh "github.com/flomesh-io/fsm/pkg/webhooks/serviceimport"
tcproutewh "github.com/flomesh-io/fsm/pkg/webhooks/tcproute"
tlsroutewh "github.com/flomesh-io/fsm/pkg/webhooks/tlsroute"
udproutewh "github.com/flomesh-io/fsm/pkg/webhooks/udproute"
flomeshadmission "github.com/flomesh-io/fsm-classic/pkg/admission"
"github.com/flomesh-io/fsm-classic/pkg/certificate"
"github.com/flomesh-io/fsm-classic/pkg/commons"
"github.com/flomesh-io/fsm-classic/pkg/config"
"github.com/flomesh-io/fsm-classic/pkg/injector"
"github.com/flomesh-io/fsm-classic/pkg/kube"
"github.com/flomesh-io/fsm-classic/pkg/webhooks"
clusterwh "github.com/flomesh-io/fsm-classic/pkg/webhooks/cluster"
cmwh "github.com/flomesh-io/fsm-classic/pkg/webhooks/cm"
flbsecretwh "github.com/flomesh-io/fsm-classic/pkg/webhooks/flb/secret"
flbsvcwh "github.com/flomesh-io/fsm-classic/pkg/webhooks/flb/service"
gatewaywh "github.com/flomesh-io/fsm-classic/pkg/webhooks/gateway"
gatewayclasswh "github.com/flomesh-io/fsm-classic/pkg/webhooks/gatewayclass"
gtpwh "github.com/flomesh-io/fsm-classic/pkg/webhooks/globaltrafficpolicy"
httproutewh "github.com/flomesh-io/fsm-classic/pkg/webhooks/httproute"
ingwh "github.com/flomesh-io/fsm-classic/pkg/webhooks/ingress"
idwh "github.com/flomesh-io/fsm-classic/pkg/webhooks/namespacedingress"
pfwh "github.com/flomesh-io/fsm-classic/pkg/webhooks/proxyprofile"
referencepolicywh "github.com/flomesh-io/fsm-classic/pkg/webhooks/referencepolicy"
svcexpwh "github.com/flomesh-io/fsm-classic/pkg/webhooks/serviceexport"
svcimpwh "github.com/flomesh-io/fsm-classic/pkg/webhooks/serviceimport"
tcproutewh "github.com/flomesh-io/fsm-classic/pkg/webhooks/tcproute"
tlsroutewh "github.com/flomesh-io/fsm-classic/pkg/webhooks/tlsroute"
udproutewh "github.com/flomesh-io/fsm-classic/pkg/webhooks/udproute"
"io/ioutil"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
12 changes: 6 additions & 6 deletions cmd/proxy-init/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ package main
import (
"context"
"flag"
"github.com/flomesh-io/fsm/pkg/commons"
"github.com/flomesh-io/fsm/pkg/config"
flomeshscheme "github.com/flomesh-io/fsm/pkg/generated/clientset/versioned/scheme"
"github.com/flomesh-io/fsm/pkg/kube"
"github.com/flomesh-io/fsm/pkg/repo"
"github.com/flomesh-io/fsm/pkg/version"
"github.com/flomesh-io/fsm-classic/pkg/commons"
"github.com/flomesh-io/fsm-classic/pkg/config"
flomeshscheme "github.com/flomesh-io/fsm-classic/pkg/generated/clientset/versioned/scheme"
"github.com/flomesh-io/fsm-classic/pkg/kube"
"github.com/flomesh-io/fsm-classic/pkg/repo"
"github.com/flomesh-io/fsm-classic/pkg/version"
"github.com/kelseyhightower/envconfig"
"github.com/spf13/pflag"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
22 changes: 11 additions & 11 deletions controllers/cluster/v1alpha1/cluster_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@ import (
"context"
_ "embed"
"fmt"
clusterv1alpha1 "github.com/flomesh-io/fsm/apis/cluster/v1alpha1"
svcexpv1alpha1 "github.com/flomesh-io/fsm/apis/serviceexport/v1alpha1"
"github.com/flomesh-io/fsm/pkg/certificate"
conn "github.com/flomesh-io/fsm/pkg/cluster"
cctx "github.com/flomesh-io/fsm/pkg/cluster/context"
"github.com/flomesh-io/fsm/pkg/commons"
"github.com/flomesh-io/fsm/pkg/config"
"github.com/flomesh-io/fsm/pkg/event"
"github.com/flomesh-io/fsm/pkg/kube"
"github.com/flomesh-io/fsm/pkg/repo"
"github.com/flomesh-io/fsm/pkg/util"
clusterv1alpha1 "github.com/flomesh-io/fsm-classic/apis/cluster/v1alpha1"
svcexpv1alpha1 "github.com/flomesh-io/fsm-classic/apis/serviceexport/v1alpha1"
"github.com/flomesh-io/fsm-classic/pkg/certificate"
conn "github.com/flomesh-io/fsm-classic/pkg/cluster"
cctx "github.com/flomesh-io/fsm-classic/pkg/cluster/context"
"github.com/flomesh-io/fsm-classic/pkg/commons"
"github.com/flomesh-io/fsm-classic/pkg/config"
"github.com/flomesh-io/fsm-classic/pkg/event"
"github.com/flomesh-io/fsm-classic/pkg/kube"
"github.com/flomesh-io/fsm-classic/pkg/repo"
"github.com/flomesh-io/fsm-classic/pkg/util"
appv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
Expand Down
2 changes: 1 addition & 1 deletion controllers/cluster/v1alpha1/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

clusterv1alpha1 "github.com/flomesh-io/fsm/apis/cluster/v1alpha1"
clusterv1alpha1 "github.com/flomesh-io/fsm-classic/apis/cluster/v1alpha1"
//+kubebuilder:scaffold:imports
)

Expand Down
10 changes: 5 additions & 5 deletions controllers/flb/service_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ import (
"context"
_ "embed"
"fmt"
"github.com/flomesh-io/fsm/pkg/commons"
"github.com/flomesh-io/fsm/pkg/config"
"github.com/flomesh-io/fsm/pkg/flb"
"github.com/flomesh-io/fsm/pkg/kube"
"github.com/flomesh-io/fsm/pkg/util"
"github.com/flomesh-io/fsm-classic/pkg/commons"
"github.com/flomesh-io/fsm-classic/pkg/config"
"github.com/flomesh-io/fsm-classic/pkg/flb"
"github.com/flomesh-io/fsm-classic/pkg/kube"
"github.com/flomesh-io/fsm-classic/pkg/util"
"github.com/go-resty/resty/v2"
"github.com/sethvargo/go-retry"
corev1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion controllers/gateway/v1alpha2/referencepolicy_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ package v1alpha2

import (
"context"
"github.com/flomesh-io/fsm/pkg/kube"
"github.com/flomesh-io/fsm-classic/pkg/kube"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/tools/record"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down
2 changes: 1 addition & 1 deletion controllers/gateway/v1alpha2/tcproute_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ package v1alpha2

import (
"context"
"github.com/flomesh-io/fsm/pkg/kube"
"github.com/flomesh-io/fsm-classic/pkg/kube"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/tools/record"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down
2 changes: 1 addition & 1 deletion controllers/gateway/v1alpha2/tlsroute_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ package v1alpha2

import (
"context"
"github.com/flomesh-io/fsm/pkg/kube"
"github.com/flomesh-io/fsm-classic/pkg/kube"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/tools/record"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down
2 changes: 1 addition & 1 deletion controllers/gateway/v1alpha2/udproute_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ package v1alpha2

import (
"context"
"github.com/flomesh-io/fsm/pkg/kube"
"github.com/flomesh-io/fsm-classic/pkg/kube"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/tools/record"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down
Loading

0 comments on commit 7ef44b8

Please sign in to comment.