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

support upgrade

Browse Source
This commit is contained in:
Chris Lu 2020-10-17 02:25:23 -07:00
parent 4ea680c4c9
commit 4bb6f99cd8
9 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/v1/seaweed_types.go
View File

@ -31,6 +31,9 @@ type SeaweedSpec struct {
// MetricsAddress is Prometheus gateway address
MetricsAddress string `json:"metricsAddress,omitempty"`
// Image
Image string `json:"image,omitempty"`
// VolumeServerCount is the number of volume servers, default to 1
VolumeServerCount int32 `json:"volumeServerCount,omitempty"`

3
config/crd/bases/seaweed.seaweedfs.com_seaweeds.yaml
View File

@ -40,6 +40,9 @@ spec:
description: FilerCount is the number of filers, default to 1
format: int32
type: integer
image:
description: Image
type: string
metricsAddress:
description: MetricsAddress is Prometheus gateway address
type: string

1
config/samples/seaweed_v1_seaweed.yaml
View File

@ -4,5 +4,6 @@ metadata:
name: seaweed1
spec:
# Add fields here
image: chrislusf/seaweedfs:2.03
volumeServerCount: 4
filerCount: 2

4
controllers/controller_filer.go
View File

@ -49,8 +49,10 @@ func (r *SeaweedReconciler) ensureFilerStatefulSet(seaweedCR *seaweedv1.Seaweed)
return ReconcileResult(err)
}
if *filerStatefulSet.Spec.Replicas != seaweedCR.Spec.FilerCount {
if *filerStatefulSet.Spec.Replicas != seaweedCR.Spec.FilerCount ||
filerStatefulSet.Spec.Template.Spec.Containers[0].Image != seaweedCR.Spec.Image {
filerStatefulSet.Spec.Replicas = &seaweedCR.Spec.FilerCount
filerStatefulSet.Spec.Template.Spec.Containers[0].Image = seaweedCR.Spec.Image
if err = r.Update(ctx, filerStatefulSet); err != nil {
log.Error(err, "Failed to update filer statefulset", "Namespace", filerStatefulSet.Namespace, "Name", filerStatefulSet.Name)
return ReconcileResult(err)

2
controllers/controller_filer_statefulset.go
View File

@ -42,7 +42,7 @@ func (r *SeaweedReconciler) createFilerStatefulSet(m *seaweedv1.Seaweed) *appsv1
EnableServiceLinks: &enableServiceLinks,
Containers: []corev1.Container{{
Name: "seaweedfs",
Image: "chrislusf/seaweedfs:latest",
Image: m.Spec.Image,
ImagePullPolicy: corev1.PullIfNotPresent,
Env: []corev1.EnvVar{
{

14
controllers/controller_master.go
View File

@ -44,7 +44,7 @@ func (r *SeaweedReconciler) ensureMasterStatefulSet(seaweedCR *seaweedv1.Seaweed
log.Info("Creating a new master statefulset", "Namespace", dep.Namespace, "Name", dep.Name)
err = r.Create(ctx, dep)
if err != nil {
log.Error(err, "Failed to create new statefulset", "Namespace", dep.Namespace, "Name", dep.Name)
log.Error(err, "Failed to create master statefulset", "Namespace", dep.Namespace, "Name", dep.Name)
return ReconcileResult(err)
}
// sleep 60 seconds for DNS to have pod IP addresses ready
@ -55,6 +55,18 @@ func (r *SeaweedReconciler) ensureMasterStatefulSet(seaweedCR *seaweedv1.Seaweed
log.Error(err, "Failed to get Deployment")
return ReconcileResult(err)
}
log.Info("master version " + masterStatefulSet.Spec.Template.Spec.Containers[0].Image + " expected " + seaweedCR.Spec.Image)
if masterStatefulSet.Spec.Template.Spec.Containers[0].Image != seaweedCR.Spec.Image {
masterStatefulSet.Spec.Template.Spec.Containers[0].Image = seaweedCR.Spec.Image
if err = r.Update(ctx, masterStatefulSet); err != nil {
log.Error(err, "Failed to update master statefulset", "Namespace", masterStatefulSet.Namespace, "Name", masterStatefulSet.Name)
return ReconcileResult(err)
}
// Deployment created successfully - return and requeue
return ReconcileResult(err)
}
log.Info("Get master stateful set " + masterStatefulSet.Name)
return ReconcileResult(err)
}

2
controllers/controller_master_statefulset.go
View File

@ -56,7 +56,7 @@ func (r *SeaweedReconciler) createMasterStatefulSet(m *seaweedv1.Seaweed) *appsv
EnableServiceLinks: &enableServiceLinks,
Containers: []corev1.Container{{
Name: "seaweedfs",
Image: "chrislusf/seaweedfs:latest",
Image: m.Spec.Image,
ImagePullPolicy: corev1.PullIfNotPresent,
Env: []corev1.EnvVar{
{

4
controllers/controller_volume.go
View File

@ -49,8 +49,10 @@ func (r *SeaweedReconciler) ensureVolumeServerStatefulSet(seaweedCR *seaweedv1.S
return ReconcileResult(err)
}
if *volumeServerStatefulSet.Spec.Replicas != seaweedCR.Spec.VolumeServerCount {
if *volumeServerStatefulSet.Spec.Replicas != seaweedCR.Spec.VolumeServerCount ||
volumeServerStatefulSet.Spec.Template.Spec.Containers[0].Image != seaweedCR.Spec.Image {
volumeServerStatefulSet.Spec.Replicas = &seaweedCR.Spec.VolumeServerCount
volumeServerStatefulSet.Spec.Template.Spec.Containers[0].Image = seaweedCR.Spec.Image
if err = r.Update(ctx, volumeServerStatefulSet); err != nil {
log.Error(err, "Failed to update volume statefulset", "Namespace", volumeServerStatefulSet.Namespace, "Name", volumeServerStatefulSet.Name)
return ReconcileResult(err)

2
controllers/controller_volume_statefulset.go
View File

@ -42,7 +42,7 @@ func (r *SeaweedReconciler) createVolumeServerStatefulSet(m *seaweedv1.Seaweed)
EnableServiceLinks: &enableServiceLinks,
Containers: []corev1.Container{{
Name: "seaweedfs",
Image: "chrislusf/seaweedfs:latest",
Image: m.Spec.Image,
ImagePullPolicy: corev1.PullIfNotPresent,
Env: []corev1.EnvVar{
{