a
/
seaweedfs-operator
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add steps to develop inside k8s

This commit is contained in:
Chris Lu 2020-11-08 16:23:17 -08:00
parent b0f01a5e1a
commit 771312ddfb
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -12,7 +12,7 @@ endif
BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL) BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
# Image URL to use all building/pushing image targets # Image URL to use all building/pushing image targets
IMG ?= seaweedfs/operator:latest IMG ?= seaweedfs/operator:$(VERSION)
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion) # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
CRD_OPTIONS ?= "crd:trivialVersions=true" CRD_OPTIONS ?= "crd:trivialVersions=true"

9
README.md
View File

@ -20,10 +20,13 @@ $ git clone https://github.com/seaweedfs/seaweedfs-operator
$ cd seaweedfs-operator $ cd seaweedfs-operator
# register the CRD with the Kubernetes # register the CRD with the Kubernetes
$ make install $ make deploy
# run the operator locally outside the Kubernetes cluster # build the operator image
$ make run ENABLE_WEBHOOKS=false $ make docker-build
# load the image into Kind cluster
$ kind load docker-image seaweedfs/operator:v0.0.1
# From another terminal in the same directory # From another terminal in the same directory
$ kubectl apply -f config/samples/seaweed_v1_seaweed.yaml $ kubectl apply -f config/samples/seaweed_v1_seaweed.yaml

4
controllers/seaweed_maintenance.go
View File

@ -11,12 +11,10 @@ import (
func (r *SeaweedReconciler) maintenance(m *seaweedv1.Seaweed) (done bool, result ctrl.Result, err error) { func (r *SeaweedReconciler) maintenance(m *seaweedv1.Seaweed) (done bool, result ctrl.Result, err error) {
masters := getMasterPeersString(m.Name, m.Spec.Master.Replicas) masters := getMasterPeersString(m)
r.Log.V(0).Info("wait to connect to masters", "masters", masters) r.Log.V(0).Info("wait to connect to masters", "masters", masters)
return ReconcileResult(nil)
// this step blocks since the operator can not access the masters when running from outside of the k8s cluster // this step blocks since the operator can not access the masters when running from outside of the k8s cluster
sa := swadmin.NewSeaweedAdmin(masters, ioutil.Discard) sa := swadmin.NewSeaweedAdmin(masters, ioutil.Discard)

2
controllers/swadmin/seaweed_admin.go
View File

@ -25,7 +25,6 @@ func NewSeaweedAdmin(masters string, output io.Writer) *SeaweedAdmin {
reg, _ := regexp.Compile(`'.*?'|".*?"|\S+`) reg, _ := regexp.Compile(`'.*?'|".*?"|\S+`)
go commandEnv.MasterClient.KeepConnectedToMaster() go commandEnv.MasterClient.KeepConnectedToMaster()
commandEnv.MasterClient.WaitUntilConnected()
return &SeaweedAdmin{ return &SeaweedAdmin{
commandEnv: commandEnv, commandEnv: commandEnv,
@ -45,6 +44,7 @@ func (sa *SeaweedAdmin) ProcessCommands(cmds string) error {
} }
func (sa *SeaweedAdmin) ProcessCommand(cmd string) error { func (sa *SeaweedAdmin) ProcessCommand(cmd string) error {
sa.commandEnv.MasterClient.WaitUntilConnected()
cmds := sa.commandReg.FindAllString(cmd, -1) cmds := sa.commandReg.FindAllString(cmd, -1)
if len(cmds) == 0 { if len(cmds) == 0 {
return nil return nil