Skip to content

Commit

Permalink
Merge branch 'main' into fix/ipv6-labels-fun
Browse files Browse the repository at this point in the history
  • Loading branch information
@cyrinux
cyrinux authored Dec 12, 2024
2 parents cf69781 + b07f733 commit 7a7bb11
Show file tree
Hide file tree
Showing 7 changed files with 1,550 additions and 61 deletions.
8 changes: 8 additions & 0 deletions api/v1alpha1/dragonfly_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,11 @@ type DragonflySpec struct {
// +optional
// +kubebuilder:validation:Optional
ServiceSpec *ServiceSpec `json:"serviceSpec,omitempty"`

// (Optional) Dragonfly pod init containers
// +optional
// +kubebuilder:validation:Optional
InitContainers []corev1.Container `json:"initContainers,omitempty"`
}

type ServiceSpec struct {
Expand Down Expand Up @@ -211,6 +216,9 @@ type DragonflyStatus struct {

//+kubebuilder:object:root=true
//+kubebuilder:subresource:status
//+kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase",description="The current phase of the Dragonfly cluster"
//+kubebuilder:printcolumn:name="Rolling Update",type="boolean",JSONPath=".status.isRollingUpdate",description="Indicates if a rolling update is in progress"
//+kubebuilder:printcolumn:name="Replicas",type="integer",JSONPath=".spec.replicas",description="Number of replicas"

// Dragonfly is the Schema for the dragonflies API
type Dragonfly struct {
Expand Down
7 changes: 7 additions & 0 deletions api/v1alpha1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1,443 changes: 1,442 additions & 1 deletion config/crd/bases/dragonflydb.io_dragonflies.yaml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion e2e/dragonfly_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ var _ = Describe("Dragonfly Lifecycle tests", Ordered, FlakeAttempts(3), func()
}, &df)
Expect(err).To(BeNil())

df.Spec.Image = fmt.Sprintf("%s:%s", resources.DragonflyImage, "v1.23.2")
df.Spec.Image = fmt.Sprintf("%s:%s", resources.DragonflyImage, "v1.24.0")
err = k8sClient.Update(ctx, &df)
Expect(err).To(BeNil())
})
Expand Down
4 changes: 4 additions & 0 deletions internal/resources/resources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,10 @@ func GetDragonflyResources(ctx context.Context, df *resourcesv1.Dragonfly) ([]cl
},
}

if len(df.Spec.InitContainers) > 0 {
statefulset.Spec.Template.Spec.InitContainers = df.Spec.InitContainers
}

