Skip to content
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,5 +1,5 @@
# Build the manager binary
FROM golang:1.18 as builder
FROM golang:1.23 AS builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
5 changes: 5 additions & 0 deletions Dockerfile.prebuilt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM gcr.io/distroless/static:nonroot
WORKDIR /
COPY manager .
USER 65532:65532
ENTRYPOINT ["/manager"]
2 changes: 2 additions & 0 deletions controllers/statefulset.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ func makeStatefulSetSpec(instance *vernemqv1alpha1.VerneMQ) (*appsv1.StatefulSet
if version.Minor < 7 {
return nil, pkgerr.Errorf("unsupported VerneMQ minor version %s", version)
}
case 2:
// VerneMQ 2.x supported
default:
return nil, pkgerr.Errorf("unsupported VerneMQ major version %s", version)
}
Expand Down
2 changes: 1 addition & 1 deletion controllers/vernemq_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const (
secretsDir = "/vernemq/etc/secrets/"
sSetInputHashName = "vernemq-operator-input-hash"

defaultVerneMQVersion = "1.13.0-alpine"
defaultVerneMQVersion = "2.1.2-alpine"
defaultVerneMQBaseImage = "vernemq/vernemq"
defaultBundlerBaseImage = "vernemq/vmq-plugin-bundler"
defaultBundlerVersion = "latest"
Expand Down
5 changes: 5 additions & 0 deletions rebar.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{erl_opts, [debug_info]}.

{deps, [
{yamerl, "0.10.0"}
]}.
17 changes: 17 additions & 0 deletions src/vmq_k8s.app.src
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{application, vmq_k8s,
[{description, "VMQ Kubernetes Helper Plugin"},
{vsn, git},
{registered, []},
{mod, { vmq_k8s_app, []}},
{applications,
[kernel,
stdlib,
yamerl
]},
{env,[]},
{modules, []},

{maintainers, []},
{licenses, []},
{links, []}
]}.
26 changes: 26 additions & 0 deletions src/vmq_k8s_app.erl
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
%%%-------------------------------------------------------------------
%% @doc vmq_k8s public API
%% @end
%%%-------------------------------------------------------------------

-module(vmq_k8s_app).

-behaviour(application).

%% Application callbacks
-export([start/2, stop/1]).

%%====================================================================
%% API
%%====================================================================

start(_StartType, _StartArgs) ->
vmq_k8s_sup:start_link().

%%--------------------------------------------------------------------
stop(_State) ->
ok.

%%====================================================================
%% Internal functions
%%====================================================================
Loading