Compare commits
No commits in common. "master" and "readme_adjustments" have entirely different histories.
master
...
readme_adj
|
@ -79,6 +79,3 @@ tags
|
||||||
### GoLand ###
|
### GoLand ###
|
||||||
.idea
|
.idea
|
||||||
bin/*
|
bin/*
|
||||||
|
|
||||||
## asdf
|
|
||||||
.tool-versions
|
|
||||||
|
|
201
LICENSE
201
LICENSE
|
@ -1,201 +0,0 @@
|
||||||
Apache License
|
|
||||||
Version 2.0, January 2004
|
|
||||||
http://www.apache.org/licenses/
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
||||||
|
|
||||||
1. Definitions.
|
|
||||||
|
|
||||||
"License" shall mean the terms and conditions for use, reproduction,
|
|
||||||
and distribution as defined by Sections 1 through 9 of this document.
|
|
||||||
|
|
||||||
"Licensor" shall mean the copyright owner or entity authorized by
|
|
||||||
the copyright owner that is granting the License.
|
|
||||||
|
|
||||||
"Legal Entity" shall mean the union of the acting entity and all
|
|
||||||
other entities that control, are controlled by, or are under common
|
|
||||||
control with that entity. For the purposes of this definition,
|
|
||||||
"control" means (i) the power, direct or indirect, to cause the
|
|
||||||
direction or management of such entity, whether by contract or
|
|
||||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
||||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
||||||
|
|
||||||
"You" (or "Your") shall mean an individual or Legal Entity
|
|
||||||
exercising permissions granted by this License.
|
|
||||||
|
|
||||||
"Source" form shall mean the preferred form for making modifications,
|
|
||||||
including but not limited to software source code, documentation
|
|
||||||
source, and configuration files.
|
|
||||||
|
|
||||||
"Object" form shall mean any form resulting from mechanical
|
|
||||||
transformation or translation of a Source form, including but
|
|
||||||
not limited to compiled object code, generated documentation,
|
|
||||||
and conversions to other media types.
|
|
||||||
|
|
||||||
"Work" shall mean the work of authorship, whether in Source or
|
|
||||||
Object form, made available under the License, as indicated by a
|
|
||||||
copyright notice that is included in or attached to the work
|
|
||||||
(an example is provided in the Appendix below).
|
|
||||||
|
|
||||||
"Derivative Works" shall mean any work, whether in Source or Object
|
|
||||||
form, that is based on (or derived from) the Work and for which the
|
|
||||||
editorial revisions, annotations, elaborations, or other modifications
|
|
||||||
represent, as a whole, an original work of authorship. For the purposes
|
|
||||||
of this License, Derivative Works shall not include works that remain
|
|
||||||
separable from, or merely link (or bind by name) to the interfaces of,
|
|
||||||
the Work and Derivative Works thereof.
|
|
||||||
|
|
||||||
"Contribution" shall mean any work of authorship, including
|
|
||||||
the original version of the Work and any modifications or additions
|
|
||||||
to that Work or Derivative Works thereof, that is intentionally
|
|
||||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
||||||
or by an individual or Legal Entity authorized to submit on behalf of
|
|
||||||
the copyright owner. For the purposes of this definition, "submitted"
|
|
||||||
means any form of electronic, verbal, or written communication sent
|
|
||||||
to the Licensor or its representatives, including but not limited to
|
|
||||||
communication on electronic mailing lists, source code control systems,
|
|
||||||
and issue tracking systems that are managed by, or on behalf of, the
|
|
||||||
Licensor for the purpose of discussing and improving the Work, but
|
|
||||||
excluding communication that is conspicuously marked or otherwise
|
|
||||||
designated in writing by the copyright owner as "Not a Contribution."
|
|
||||||
|
|
||||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
||||||
on behalf of whom a Contribution has been received by Licensor and
|
|
||||||
subsequently incorporated within the Work.
|
|
||||||
|
|
||||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
||||||
this License, each Contributor hereby grants to You a perpetual,
|
|
||||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
||||||
copyright license to reproduce, prepare Derivative Works of,
|
|
||||||
publicly display, publicly perform, sublicense, and distribute the
|
|
||||||
Work and such Derivative Works in Source or Object form.
|
|
||||||
|
|
||||||
3. Grant of Patent License. Subject to the terms and conditions of
|
|
||||||
this License, each Contributor hereby grants to You a perpetual,
|
|
||||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
||||||
(except as stated in this section) patent license to make, have made,
|
|
||||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
||||||
where such license applies only to those patent claims licensable
|
|
||||||
by such Contributor that are necessarily infringed by their
|
|
||||||
Contribution(s) alone or by combination of their Contribution(s)
|
|
||||||
with the Work to which such Contribution(s) was submitted. If You
|
|
||||||
institute patent litigation against any entity (including a
|
|
||||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
||||||
or a Contribution incorporated within the Work constitutes direct
|
|
||||||
or contributory patent infringement, then any patent licenses
|
|
||||||
granted to You under this License for that Work shall terminate
|
|
||||||
as of the date such litigation is filed.
|
|
||||||
|
|
||||||
4. Redistribution. You may reproduce and distribute copies of the
|
|
||||||
Work or Derivative Works thereof in any medium, with or without
|
|
||||||
modifications, and in Source or Object form, provided that You
|
|
||||||
meet the following conditions:
|
|
||||||
|
|
||||||
(a) You must give any other recipients of the Work or
|
|
||||||
Derivative Works a copy of this License; and
|
|
||||||
|
|
||||||
(b) You must cause any modified files to carry prominent notices
|
|
||||||
stating that You changed the files; and
|
|
||||||
|
|
||||||
(c) You must retain, in the Source form of any Derivative Works
|
|
||||||
that You distribute, all copyright, patent, trademark, and
|
|
||||||
attribution notices from the Source form of the Work,
|
|
||||||
excluding those notices that do not pertain to any part of
|
|
||||||
the Derivative Works; and
|
|
||||||
|
|
||||||
(d) If the Work includes a "NOTICE" text file as part of its
|
|
||||||
distribution, then any Derivative Works that You distribute must
|
|
||||||
include a readable copy of the attribution notices contained
|
|
||||||
within such NOTICE file, excluding those notices that do not
|
|
||||||
pertain to any part of the Derivative Works, in at least one
|
|
||||||
of the following places: within a NOTICE text file distributed
|
|
||||||
as part of the Derivative Works; within the Source form or
|
|
||||||
documentation, if provided along with the Derivative Works; or,
|
|
||||||
within a display generated by the Derivative Works, if and
|
|
||||||
wherever such third-party notices normally appear. The contents
|
|
||||||
of the NOTICE file are for informational purposes only and
|
|
||||||
do not modify the License. You may add Your own attribution
|
|
||||||
notices within Derivative Works that You distribute, alongside
|
|
||||||
or as an addendum to the NOTICE text from the Work, provided
|
|
||||||
that such additional attribution notices cannot be construed
|
|
||||||
as modifying the License.
|
|
||||||
|
|
||||||
You may add Your own copyright statement to Your modifications and
|
|
||||||
may provide additional or different license terms and conditions
|
|
||||||
for use, reproduction, or distribution of Your modifications, or
|
|
||||||
for any such Derivative Works as a whole, provided Your use,
|
|
||||||
reproduction, and distribution of the Work otherwise complies with
|
|
||||||
the conditions stated in this License.
|
|
||||||
|
|
||||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
||||||
any Contribution intentionally submitted for inclusion in the Work
|
|
||||||
by You to the Licensor shall be under the terms and conditions of
|
|
||||||
this License, without any additional terms or conditions.
|
|
||||||
Notwithstanding the above, nothing herein shall supersede or modify
|
|
||||||
the terms of any separate license agreement you may have executed
|
|
||||||
with Licensor regarding such Contributions.
|
|
||||||
|
|
||||||
6. Trademarks. This License does not grant permission to use the trade
|
|
||||||
names, trademarks, service marks, or product names of the Licensor,
|
|
||||||
except as required for reasonable and customary use in describing the
|
|
||||||
origin of the Work and reproducing the content of the NOTICE file.
|
|
||||||
|
|
||||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
||||||
agreed to in writing, Licensor provides the Work (and each
|
|
||||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
||||||
implied, including, without limitation, any warranties or conditions
|
|
||||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
||||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
||||||
appropriateness of using or redistributing the Work and assume any
|
|
||||||
risks associated with Your exercise of permissions under this License.
|
|
||||||
|
|
||||||
8. Limitation of Liability. In no event and under no legal theory,
|
|
||||||
whether in tort (including negligence), contract, or otherwise,
|
|
||||||
unless required by applicable law (such as deliberate and grossly
|
|
||||||
negligent acts) or agreed to in writing, shall any Contributor be
|
|
||||||
liable to You for damages, including any direct, indirect, special,
|
|
||||||
incidental, or consequential damages of any character arising as a
|
|
||||||
result of this License or out of the use or inability to use the
|
|
||||||
Work (including but not limited to damages for loss of goodwill,
|
|
||||||
work stoppage, computer failure or malfunction, or any and all
|
|
||||||
other commercial damages or losses), even if such Contributor
|
|
||||||
has been advised of the possibility of such damages.
|
|
||||||
|
|
||||||
9. Accepting Warranty or Additional Liability. While redistributing
|
|
||||||
the Work or Derivative Works thereof, You may choose to offer,
|
|
||||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
||||||
or other liability obligations and/or rights consistent with this
|
|
||||||
License. However, in accepting such obligations, You may act only
|
|
||||||
on Your own behalf and on Your sole responsibility, not on behalf
|
|
||||||
of any other Contributor, and only if You agree to indemnify,
|
|
||||||
defend, and hold each Contributor harmless for any liability
|
|
||||||
incurred by, or claims asserted against, such Contributor by reason
|
|
||||||
of your accepting any such warranty or additional liability.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
APPENDIX: How to apply the Apache License to your work.
|
|
||||||
|
|
||||||
To apply the Apache License to your work, attach the following
|
|
||||||
boilerplate notice, with the fields enclosed by brackets "{}"
|
|
||||||
replaced with your own identifying information. (Don't include
|
|
||||||
the brackets!) The text should be enclosed in the appropriate
|
|
||||||
comment syntax for the file format. We also recommend that a
|
|
||||||
file or class name and description of purpose be included on the
|
|
||||||
same "printed page" as the copyright notice for easier
|
|
||||||
identification within third-party archives.
|
|
||||||
|
|
||||||
Copyright 2016 Chris Lu
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
9
Makefile
9
Makefile
|
@ -1,5 +1,5 @@
|
||||||
# Current Operator version
|
# Current Operator version
|
||||||
VERSION ?= v0.0.2
|
VERSION ?= v0.0.1
|
||||||
# Default bundle image tag
|
# Default bundle image tag
|
||||||
BUNDLE_IMG ?= controller-bundle:$(VERSION)
|
BUNDLE_IMG ?= controller-bundle:$(VERSION)
|
||||||
# Options for 'bundle-build'
|
# Options for 'bundle-build'
|
||||||
|
@ -12,9 +12,9 @@ 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 ?= gfxlabs/seaweedfs-operator:$(VERSION)
|
IMG ?= chrislusf/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,preserveUnknownFields=false"
|
CRD_OPTIONS ?= "crd:trivialVersions=true"
|
||||||
|
|
||||||
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
|
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
|
||||||
ifeq (,$(shell go env GOBIN))
|
ifeq (,$(shell go env GOBIN))
|
||||||
|
@ -78,8 +78,7 @@ generate: controller-gen
|
||||||
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
|
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
|
||||||
|
|
||||||
# Build the docker image
|
# Build the docker image
|
||||||
docker-build: # test
|
docker-build: test
|
||||||
echo ${IMG}
|
|
||||||
docker build . -t ${IMG}
|
docker build . -t ${IMG}
|
||||||
|
|
||||||
# Push the docker image
|
# Push the docker image
|
||||||
|
|
48
README.md
48
README.md
|
@ -48,58 +48,22 @@ $ make deploy
|
||||||
|
|
||||||
Verify if it was correctly deployed with:
|
Verify if it was correctly deployed with:
|
||||||
```bash
|
```bash
|
||||||
$ kubectl get pods --all-namespaces
|
$ kubectl get Seaweed --all-namespaces
|
||||||
```
|
```
|
||||||
|
|
||||||
Which may return:
|
Which should return:
|
||||||
```bash
|
```bash
|
||||||
NAMESPACE NAME READY STATUS RESTARTS AGE
|
NAMESPACE NAME AGE
|
||||||
kube-system coredns-f9fd979d6-68p4c 1/1 Running 0 34m
|
seaweed seaweed 1h
|
||||||
kube-system coredns-f9fd979d6-x992t 1/1 Running 0 34m
|
|
||||||
kube-system etcd-kind-control-plane 1/1 Running 0 34m
|
|
||||||
kube-system kindnet-rp7wr 1/1 Running 0 34m
|
|
||||||
kube-system kube-apiserver-kind-control-plane 1/1 Running 0 34m
|
|
||||||
kube-system kube-controller-manager-kind-control-plane 1/1 Running 0 34m
|
|
||||||
kube-system kube-proxy-dqfg2 1/1 Running 0 34m
|
|
||||||
kube-system kube-scheduler-kind-control-plane 1/1 Running 0 34m
|
|
||||||
local-path-storage local-path-provisioner-78776bfc44-7zvxx 1/1 Running 0 34m
|
|
||||||
seaweedfs-operator-system seaweedfs-operator-controller-manager-54cc768f4c-cwz2k 2/2 Running 0 34m
|
|
||||||
```
|
```
|
||||||
|
|
||||||
See the next section for example usage - **__at this point you only deployed the Operator itself!__**
|
See the next section for example usage
|
||||||
|
|
||||||
### You need to also deploy an configuration to get it running (see next section)!
|
|
||||||
|
|
||||||
|
|
||||||
## Configuration Examples
|
## Configuration Examples
|
||||||
|
|
||||||
- Please send us your use-cases / example configs ... this is currently empty (needs to be written)
|
- Please send us your use-cases / example configs ... this is currently empty (needs to be written)
|
||||||
- For now see: https://github.com/seaweedfs/seaweedfs-operator/blob/master/config/samples/seaweed_v1_seaweed.yaml
|
- For now see: https://github.com/seaweedfs/seaweedfs-operator/blob/readme_adjustments/config/samples/seaweed_v1_seaweed.yaml
|
||||||
````
|
|
||||||
apiVersion: seaweed.seaweedfs.com/v1
|
|
||||||
kind: Seaweed
|
|
||||||
metadata:
|
|
||||||
name: seaweed1
|
|
||||||
namespace: default
|
|
||||||
spec:
|
|
||||||
# Add fields here
|
|
||||||
image: chrislusf/seaweedfs:2.96
|
|
||||||
volumeServerDiskCount: 1
|
|
||||||
hostSuffix: seaweed.abcdefg.com
|
|
||||||
master:
|
|
||||||
replicas: 3
|
|
||||||
volumeSizeLimitMB: 1024
|
|
||||||
volume:
|
|
||||||
replicas: 1
|
|
||||||
requests:
|
|
||||||
storage: 2Gi
|
|
||||||
filer:
|
|
||||||
replicas: 2
|
|
||||||
config: |
|
|
||||||
[leveldb2]
|
|
||||||
enabled = true
|
|
||||||
dir = "/data/filerldb2"
|
|
||||||
````
|
|
||||||
|
|
||||||
|
|
||||||
## Maintenance and Uninstallation
|
## Maintenance and Uninstallation
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
//go:build !ignore_autogenerated
|
|
||||||
// +build !ignore_autogenerated
|
// +build !ignore_autogenerated
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
# The following manifests contain a self-signed issuer CR and a certificate CR.
|
# The following manifests contain a self-signed issuer CR and a certificate CR.
|
||||||
# More document can be found at https://docs.cert-manager.io
|
# More document can be found at https://docs.cert-manager.io
|
||||||
# WARNING: Targets CertManager 1.7
|
# WARNING: Targets CertManager 0.11 check https://docs.cert-manager.io/en/latest/tasks/upgrading/index.html for
|
||||||
apiVersion: cert-manager.io/v1
|
# breaking changes
|
||||||
|
apiVersion: cert-manager.io/v1alpha2
|
||||||
kind: Issuer
|
kind: Issuer
|
||||||
metadata:
|
metadata:
|
||||||
name: selfsigned-issuer
|
name: selfsigned-issuer
|
||||||
|
@ -9,7 +10,7 @@ metadata:
|
||||||
spec:
|
spec:
|
||||||
selfSigned: {}
|
selfSigned: {}
|
||||||
---
|
---
|
||||||
apiVersion: cert-manager.io/v1
|
apiVersion: cert-manager.io/v1alpha2
|
||||||
kind: Certificate
|
kind: Certificate
|
||||||
metadata:
|
metadata:
|
||||||
name: serving-cert # this name should match the one appeared in kustomizeconfig.yaml
|
name: serving-cert # this name should match the one appeared in kustomizeconfig.yaml
|
||||||
|
|
|
@ -14,7 +14,6 @@ spec:
|
||||||
listKind: SeaweedList
|
listKind: SeaweedList
|
||||||
plural: seaweeds
|
plural: seaweeds
|
||||||
singular: seaweed
|
singular: seaweed
|
||||||
preserveUnknownFields: false
|
|
||||||
scope: Namespaced
|
scope: Namespaced
|
||||||
subresources:
|
subresources:
|
||||||
status: {}
|
status: {}
|
||||||
|
|
|
@ -6,8 +6,15 @@ resources:
|
||||||
# +kubebuilder:scaffold:crdkustomizeresource
|
# +kubebuilder:scaffold:crdkustomizeresource
|
||||||
|
|
||||||
patchesStrategicMerge:
|
patchesStrategicMerge:
|
||||||
- patches/webhook_in_seaweeds.yaml
|
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
|
||||||
- patches/cainjection_in_seaweeds.yaml
|
# patches here are for enabling the conversion webhook for each CRD
|
||||||
|
#- patches/webhook_in_seaweeds.yaml
|
||||||
|
# +kubebuilder:scaffold:crdkustomizewebhookpatch
|
||||||
|
|
||||||
|
# [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix.
|
||||||
|
# patches here are for enabling the CA injection for each CRD
|
||||||
|
#- patches/cainjection_in_seaweeds.yaml
|
||||||
|
# +kubebuilder:scaffold:crdkustomizecainjectionpatch
|
||||||
|
|
||||||
# the following config is for teaching kustomize how to do kustomization for CRDs.
|
# the following config is for teaching kustomize how to do kustomization for CRDs.
|
||||||
configurations:
|
configurations:
|
||||||
|
|
|
@ -16,42 +16,55 @@ bases:
|
||||||
- ../crd
|
- ../crd
|
||||||
- ../rbac
|
- ../rbac
|
||||||
- ../manager
|
- ../manager
|
||||||
- ../webhook
|
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
|
||||||
- ../certmanager
|
# crd/kustomization.yaml
|
||||||
- ../prometheus
|
#- ../webhook
|
||||||
|
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.
|
||||||
|
#- ../certmanager
|
||||||
|
# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
|
||||||
|
#- ../prometheus
|
||||||
|
|
||||||
patchesStrategicMerge:
|
patchesStrategicMerge:
|
||||||
# Protect the /metrics endpoint by putting it behind auth.
|
# Protect the /metrics endpoint by putting it behind auth.
|
||||||
# If you want your controller-manager to expose the /metrics
|
# If you want your controller-manager to expose the /metrics
|
||||||
# endpoint w/o any authn/z, please comment the following line.
|
# endpoint w/o any authn/z, please comment the following line.
|
||||||
- manager_auth_proxy_patch.yaml
|
- manager_auth_proxy_patch.yaml
|
||||||
- manager_webhook_patch.yaml
|
|
||||||
- webhookcainjection_patch.yaml
|
|
||||||
|
|
||||||
|
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
|
||||||
|
# crd/kustomization.yaml
|
||||||
|
#- manager_webhook_patch.yaml
|
||||||
|
|
||||||
|
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'.
|
||||||
|
# Uncomment 'CERTMANAGER' sections in crd/kustomization.yaml to enable the CA injection in the admission webhooks.
|
||||||
|
# 'CERTMANAGER' needs to be enabled to use ca injection
|
||||||
|
#- webhookcainjection_patch.yaml
|
||||||
|
|
||||||
|
# the following config is for teaching kustomize how to do var substitution
|
||||||
vars:
|
vars:
|
||||||
- name: CERTIFICATE_NAMESPACE # namespace of the certificate CR
|
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER' prefix.
|
||||||
objref:
|
#- name: CERTIFICATE_NAMESPACE # namespace of the certificate CR
|
||||||
kind: Certificate
|
# objref:
|
||||||
group: cert-manager.io
|
# kind: Certificate
|
||||||
version: v1alpha2
|
# group: cert-manager.io
|
||||||
name: serving-cert # this name should match the one in certificate.yaml
|
# version: v1alpha2
|
||||||
fieldref:
|
# name: serving-cert # this name should match the one in certificate.yaml
|
||||||
fieldpath: metadata.namespace
|
# fieldref:
|
||||||
- name: CERTIFICATE_NAME
|
# fieldpath: metadata.namespace
|
||||||
objref:
|
#- name: CERTIFICATE_NAME
|
||||||
kind: Certificate
|
# objref:
|
||||||
group: cert-manager.io
|
# kind: Certificate
|
||||||
version: v1alpha2
|
# group: cert-manager.io
|
||||||
name: serving-cert # this name should match the one in certificate.yaml
|
# version: v1alpha2
|
||||||
- name: SERVICE_NAMESPACE # namespace of the service
|
# name: serving-cert # this name should match the one in certificate.yaml
|
||||||
objref:
|
#- name: SERVICE_NAMESPACE # namespace of the service
|
||||||
kind: Service
|
# objref:
|
||||||
version: v1
|
# kind: Service
|
||||||
name: webhook-service
|
# version: v1
|
||||||
fieldref:
|
# name: webhook-service
|
||||||
fieldpath: metadata.namespace
|
# fieldref:
|
||||||
- name: SERVICE_NAME
|
# fieldpath: metadata.namespace
|
||||||
objref:
|
#- name: SERVICE_NAME
|
||||||
kind: Service
|
# objref:
|
||||||
version: v1
|
# kind: Service
|
||||||
name: webhook-service
|
# version: v1
|
||||||
|
# name: webhook-service
|
||||||
|
|
|
@ -30,13 +30,13 @@ spec:
|
||||||
image: controller:latest
|
image: controller:latest
|
||||||
env:
|
env:
|
||||||
- name: ENABLE_WEBHOOKS
|
- name: ENABLE_WEBHOOKS
|
||||||
value: "true"
|
value: "false"
|
||||||
name: manager
|
name: manager
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpu: 100m
|
cpu: 100m
|
||||||
memory: 100Mi
|
memory: 30Mi
|
||||||
requests:
|
requests:
|
||||||
cpu: 100m
|
cpu: 100m
|
||||||
memory: 50Mi
|
memory: 20Mi
|
||||||
terminationGracePeriodSeconds: 10
|
terminationGracePeriodSeconds: 10
|
||||||
|
|
|
@ -5,7 +5,7 @@ metadata:
|
||||||
namespace: default
|
namespace: default
|
||||||
spec:
|
spec:
|
||||||
# Add fields here
|
# Add fields here
|
||||||
image: chrislusf/seaweedfs:2.96
|
image: chrislusf/seaweedfs:2.52
|
||||||
volumeServerDiskCount: 1
|
volumeServerDiskCount: 1
|
||||||
hostSuffix: seaweed.abcdefg.com
|
hostSuffix: seaweed.abcdefg.com
|
||||||
master:
|
master:
|
||||||
|
|
|
@ -24,7 +24,6 @@ webhooks:
|
||||||
- UPDATE
|
- UPDATE
|
||||||
resources:
|
resources:
|
||||||
- seaweeds
|
- seaweeds
|
||||||
timeoutSeconds: 15
|
|
||||||
|
|
||||||
---
|
---
|
||||||
apiVersion: admissionregistration.k8s.io/v1beta1
|
apiVersion: admissionregistration.k8s.io/v1beta1
|
||||||
|
@ -51,4 +50,3 @@ webhooks:
|
||||||
- UPDATE
|
- UPDATE
|
||||||
resources:
|
resources:
|
||||||
- seaweeds
|
- seaweeds
|
||||||
timeoutSeconds: 15
|
|
||||||
|
|
|
@ -13,9 +13,10 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
func buildFilerStartupScript(m *seaweedv1.Seaweed) string {
|
func buildFilerStartupScript(m *seaweedv1.Seaweed) string {
|
||||||
commands := []string{"weed", "-logtostderr=true", "filer"}
|
commands := []string{"weed", "filer"}
|
||||||
commands = append(commands, fmt.Sprintf("-port=%d", seaweedv1.FilerHTTPPort))
|
commands = append(commands, fmt.Sprintf("-port=%d", seaweedv1.FilerHTTPPort))
|
||||||
commands = append(commands, fmt.Sprintf("-ip=$(POD_NAME).%s-filer-peer.%s", m.Name, m.Namespace))
|
commands = append(commands, fmt.Sprintf("-ip=$(POD_NAME).%s-filer-peer.%s", m.Name, m.Namespace))
|
||||||
|
commands = append(commands, fmt.Sprintf("-peers=%s", getFilerPeersString(m.Name, m.Namespace, m.Spec.Filer.Replicas)))
|
||||||
commands = append(commands, fmt.Sprintf("-master=%s", getMasterPeersString(m)))
|
commands = append(commands, fmt.Sprintf("-master=%s", getMasterPeersString(m)))
|
||||||
commands = append(commands, "-s3")
|
commands = append(commands, "-s3")
|
||||||
|
|
||||||
|
|
|
@ -93,7 +93,6 @@ func (r *SeaweedReconciler) ensureMasterStatefulSet(seaweedCR *seaweedv1.Seaweed
|
||||||
existingStatefulSet := existing.(*appsv1.StatefulSet)
|
existingStatefulSet := existing.(*appsv1.StatefulSet)
|
||||||
desiredStatefulSet := desired.(*appsv1.StatefulSet)
|
desiredStatefulSet := desired.(*appsv1.StatefulSet)
|
||||||
|
|
||||||
existingStatefulSet.Spec.Replicas = desiredStatefulSet.Spec.Replicas
|
|
||||||
existingStatefulSet.Spec.Template.Spec = desiredStatefulSet.Spec.Template.Spec
|
existingStatefulSet.Spec.Template.Spec = desiredStatefulSet.Spec.Template.Spec
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
|
|
|
@ -13,7 +13,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
func buildMasterStartupScript(m *seaweedv1.Seaweed) string {
|
func buildMasterStartupScript(m *seaweedv1.Seaweed) string {
|
||||||
command := []string{"weed", "-logtostderr=true", "master"}
|
command := []string{"weed", "master"}
|
||||||
spec := m.Spec.Master
|
spec := m.Spec.Master
|
||||||
if spec.VolumePreallocate != nil && *spec.VolumePreallocate {
|
if spec.VolumePreallocate != nil && *spec.VolumePreallocate {
|
||||||
command = append(command, "-volumePreallocate")
|
command = append(command, "-volumePreallocate")
|
||||||
|
@ -31,10 +31,6 @@ func buildMasterStartupScript(m *seaweedv1.Seaweed) string {
|
||||||
command = append(command, fmt.Sprintf("-pulseSeconds=%d", *spec.PulseSeconds))
|
command = append(command, fmt.Sprintf("-pulseSeconds=%d", *spec.PulseSeconds))
|
||||||
}
|
}
|
||||||
|
|
||||||
if spec.DefaultReplication != nil {
|
|
||||||
command = append(command, fmt.Sprintf("-defaultReplication=%s", *spec.DefaultReplication))
|
|
||||||
}
|
|
||||||
|
|
||||||
command = append(command, fmt.Sprintf("-ip=$(POD_NAME).%s-master-peer.%s", m.Name, m.Namespace))
|
command = append(command, fmt.Sprintf("-ip=$(POD_NAME).%s-master-peer.%s", m.Name, m.Namespace))
|
||||||
command = append(command, fmt.Sprintf("-peers=%s", getMasterPeersString(m)))
|
command = append(command, fmt.Sprintf("-peers=%s", getMasterPeersString(m)))
|
||||||
return strings.Join(command, " ")
|
return strings.Join(command, " ")
|
||||||
|
|
|
@ -13,7 +13,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
func buildVolumeServerStartupScript(m *seaweedv1.Seaweed, dirs []string) string {
|
func buildVolumeServerStartupScript(m *seaweedv1.Seaweed, dirs []string) string {
|
||||||
commands := []string{"weed", "-logtostderr=true", "volume"}
|
commands := []string{"weed", "volume"}
|
||||||
commands = append(commands, fmt.Sprintf("-port=%d", seaweedv1.VolumeHTTPPort))
|
commands = append(commands, fmt.Sprintf("-port=%d", seaweedv1.VolumeHTTPPort))
|
||||||
commands = append(commands, "-max=0")
|
commands = append(commands, "-max=0")
|
||||||
commands = append(commands, fmt.Sprintf("-ip=$(POD_NAME).%s-volume-peer.%s", m.Name, m.Namespace))
|
commands = append(commands, fmt.Sprintf("-ip=$(POD_NAME).%s-volume-peer.%s", m.Name, m.Namespace))
|
||||||
|
|
|
@ -11,6 +11,7 @@ import (
|
||||||
|
|
||||||
const (
|
const (
|
||||||
masterPeerAddressPattern = "%s-master-%d.%s-master-peer.%s:9333"
|
masterPeerAddressPattern = "%s-master-%d.%s-master-peer.%s:9333"
|
||||||
|
filerPeerAddressPattern = "%s-filer-%d.%s-filer-peer.%s:8888"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
@ -49,6 +50,18 @@ func ReconcileResult(err error) (bool, ctrl.Result, error) {
|
||||||
return false, ctrl.Result{}, nil
|
return false, ctrl.Result{}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func getFilerAddresses(name string, namespace string, replicas int32) []string {
|
||||||
|
peersAddresses := make([]string, 0, replicas)
|
||||||
|
for i := int32(0); i < replicas; i++ {
|
||||||
|
peersAddresses = append(peersAddresses, fmt.Sprintf(filerPeerAddressPattern, name, i, name, namespace))
|
||||||
|
}
|
||||||
|
return peersAddresses
|
||||||
|
}
|
||||||
|
|
||||||
|
func getFilerPeersString(name string, namespace string, replicas int32) string {
|
||||||
|
return strings.Join(getFilerAddresses(name, namespace, replicas), ",")
|
||||||
|
}
|
||||||
|
|
||||||
func getMasterAddresses(namespace string, name string, replicas int32) []string {
|
func getMasterAddresses(namespace string, name string, replicas int32) []string {
|
||||||
peersAddresses := make([]string, 0, replicas)
|
peersAddresses := make([]string, 0, replicas)
|
||||||
for i := int32(0); i < replicas; i++ {
|
for i := int32(0); i < replicas; i++ {
|
||||||
|
|
|
@ -39,7 +39,7 @@ var _ = Describe("Seaweed Controller", func() {
|
||||||
Name: name,
|
Name: name,
|
||||||
},
|
},
|
||||||
Spec: seaweedv1.SeaweedSpec{
|
Spec: seaweedv1.SeaweedSpec{
|
||||||
Image: "chrislusf/seaweedfs:2.96",
|
Image: "chrislusf/seaweedfs:2.52",
|
||||||
VolumeServerDiskCount: 1,
|
VolumeServerDiskCount: 1,
|
||||||
Master: &seaweedv1.MasterSpec{
|
Master: &seaweedv1.MasterSpec{
|
||||||
Replicas: 3,
|
Replicas: 3,
|
||||||
|
|
|
@ -24,7 +24,7 @@ func NewSeaweedAdmin(masters string, output io.Writer) *SeaweedAdmin {
|
||||||
commandEnv := shell.NewCommandEnv(shellOptions)
|
commandEnv := shell.NewCommandEnv(shellOptions)
|
||||||
reg, _ := regexp.Compile(`'.*?'|".*?"|\S+`)
|
reg, _ := regexp.Compile(`'.*?'|".*?"|\S+`)
|
||||||
|
|
||||||
go commandEnv.MasterClient.LoopConnectToMaster()
|
go commandEnv.MasterClient.KeepConnectedToMaster()
|
||||||
|
|
||||||
return &SeaweedAdmin{
|
return &SeaweedAdmin{
|
||||||
commandEnv: commandEnv,
|
commandEnv: commandEnv,
|
||||||
|
|
91
go.mod
91
go.mod
|
@ -1,101 +1,16 @@
|
||||||
module github.com/seaweedfs/seaweedfs-operator
|
module github.com/seaweedfs/seaweedfs-operator
|
||||||
|
|
||||||
go 1.17
|
go 1.13
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/chrislusf/seaweedfs v0.0.0-20211103083639-3c245c69d369
|
github.com/chrislusf/seaweedfs v0.0.0-20210110065522-f0d3b3bf9397
|
||||||
github.com/go-logr/logr v0.1.0
|
github.com/go-logr/logr v0.1.0
|
||||||
github.com/onsi/ginkgo v1.14.2
|
github.com/onsi/ginkgo v1.14.2
|
||||||
github.com/onsi/gomega v1.10.4
|
github.com/onsi/gomega v1.10.4
|
||||||
google.golang.org/grpc v1.40.0
|
google.golang.org/grpc v1.29.1
|
||||||
k8s.io/api v0.18.2
|
k8s.io/api v0.18.2
|
||||||
k8s.io/apimachinery v0.18.2
|
k8s.io/apimachinery v0.18.2
|
||||||
k8s.io/client-go v0.18.2
|
k8s.io/client-go v0.18.2
|
||||||
k8s.io/klog v1.0.0
|
k8s.io/klog v1.0.0
|
||||||
sigs.k8s.io/controller-runtime v0.6.0
|
sigs.k8s.io/controller-runtime v0.6.0
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
|
||||||
cloud.google.com/go v0.94.1 // indirect
|
|
||||||
github.com/aws/aws-sdk-go v1.35.3 // indirect
|
|
||||||
github.com/beorn7/perks v1.0.1 // indirect
|
|
||||||
github.com/cespare/xxhash/v2 v2.1.1 // indirect
|
|
||||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
|
||||||
github.com/disintegration/imaging v1.6.2 // indirect
|
|
||||||
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
|
|
||||||
github.com/fsnotify/fsnotify v1.4.9 // indirect
|
|
||||||
github.com/go-errors/errors v1.1.1 // indirect
|
|
||||||
github.com/go-logr/zapr v0.1.0 // indirect
|
|
||||||
github.com/gogo/protobuf v1.3.2 // indirect
|
|
||||||
github.com/golang-jwt/jwt v3.2.1+incompatible // indirect
|
|
||||||
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
|
|
||||||
github.com/golang/protobuf v1.5.2 // indirect
|
|
||||||
github.com/golang/snappy v0.0.4 // indirect
|
|
||||||
github.com/google/btree v1.0.0 // indirect
|
|
||||||
github.com/google/go-cmp v0.5.6 // indirect
|
|
||||||
github.com/google/gofuzz v1.1.0 // indirect
|
|
||||||
github.com/google/uuid v1.3.0 // indirect
|
|
||||||
github.com/googleapis/gax-go/v2 v2.1.0 // indirect
|
|
||||||
github.com/googleapis/gnostic v0.3.1 // indirect
|
|
||||||
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
|
|
||||||
github.com/hashicorp/golang-lru v0.5.1 // indirect
|
|
||||||
github.com/hashicorp/hcl v1.0.0 // indirect
|
|
||||||
github.com/imdario/mergo v0.3.6 // indirect
|
|
||||||
github.com/jmespath/go-jmespath v0.4.0 // indirect
|
|
||||||
github.com/json-iterator/go v1.1.11 // indirect
|
|
||||||
github.com/karlseguin/ccache/v2 v2.0.7 // indirect
|
|
||||||
github.com/klauspost/cpuid v1.2.1 // indirect
|
|
||||||
github.com/klauspost/reedsolomon v1.9.2 // indirect
|
|
||||||
github.com/magiconair/properties v1.8.1 // indirect
|
|
||||||
github.com/mattn/go-runewidth v0.0.7 // indirect
|
|
||||||
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
|
|
||||||
github.com/mitchellh/mapstructure v1.1.2 // indirect
|
|
||||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
|
||||||
github.com/modern-go/reflect2 v1.0.1 // indirect
|
|
||||||
github.com/nxadm/tail v1.4.4 // indirect
|
|
||||||
github.com/pelletier/go-toml v1.7.0 // indirect
|
|
||||||
github.com/peterh/liner v1.1.0 // indirect
|
|
||||||
github.com/pkg/errors v0.9.1 // indirect
|
|
||||||
github.com/prometheus/client_golang v1.11.0 // indirect
|
|
||||||
github.com/prometheus/client_model v0.2.0 // indirect
|
|
||||||
github.com/prometheus/common v0.26.0 // indirect
|
|
||||||
github.com/prometheus/procfs v0.6.0 // indirect
|
|
||||||
github.com/seaweedfs/goexif v1.0.2 // indirect
|
|
||||||
github.com/spf13/afero v1.6.0 // indirect
|
|
||||||
github.com/spf13/cast v1.3.0 // indirect
|
|
||||||
github.com/spf13/jwalterweatherman v1.1.0 // indirect
|
|
||||||
github.com/spf13/pflag v1.0.5 // indirect
|
|
||||||
github.com/spf13/viper v1.4.0 // indirect
|
|
||||||
github.com/syndtr/goleveldb v1.0.1-0.20190318030020-c3a204f8e965 // indirect
|
|
||||||
github.com/tylertreat/BoomFilters v0.0.0-20210315201527-1a82519a3e43 // indirect
|
|
||||||
github.com/valyala/bytebufferpool v1.0.0 // indirect
|
|
||||||
github.com/viant/ptrie v0.3.0 // indirect
|
|
||||||
github.com/viant/toolbox v0.33.2 // indirect
|
|
||||||
go.uber.org/atomic v1.7.0 // indirect
|
|
||||||
go.uber.org/multierr v1.7.0 // indirect
|
|
||||||
go.uber.org/zap v1.17.0 // indirect
|
|
||||||
golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect
|
|
||||||
golang.org/x/image v0.0.0-20200119044424-58c23975cae1 // indirect
|
|
||||||
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
|
|
||||||
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
|
|
||||||
golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365 // indirect
|
|
||||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
|
|
||||||
golang.org/x/text v0.3.6 // indirect
|
|
||||||
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
|
|
||||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
|
|
||||||
gomodules.xyz/jsonpatch/v2 v2.0.1 // indirect
|
|
||||||
google.golang.org/api v0.57.0 // indirect
|
|
||||||
google.golang.org/appengine v1.6.7 // indirect
|
|
||||||
google.golang.org/genproto v0.0.0-20210921142501-181ce0d877f6 // indirect
|
|
||||||
google.golang.org/protobuf v1.27.1 // indirect
|
|
||||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
|
|
||||||
gopkg.in/fsnotify.v1 v1.4.7 // indirect
|
|
||||||
gopkg.in/inf.v0 v0.9.1 // indirect
|
|
||||||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
|
|
||||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
|
||||||
k8s.io/apiextensions-apiserver v0.18.2 // indirect
|
|
||||||
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c // indirect
|
|
||||||
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 // indirect
|
|
||||||
sigs.k8s.io/structured-merge-diff/v3 v3.0.0 // indirect
|
|
||||||
sigs.k8s.io/yaml v1.2.0 // indirect
|
|
||||||
)
|
|
||||||
|
|
Loading…
Reference in New Issue