// Skip Assigning FileSystem Group. Required for platforms such as Openshift that require IDs to not be set, as it injects a fixed randomized ID per namespace into all pods.
if !df.Spec.SkipFSGroup {
statefulset.Spec.Template.Spec.SecurityContext = &corev1.PodSecurityContext{
Expand Down
2 changes: 1 addition & 1 deletion internal/resources/version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ limitations under the License.
package resources

const (
Version = "v1.24.0"
Version = "v1.25.5"
)
145 changes: 87 additions & 58 deletions monitoring/grafana-dashboard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
"uid": "${DS_PROMETHEUS}"
},
"exemplar": true,
"expr": "max(max_over_time(dragonfly_uptime_in_seconds{pod=~\"$instance\"}[$__interval]))",
"expr": "max(max_over_time(dragonfly_uptime_in_seconds{namespace=\"$namespace\",pod=~\"$instance\"}[$__interval]))",
"format": "time_series",
"interval": "",
"intervalFactor": 2,
Expand Down Expand Up @@ -248,7 +248,7 @@
"uid": "${DS_PROMETHEUS}"
},
"exemplar": true,
"expr": "dragonfly_connected_clients{pod=~\"$instance\"}",
"expr": "dragonfly_connected_clients{namespace=\"$namespace\",pod=~\"$instance\"}",
"format": "time_series",
"interval": "",
"intervalFactor": 2,
Expand Down Expand Up @@ -339,7 +339,7 @@
"uid": "${DS_PROMETHEUS}"
},
"exemplar": true,
"expr": "100 * (dragonfly_memory_used_bytes{pod=~\"$instance\"} / dragonfly_memory_max_bytes{pod=~\"$instance\"} )",
"expr": "100 * (dragonfly_memory_used_bytes{namespace=\"$namespace\",pod=~\"$instance\"} / dragonfly_memory_max_bytes{namespace=\"$namespace\",pod=~\"$instance\"} )",
"format": "time_series",
"interval": "",
"intervalFactor": 2,
Expand Down Expand Up @@ -411,7 +411,7 @@
"disableTextWrap": false,
"editorMode": "code",
"exemplar": false,
"expr": "dragonfly_master{pod=\"$instance\"}",
"expr": "dragonfly_master{namespace=\"$namespace\",pod=\"$instance\"}",
"fullMetaSearch": false,
"includeNullMetadata": true,
"instant": true,
Expand Down Expand Up @@ -486,7 +486,7 @@
},
"editorMode": "code",
"exemplar": true,
"expr": "rate(dragonfly_commands_processed_total{pod=~\"$instance\"}[5m])",
"expr": "rate(dragonfly_commands_processed_total{namespace=\"$namespace\",pod=~\"$instance\"}[5m])",
"format": "time_series",
"interval": "",
"intervalFactor": 2,
Expand Down Expand Up @@ -595,7 +595,7 @@
"uid": "${DS_PROMETHEUS}"
},
"exemplar": true,
"expr": "dragonfly_memory_used_bytes{pod=~\"$instance\"} ",
"expr": "dragonfly_memory_used_bytes{namespace=\"$namespace\",pod=~\"$instance\"} ",
"format": "time_series",
"interval": "",
"intervalFactor": 2,
Expand All @@ -611,7 +611,7 @@
"uid": "${DS_PROMETHEUS}"
},
"exemplar": true,
"expr": "dragonfly_memory_max_bytes{pod=~\"$instance\"} ",
"expr": "dragonfly_memory_max_bytes{namespace=\"$namespace\",pod=~\"$instance\"} ",
"format": "time_series",
"hide": false,
"interval": "",
Expand Down Expand Up @@ -713,7 +713,7 @@
"uid": "${DS_PROMETHEUS}"
},
"exemplar": true,
"expr": "rate(dragonfly_net_input_bytes_total{pod=~\"$instance\"}[5m])",
"expr": "rate(dragonfly_net_input_bytes_total{namespace=\"$namespace\",pod=~\"$instance\"}[5m])",
"format": "time_series",
"interval": "",
"intervalFactor": 2,
Expand All @@ -727,7 +727,7 @@
"uid": "${DS_PROMETHEUS}"
},
"exemplar": true,
"expr": "rate(dragonfly_net_output_bytes_total{pod=~\"$instance\"}[5m])",
"expr": "rate(dragonfly_net_output_bytes_total{namespace=\"$namespace\",pod=~\"$instance\"}[5m])",
"format": "time_series",
"interval": "",
"intervalFactor": 2,
Expand Down Expand Up @@ -829,7 +829,7 @@
"uid": "${DS_PROMETHEUS}"
},
"exemplar": true,
"expr": "sum (dragonfly_db_keys{pod=~\"$instance\"}) by (db)",
"expr": "sum (dragonfly_db_keys{namespace=\"$namespace\",pod=~\"$instance\"}) by (db)",
"format": "time_series",
"interval": "",
"intervalFactor": 2,
Expand Down Expand Up @@ -930,7 +930,7 @@
"uid": "${DS_PROMETHEUS}"
},
"exemplar": true,
"expr": "sum (dragonfly_db_keys{pod=~\"$instance\"}) - sum (dragonfly_db_keys_expiring{pod=~\"$instance\"}) ",
"expr": "sum (dragonfly_db_keys{namespace=\"$namespace\",pod=~\"$instance\"}) - sum (dragonfly_db_keys_expiring{namespace=\"$namespace\",pod=~\"$instance\"}) ",
"format": "time_series",
"interval": "",
"intervalFactor": 2,
Expand All @@ -945,7 +945,7 @@
"uid": "${DS_PROMETHEUS}"
},
"exemplar": true,
"expr": "sum (dragonfly_db_keys_expiring{pod=~\"$instance\"})",
"expr": "sum (dragonfly_db_keys_expiring{namespace=\"$namespace\",pod=~\"$instance\"})",
"format": "time_series",
"interval": "",
"intervalFactor": 2,
Expand Down Expand Up @@ -1071,7 +1071,7 @@
},
"disableTextWrap": false,
"editorMode": "code",
"expr": "irate(dragonfly_connections_received_total{pod=\"$instance\"}[$__rate_interval])",
"expr": "irate(dragonfly_connections_received_total{namespace=\"$namespace\",pod=\"$instance\"}[$__rate_interval])",
"fullMetaSearch": false,
"includeNullMetadata": false,
"instant": false,
Expand Down Expand Up @@ -1142,7 +1142,7 @@
"uid": "${DS_PROMETHEUS}"
},
"exemplar": true,
"expr": "dragonfly_connected_clients{pod=\"$instance\"}",
"expr": "dragonfly_connected_clients{namespace=\"$namespace\",pod=\"$instance\"}",
"format": "time_series",
"interval": "",
"intervalFactor": 1,
Expand Down Expand Up @@ -1243,7 +1243,7 @@
},
"editorMode": "code",
"exemplar": true,
"expr": "rate(dragonfly_keyspace_hits_total{pod=~\"$instance\"}[5m])",
"expr": "rate(dragonfly_keyspace_hits_total{namespace=\"$namespace\",pod=~\"$instance\"}[5m])",
"format": "time_series",
"interval": "",
"intervalFactor": 2,
Expand All @@ -1260,7 +1260,7 @@
"uid": "${DS_PROMETHEUS}"
},
"editorMode": "code",
"expr": "rate(dragonfly_keyspace_misses_total{pod=~\"$instance\"}[5m])",
"expr": "rate(dragonfly_keyspace_misses_total{namespace=\"$namespace\",pod=~\"$instance\"}[5m])",
"hide": false,
"instant": false,
"legendFormat": "misses",
Expand Down Expand Up @@ -1376,7 +1376,7 @@
"uid": "${DS_PROMETHEUS}"
},
"exemplar": true,
"expr": "sum(rate(dragonfly_expired_keys_total{pod=~\"$instance\"}[5m])) by (instance)",
"expr": "sum(rate(dragonfly_expired_keys_total{namespace=\"$namespace\",pod=~\"$instance\"}[5m])) by (instance)",
"format": "time_series",
"hide": false,
"interval": "",
Expand All @@ -1393,7 +1393,7 @@
"uid": "${DS_PROMETHEUS}"
},
"exemplar": true,
"expr": "sum(rate(dragonfly_evicted_keys_total{pod=~\"$instance\"}[5m])) by (instance)",
"expr": "sum(rate(dragonfly_evicted_keys_total{namespace=\"$namespace\",pod=~\"$instance\"}[5m])) by (instance)",
"format": "time_series",
"interval": "",
"intervalFactor": 2,
Expand Down Expand Up @@ -1442,49 +1442,78 @@
],
"templating": {
"list": [

{
"current": {},
"definition": "label_values(dragonfly_uptime_in_seconds,app)",
"hide": 0,
"includeAll": false,
"label": "",
"multi": false,
"name": "Dragonfly",
"options": [],
"query": {
"query": "label_values(dragonfly_uptime_in_seconds,app)",
"refId": "PrometheusVariableQueryEditor-VariableQuery"
},
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 0,
"type": "query"
"hide": 2,
"name": "DS_PROMETHEUS",
"query": "prometheus",
"skipUrlSync": true,
"type": "constant"
},
{
"current": {},
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
},
"definition": "label_values(dragonfly_uptime_in_seconds{app=\"$Dragonfly\"},pod)",
"hide": 0,
"includeAll": false,
"label": "instance",
"multi": false,
"name": "instance",
"options": [],
"query": {
"query": "label_values(dragonfly_uptime_in_seconds{app=\"$Dragonfly\"},pod)",
"refId": "PrometheusVariableQueryEditor-VariableQuery"
},
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 0,
"type": "query"
}
"current": {},
"definition": "label_values(dragonfly_uptime_in_seconds,app)",
"hide": 0,
"includeAll": false,
"label": "",
"multi": false,
"name": "Dragonfly",
"options": [],
"query": {
"query": "label_values(dragonfly_uptime_in_seconds,app)",
"refId": "PrometheusVariableQueryEditor-VariableQuery"
},
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 0,
"type": "query"
},
{
"current": {},
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
},
"definition": "label_values(dragonfly_uptime_in_seconds{app=\"$Dragonfly\"},namespace)",
"hide": 0,
"includeAll": false,
"label": "namespace",
"multi": false,
"name": "namespace",
"options": [],
"query": {
"query": "label_values(dragonfly_uptime_in_seconds{app=\"$Dragonfly\"},namespace)",
"refId": "PrometheusVariableQueryEditor-VariableQuery"
},
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 0,
"type": "query"
},
{
"current": {},
"datasource": {
"type": "prometheus",
"uid": "${DS_PROMETHEUS}"
},
"definition": "label_values(dragonfly_uptime_in_seconds{app=\"$Dragonfly\",namespace=\"$namespace\"},pod)",
"hide": 0,
"includeAll": false,
"label": "instance",
"multi": false,
"name": "instance",
"options": [],
"query": {
"query": "label_values(dragonfly_uptime_in_seconds{app=\"$Dragonfly\",namespace=\"$namespace\"},pod)",
"refId": "PrometheusVariableQueryEditor-VariableQuery"
},
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 0,
"type": "query"
}
]
},
"time": {
Expand Down

0 comments on commit 7a7bb11

Please sign in to comment.