Skip to content

Improves sts reconciliation #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 7, 2023
Merged

Improves sts reconciliation #24

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8105edf
adds more statefulset reconciliation
sklarsa Aug 5, 2023
e90741c
Adds configurable security context
sklarsa Aug 6, 2023
7d3de53
unit tests and caught a pvc resizing bug
sklarsa Aug 6, 2023
d6d2cb6
fix test
sklarsa Aug 6, 2023
54da94d
fix
sklarsa Aug 6, 2023
15474dd
fix webhook
sklarsa Aug 6, 2023
6ddf49c
fixes
sklarsa Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adds configurable security context
  • Loading branch information
@sklarsa
sklarsa committed Aug 6, 2023
commit e90741c5e499966c88990df539b564e0b4bdbc24
1 change: 1 addition & 0 deletions api/v1beta1/questdb_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ type QuestDBSpec struct {
ImagePullSecrets []v1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
NodeSelector map[string]string `json:"nodeSelector,omitempty"`
PodAnnotations map[string]string `json:"podAnnotations,omitempty"`
PodSecurityContext v1.PodSecurityContext `json:"podSecurityContext,omitempty"`
Resources QuestDBResourcesSpec `json:"resources,omitempty"`
StatefulSetAnnotations map[string]string `json:"statefulSetAnnotations,omitempty"`
Tolerations []v1.Toleration `json:"tolerations,omitempty"`
Expand Down
17 changes: 7 additions & 10 deletions internal/controller/questdb_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/source"

"github.com/davecgh/go-spew/spew"
crdv1beta1 "github.com/questdb/questdb-operator/api/v1beta1"
"github.com/questdb/questdb-operator/internal/secrets"

Expand Down Expand Up @@ -225,10 +224,8 @@ func (r *QuestDBReconciler) buildStatefulSet(q *crdv1beta1.QuestDB, s secrets.Qu
},
ImagePullSecrets: q.Spec.ImagePullSecrets,
NodeSelector: q.Spec.NodeSelector,
SecurityContext: &v1.PodSecurityContext{
FSGroup: pointer.Int64(10001),
},
Tolerations: q.Spec.Tolerations,
SecurityContext: &q.Spec.PodSecurityContext,
Tolerations: q.Spec.Tolerations,
Volumes: append([]v1.Volume{
{
Name: "data",
Expand Down Expand Up @@ -319,20 +316,20 @@ func (r *QuestDBReconciler) reconcileStatefulSet(ctx context.Context, q *crdv1be
}

if !reflect.DeepEqual(actual.Spec.Template.Spec.Containers, desired.Spec.Template.Spec.Containers) {
spew.Dump(actual.Spec.Template.Spec.Containers)
spew.Dump(desired.Spec.Template.Spec.Containers)
actual.Spec.Template.Spec.Containers = desired.Spec.Template.Spec.Containers
needsUpdate = true

}

if !reflect.DeepEqual(actual.Spec.Template.Spec.Volumes, desired.Spec.Template.Spec.Volumes) {
spew.Dump(actual.Spec.Template.Spec.Volumes)
spew.Dump(desired.Spec.Template.Spec.Volumes)
actual.Spec.Template.Spec.Volumes = desired.Spec.Template.Spec.Volumes
needsUpdate = true
}

if !reflect.DeepEqual(actual.Spec.Template.Spec.SecurityContext, desired.Spec.Template.Spec.SecurityContext) {
actual.Spec.Template.Spec.SecurityContext = desired.Spec.Template.Spec.SecurityContext
needsUpdate = true
}

if needsUpdate {
if err = r.Update(ctx, actual); err != nil {
r.Recorder.Event(q, v1.EventTypeWarning, "StatefulSetUpdateFailed", err.Error())
Expand Down