Skip to content

Commit

Permalink
update project name from Kafed to Operating (#91)
Browse files Browse the repository at this point in the history
  • Loading branch information
wu8685 committed Sep 19, 2023
1 parent 603ac6d commit 3ba5a5a
Show file tree
Hide file tree
Showing 104 changed files with 231 additions and 229 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# Image URL to use all building/pushing image targets
IMG ?= kusionstack/kafed:test
IMG ?= kusionstack/operating:test
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.22.1
# kind cluster name for e2e
Expand Down
6 changes: 3 additions & 3 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# This file is used to track the info used to scaffold your project
# and allow the plugins properly work.
# More info: https://book.kubebuilder.io/reference/project-config.html
domain: kafed.io
domain: kusionstack.io
layout:
- go.kubebuilder.io/v3
projectName: kafed
repo: kusionstack.io/kafed
projectName: operating
repo: kusionstack.io/operating
resources:
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# kafed
# Operating
// TODO(user): Add simple overview of use/purpose

## Description
Expand All @@ -18,13 +18,13 @@ kubectl apply -f config/samples/
2. Build and push your image to the location specified by `IMG`:

```sh
make docker-build docker-push IMG=<some-registry>/kafed:tag
make docker-build docker-push IMG=<some-registry>/operating:tag
```

3. Deploy the controller to the cluster with the image specified by `IMG`:

```sh
make deploy IMG=<some-registry>/kafed:tag
make deploy IMG=<some-registry>/operating:tag
```

### Uninstall CRDs
Expand Down
2 changes: 1 addition & 1 deletion apis/addtoscheme_apps_v1alpha1.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package apis

import (
api "kusionstack.io/kafed/apis/apps/v1alpha1"
api "kusionstack.io/operating/apis/apps/v1alpha1"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: controller
newName: kusionstack/kafed
newName: kusionstack/operating
newTag: test
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module kusionstack.io/kafed
module kusionstack.io/operating

go 1.19

Expand All @@ -23,6 +23,7 @@ require (
k8s.io/client-go v0.22.6
k8s.io/component-base v0.22.6
k8s.io/component-helpers v0.22.6
k8s.io/klog v1.0.0
k8s.io/klog/v2 v2.80.1
k8s.io/kubernetes v0.0.0-00010101000000-000000000000
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1118,6 +1118,8 @@ k8s.io/cri-api v0.22.6/go.mod h1:uAw9CICQq20/1yB4ZnWT2TjJyMMROl4typFfWaURLwQ=
k8s.io/csi-translation-lib v0.22.6/go.mod h1:/O6a26XNs3xsiAZeHUF75dDQt8dyT53c5C8JBSryLTQ=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=
k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
k8s.io/kube-aggregator v0.22.6/go.mod h1:0RSTzxqiwsj5HUlov195Z72ZKyE4qgedKXCl6sLKAjM=
Expand Down
15 changes: 7 additions & 8 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"path/filepath"

"github.com/spf13/pflag"

"k8s.io/apimachinery/pkg/runtime"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
Expand All @@ -33,14 +32,14 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/healthz"

"kusionstack.io/kafed/apis"
appsv1alpha1 "kusionstack.io/kafed/apis/apps/v1alpha1"
"kusionstack.io/kafed/pkg/controllers"
"kusionstack.io/kafed/pkg/utils/feature"
"kusionstack.io/kafed/pkg/utils/inject"
"kusionstack.io/kafed/pkg/webhook"
"kusionstack.io/operating/apis"
appsv1alpha1 "kusionstack.io/operating/apis/apps/v1alpha1"
"kusionstack.io/operating/pkg/controllers"
"kusionstack.io/operating/pkg/utils/feature"
"kusionstack.io/operating/pkg/utils/inject"
"kusionstack.io/operating/pkg/webhook"

_ "kusionstack.io/kafed/pkg/features"
_ "kusionstack.io/operating/pkg/features"
//+kubebuilder:scaffold:imports
)

Expand Down
8 changes: 4 additions & 4 deletions pkg/controllers/add_alibaba_cloud_slb.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ package controllers
import (
"sigs.k8s.io/controller-runtime/pkg/manager"

"kusionstack.io/kafed/pkg/controllers/alibabacloudslb"
"kusionstack.io/kafed/pkg/controllers/resourceconsist"
"kusionstack.io/kafed/pkg/features"
"kusionstack.io/kafed/pkg/utils/feature"
"kusionstack.io/operating/pkg/controllers/alibabacloudslb"
"kusionstack.io/operating/pkg/controllers/resourceconsist"
"kusionstack.io/operating/pkg/features"
"kusionstack.io/operating/pkg/utils/feature"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/add_collaset.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

package controllers

import "kusionstack.io/kafed/pkg/controllers/collaset"
import "kusionstack.io/operating/pkg/controllers/collaset"

func init() {
AddToManagerFuncs = append(AddToManagerFuncs, collaset.Add)
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/add_poddeletion.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package controllers

import (
"kusionstack.io/kafed/pkg/controllers/poddeletion"
"kusionstack.io/operating/pkg/controllers/poddeletion"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/add_podopslifecycle.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package controllers

import (
"kusionstack.io/kafed/pkg/controllers/podopslifecycle"
"kusionstack.io/operating/pkg/controllers/podopslifecycle"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/add_resourcecontext.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package controllers

import (
"kusionstack.io/kafed/pkg/controllers/resourcecontext"
"kusionstack.io/operating/pkg/controllers/resourcecontext"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/add_ruleset.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
package controllers

import (
"kusionstack.io/kafed/pkg/controllers/ruleset"
"kusionstack.io/operating/pkg/controllers/ruleset"
)

func init() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
"sigs.k8s.io/controller-runtime/pkg/client"

"kusionstack.io/kafed/pkg/controllers/resourceconsist"
"kusionstack.io/operating/pkg/controllers/resourceconsist"
)

var _ resourceconsist.ReconcileAdapter = &ReconcileAdapter{}
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/alibabacloudslb/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"reflect"

"kusionstack.io/kafed/pkg/controllers/resourceconsist"
"kusionstack.io/operating/pkg/controllers/resourceconsist"
)

var _ resourceconsist.IEmployee = AlibabaSlbPodStatus{}
Expand Down
22 changes: 11 additions & 11 deletions pkg/controllers/collaset/collaset_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"

appsv1alpha1 "kusionstack.io/kafed/apis/apps/v1alpha1"
"kusionstack.io/kafed/pkg/controllers/collaset/podcontext"
"kusionstack.io/kafed/pkg/controllers/collaset/podcontrol"
"kusionstack.io/kafed/pkg/controllers/collaset/synccontrol"
"kusionstack.io/kafed/pkg/controllers/collaset/utils"
collasetutils "kusionstack.io/kafed/pkg/controllers/collaset/utils"
controllerutils "kusionstack.io/kafed/pkg/controllers/utils"
"kusionstack.io/kafed/pkg/controllers/utils/expectations"
"kusionstack.io/kafed/pkg/controllers/utils/podopslifecycle"
"kusionstack.io/kafed/pkg/controllers/utils/revision"
"kusionstack.io/kafed/pkg/utils/mixin"
appsv1alpha1 "kusionstack.io/operating/apis/apps/v1alpha1"
"kusionstack.io/operating/pkg/controllers/collaset/podcontext"
"kusionstack.io/operating/pkg/controllers/collaset/podcontrol"
"kusionstack.io/operating/pkg/controllers/collaset/synccontrol"
"kusionstack.io/operating/pkg/controllers/collaset/utils"
collasetutils "kusionstack.io/operating/pkg/controllers/collaset/utils"
controllerutils "kusionstack.io/operating/pkg/controllers/utils"
"kusionstack.io/operating/pkg/controllers/utils/expectations"
"kusionstack.io/operating/pkg/controllers/utils/podopslifecycle"
"kusionstack.io/operating/pkg/controllers/utils/revision"
"kusionstack.io/operating/pkg/utils/mixin"
)

const (
Expand Down
12 changes: 6 additions & 6 deletions pkg/controllers/collaset/collaset_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

"kusionstack.io/kafed/apis"
appsv1alpha1 "kusionstack.io/kafed/apis/apps/v1alpha1"
"kusionstack.io/kafed/pkg/controllers/collaset/synccontrol"
collasetutils "kusionstack.io/kafed/pkg/controllers/collaset/utils"
"kusionstack.io/kafed/pkg/controllers/utils/podopslifecycle"
"kusionstack.io/kafed/pkg/utils/inject"
"kusionstack.io/operating/apis"
appsv1alpha1 "kusionstack.io/operating/apis/apps/v1alpha1"
"kusionstack.io/operating/pkg/controllers/collaset/synccontrol"
collasetutils "kusionstack.io/operating/pkg/controllers/collaset/utils"
"kusionstack.io/operating/pkg/controllers/utils/podopslifecycle"
"kusionstack.io/operating/pkg/utils/inject"
)

var (
Expand Down
8 changes: 4 additions & 4 deletions pkg/controllers/collaset/podcontext/podcontext.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ package podcontext
import (
"context"
"fmt"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"kusionstack.io/kafed/pkg/controllers/collaset/utils"
"sort"

"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"

appsv1alpha1 "kusionstack.io/kafed/apis/apps/v1alpha1"
"kusionstack.io/kafed/pkg/controllers/utils/expectations"
appsv1alpha1 "kusionstack.io/operating/apis/apps/v1alpha1"
"kusionstack.io/operating/pkg/controllers/collaset/utils"
"kusionstack.io/operating/pkg/controllers/utils/expectations"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/collaset/podcontext/podcontext_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

appsv1alpha1 "kusionstack.io/kafed/apis/apps/v1alpha1"
appsv1alpha1 "kusionstack.io/operating/apis/apps/v1alpha1"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/collaset/podcontrol/pod_control.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

refmanagerutil "kusionstack.io/kafed/pkg/controllers/utils/refmanager"
"kusionstack.io/kafed/pkg/utils/inject"
refmanagerutil "kusionstack.io/operating/pkg/controllers/utils/refmanager"
"kusionstack.io/operating/pkg/utils/inject"
)

type Interface interface {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/collaset/predicts.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package collaset
import (
"sigs.k8s.io/controller-runtime/pkg/event"

"kusionstack.io/kafed/pkg/utils"
"kusionstack.io/operating/pkg/utils"
)

type PodPredicate struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/collaset/revision.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

appsalphav1 "kusionstack.io/kafed/apis/apps/v1alpha1"
appsalphav1 "kusionstack.io/operating/apis/apps/v1alpha1"
)

func getCollaSetPatch(cls *appsalphav1.CollaSet) ([]byte, error) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/controllers/collaset/synccontrol/scale.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ package synccontrol
import (
"sort"

collasetutils "kusionstack.io/kafed/pkg/controllers/collaset/utils"
controllerutils "kusionstack.io/kafed/pkg/controllers/utils"
"kusionstack.io/kafed/pkg/controllers/utils/podopslifecycle"
collasetutils "kusionstack.io/operating/pkg/controllers/collaset/utils"
controllerutils "kusionstack.io/operating/pkg/controllers/utils"
"kusionstack.io/operating/pkg/controllers/utils/podopslifecycle"
)

func getPodsToDelete(filteredPods []*collasetutils.PodWrapper, diff int) []*collasetutils.PodWrapper {
Expand Down
18 changes: 9 additions & 9 deletions pkg/controllers/collaset/synccontrol/sync_control.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ import (
"k8s.io/client-go/util/retry"
"sigs.k8s.io/controller-runtime/pkg/client"

appsv1alpha1 "kusionstack.io/kafed/apis/apps/v1alpha1"
"kusionstack.io/kafed/pkg/controllers/collaset/podcontext"
"kusionstack.io/kafed/pkg/controllers/collaset/podcontrol"
"kusionstack.io/kafed/pkg/controllers/collaset/utils"
collasetutils "kusionstack.io/kafed/pkg/controllers/collaset/utils"
controllerutils "kusionstack.io/kafed/pkg/controllers/utils"
"kusionstack.io/kafed/pkg/controllers/utils/expectations"
"kusionstack.io/kafed/pkg/controllers/utils/podopslifecycle"
commonutils "kusionstack.io/kafed/pkg/utils"
appsv1alpha1 "kusionstack.io/operating/apis/apps/v1alpha1"
"kusionstack.io/operating/pkg/controllers/collaset/podcontext"
"kusionstack.io/operating/pkg/controllers/collaset/podcontrol"
"kusionstack.io/operating/pkg/controllers/collaset/utils"
collasetutils "kusionstack.io/operating/pkg/controllers/collaset/utils"
controllerutils "kusionstack.io/operating/pkg/controllers/utils"
"kusionstack.io/operating/pkg/controllers/utils/expectations"
"kusionstack.io/operating/pkg/controllers/utils/podopslifecycle"
commonutils "kusionstack.io/operating/pkg/utils"
)

const (
Expand Down
10 changes: 5 additions & 5 deletions pkg/controllers/collaset/synccontrol/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/equality"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
appsv1alpha1 "kusionstack.io/kafed/apis/apps/v1alpha1"
"kusionstack.io/kafed/pkg/controllers/collaset/utils"
collasetutils "kusionstack.io/kafed/pkg/controllers/collaset/utils"
controllerutils "kusionstack.io/kafed/pkg/controllers/utils"
"kusionstack.io/kafed/pkg/controllers/utils/podopslifecycle"
appsv1alpha1 "kusionstack.io/operating/apis/apps/v1alpha1"
"kusionstack.io/operating/pkg/controllers/collaset/utils"
collasetutils "kusionstack.io/operating/pkg/controllers/collaset/utils"
controllerutils "kusionstack.io/operating/pkg/controllers/utils"
"kusionstack.io/operating/pkg/controllers/utils/podopslifecycle"
)

type PodUpdateInfo struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/collaset/utils/condition.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

appsv1alpha1 "kusionstack.io/kafed/apis/apps/v1alpha1"
appsv1alpha1 "kusionstack.io/operating/apis/apps/v1alpha1"
)

const ConditionUpdatePeriodBackOff = 30 * time.Second
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/collaset/utils/expectation.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package utils
import (
"sigs.k8s.io/controller-runtime/pkg/client"

"kusionstack.io/kafed/pkg/controllers/utils/expectations"
"kusionstack.io/operating/pkg/controllers/utils/expectations"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/collaset/utils/lifecycle_adapter.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package utils
import (
"sigs.k8s.io/controller-runtime/pkg/client"

appsv1alpha1 "kusionstack.io/kafed/apis/apps/v1alpha1"
"kusionstack.io/kafed/pkg/controllers/utils/podopslifecycle"
appsv1alpha1 "kusionstack.io/operating/apis/apps/v1alpha1"
"kusionstack.io/operating/pkg/controllers/utils/podopslifecycle"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions pkg/controllers/collaset/utils/pod.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

appsv1alpha1 "kusionstack.io/kafed/apis/apps/v1alpha1"
controllerutils "kusionstack.io/kafed/pkg/controllers/utils"
"kusionstack.io/kafed/pkg/utils"
appsv1alpha1 "kusionstack.io/operating/apis/apps/v1alpha1"
controllerutils "kusionstack.io/operating/pkg/controllers/utils"
"kusionstack.io/operating/pkg/utils"
)

type PodWrapper struct {
Expand Down
Loading

0 comments on commit 3ba5a5a

Please sign in to comment.