Skip to content
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.

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

WIP: Bump some version #196

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22@sha256:4594271250150c1a322ed749abfd218e1a8c6eb1ade90872e325a664412e2037 AS operator_builder
FROM golang:1.23@sha256:73f06be4578c9987ce560087e2e2ea6485fb605e3910542cadd8fa09fc5f3e31 AS operator_builder

ARG GO_LDFLAGS=""
ARG BUILD_TIME
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -297,11 +297,11 @@ YQ ?= $(LOCALBIN)/yq

## Tool Versions
KUSTOMIZE_VERSION ?= v5.5.0
CONTROLLER_TOOLS_VERSION ?= v0.14.0
CONTROLLER_TOOLS_VERSION ?= v0.16.4
ENVTEST_VERSION ?= release-0.17
GOLANGCI_LINT_VERSION ?= v1.57.2
HELMIFY_VERSION ?= 0.4.13
YQ_VERSION ?= 4.44.1
YQ_VERSION ?= 4.44.3

.PHONY: kustomize
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
Expand Down
15 changes: 7 additions & 8 deletions api/v1/slurmcluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

mariadv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1"
mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1"
prometheusv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
)

Expand Down Expand Up @@ -277,7 +277,6 @@ type K8sNodeFilter struct {
Name string `json:"name"`

// Affinity defines the desired affinity for the node
//
// NOTE: Affinity could not be set if NodeSelector is specified
//
// +kubebuilder:validation:Optional
Expand Down Expand Up @@ -443,12 +442,12 @@ type MariaDbOperator struct {
Enabled bool `json:"enabled"`

NodeContainer `json:",inline"`
PodSecurityContext *corev1.PodSecurityContext `json:"podSecurityContext,omitempty"`
SecurityContext *corev1.SecurityContext `json:"securityContext,omitempty"`
Replicas int32 `json:"replicas,omitempty"`
Metrics *mariadv1alpha1.MariadbMetrics `json:"metrics,omitempty"`
Replication *mariadv1alpha1.Replication `json:"replication,omitempty"`
Storage mariadv1alpha1.Storage `json:"storage,omitempty"`
PodSecurityContext *mariadbv1alpha1.PodSecurityContext `json:"podSecurityContext,omitempty"`
SecurityContext *mariadbv1alpha1.SecurityContext `json:"securityContext,omitempty"`
Replicas int32 `json:"replicas,omitempty"`
Metrics *mariadbv1alpha1.MariadbMetrics `json:"metrics,omitempty"`
Replication *mariadbv1alpha1.Replication `json:"replication,omitempty"`
Storage mariadbv1alpha1.Storage `json:"storage,omitempty"`
}

type SlurmdbdConfig struct {
Expand Down
4 changes: 2 additions & 2 deletions api/v1/zz_generated.deepcopy.go

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

4 changes: 2 additions & 2 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
"sigs.k8s.io/controller-runtime/pkg/webhook"

mariadv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1"
mariadbv1alpha1 "github.com/mariadb-operator/mariadb-operator/api/v1alpha1"
otelv1beta1 "github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
prometheusv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"

Expand All @@ -62,7 +62,7 @@ func init() {
utilruntime.Must(prometheusv1.AddToScheme(scheme))
}
if check.IsMariaDbCRDInstalled() {
utilruntime.Must(mariadv1alpha1.AddToScheme(scheme))
utilruntime.Must(mariadbv1alpha1.AddToScheme(scheme))
}

utilruntime.Must(slurmv1.AddToScheme(scheme))
Expand Down
6,578 changes: 377 additions & 6,201 deletions config/crd/bases/slurm.nebius.ai_slurmclusters.yaml

Large diffs are not rendered by default.

Loading