From 0f88c8c2062e20ffb8dd2d6aa25138f0fee324c1 Mon Sep 17 00:00:00 2001 From: "@x10an14-nav" Date: Wed, 9 Sep 2026 10:25:00 +0200 Subject: [PATCH] upkeep(opensearch): migrate to existing/supported versions --- data/k8s/dev/devteam/another-opensearch.yaml | 2 +- flake.lock | 118 +++++++++--------- flake.nix | 48 +++---- .../issues/dev-gcp/sortteam/opensearches.yaml | 4 +- .../dev/someteamname/opensearch.yaml | 2 +- .../dev/someteamname/opensearch_hobbyist.yaml | 2 +- .../simple/dev/slug-1/opensearch.yaml | 2 +- .../myteam/opensearch-myteam-poweroff.yaml | 2 +- .../myteam/opensearch-myteam-rebalancing.yaml | 2 +- .../dev/myteam/opensearch-myteam-running.yaml | 2 +- integration_tests/opensearch_crud.lua | 44 +++---- integration_tests/opensearchversion.lua | 4 +- internal/graph/gengql/root_.generated.go | 12 +- internal/graph/schema/opensearch.graphqls | 12 +- internal/persistence/opensearch/models.go | 36 ++---- internal/persistence/opensearch/queries.go | 2 +- internal/thirdparty/aiven/fake.go | 2 +- 17 files changed, 132 insertions(+), 164 deletions(-) diff --git a/data/k8s/dev/devteam/another-opensearch.yaml b/data/k8s/dev/devteam/another-opensearch.yaml index 2e952b75d..e5a580673 100644 --- a/data/k8s/dev/devteam/another-opensearch.yaml +++ b/data/k8s/dev/devteam/another-opensearch.yaml @@ -35,7 +35,7 @@ spec: tenant: nav terminationProtection: true userConfig: - opensearch_version: "2" + opensearch_version: "3.6" status: conditions: - lastTransitionTime: "2023-11-08T10:36:06Z" diff --git a/flake.lock b/flake.lock index 8aea385fc..9c8bdda98 100644 --- a/flake.lock +++ b/flake.lock @@ -1,61 +1,61 @@ { - "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1746328495, - "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1788881743, + "narHash": "sha256-2V9GZGvPfrNzxFozhI9dcqV+c3QdA8YZrvAAzqEB+dI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d6524aaca2ff07876657ae2b323f24be4874944b", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 } diff --git a/flake.nix b/flake.nix index 48f06dcd8..fa8ba1335 100644 --- a/flake.nix +++ b/flake.nix @@ -20,12 +20,12 @@ ( final: prev: let - version = "1.24.2"; + version = "1.26.7"; newerGoVersion = prev.go.overrideAttrs (old: { inherit version; src = prev.fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - hash = "sha256-ncd/+twW2DehvzLZnGJMtN8GR87nsRnt2eexvMBfLgA="; + hash = ""; }; }); nixpkgsVersion = prev.go.version; @@ -38,41 +38,25 @@ ) ]; }; - gqlgen = pkgs.buildGoModule rec { - pname = "gqlgen"; - version = "0.17.68"; - doCheck = false; # TODO: Actually run tests - src = pkgs.fetchFromGitHub { - owner = "99designs"; - repo = "gqlgen"; - rev = "v${version}"; - hash = "sha256-zu9Rgxua19dZNLUeJeMklKB0C95E8UVWGu/I5Lkk66E="; - }; - vendorHash = "sha256-B3RiZZee6jefslUSTfHDth8WUl5rv7fmEFU0DpKkWZk="; - }; in { devShells.default = pkgs.mkShell { - packages = - with pkgs; - [ - go - go-tools - gopls - gotools + packages = with pkgs; [ + go + go-tools + gopls + gotools - gofumpt - protobuf - protoc-gen-go - protoc-gen-go-grpc - sqlc - # Mise dependencies - nodejs_22 + gofumpt + protobuf + protoc-gen-go + protoc-gen-go-grpc + sqlc + # Mise dependencies + nodejs_22 - mise - nodePackages.prettier - ] - ++ [ gqlgen ]; + mise + ]; }; formatter = pkgs.nixfmt-rfc-style; diff --git a/integration_tests/k8s_resources/issues/dev-gcp/sortteam/opensearches.yaml b/integration_tests/k8s_resources/issues/dev-gcp/sortteam/opensearches.yaml index 7b9aff280..b3c25936d 100644 --- a/integration_tests/k8s_resources/issues/dev-gcp/sortteam/opensearches.yaml +++ b/integration_tests/k8s_resources/issues/dev-gcp/sortteam/opensearches.yaml @@ -16,7 +16,7 @@ spec: tenant: nav terminationProtection: true userConfig: - opensearch_version: "2" + opensearch_version: "3.6" --- apiVersion: aiven.io/v1alpha1 kind: OpenSearch @@ -36,4 +36,4 @@ spec: tenant: nav terminationProtection: true userConfig: - opensearch_version: "2" + opensearch_version: "3.6" diff --git a/integration_tests/k8s_resources/opensearch_crud/dev/someteamname/opensearch.yaml b/integration_tests/k8s_resources/opensearch_crud/dev/someteamname/opensearch.yaml index a71e37b56..0b55aaa78 100644 --- a/integration_tests/k8s_resources/opensearch_crud/dev/someteamname/opensearch.yaml +++ b/integration_tests/k8s_resources/opensearch_crud/dev/someteamname/opensearch.yaml @@ -35,7 +35,7 @@ spec: tenant: nav terminationProtection: true userConfig: - opensearch_version: "2" + opensearch_version: "3.6" status: conditions: - lastTransitionTime: "2023-11-08T10:36:06Z" diff --git a/integration_tests/k8s_resources/opensearch_crud/dev/someteamname/opensearch_hobbyist.yaml b/integration_tests/k8s_resources/opensearch_crud/dev/someteamname/opensearch_hobbyist.yaml index 3425dea58..3299d0bee 100644 --- a/integration_tests/k8s_resources/opensearch_crud/dev/someteamname/opensearch_hobbyist.yaml +++ b/integration_tests/k8s_resources/opensearch_crud/dev/someteamname/opensearch_hobbyist.yaml @@ -35,7 +35,7 @@ spec: tenant: nav terminationProtection: true userConfig: - opensearch_version: "2" + opensearch_version: "3.6" status: conditions: - lastTransitionTime: "2023-11-08T10:36:06Z" diff --git a/integration_tests/k8s_resources/simple/dev/slug-1/opensearch.yaml b/integration_tests/k8s_resources/simple/dev/slug-1/opensearch.yaml index dee7ba7a8..c457bc5ea 100644 --- a/integration_tests/k8s_resources/simple/dev/slug-1/opensearch.yaml +++ b/integration_tests/k8s_resources/simple/dev/slug-1/opensearch.yaml @@ -22,7 +22,7 @@ spec: tenant: nav terminationProtection: true userConfig: - opensearch_version: "2" + opensearch_version: "3.6" status: conditions: - lastTransitionTime: "2023-11-08T10:36:06Z" diff --git a/integration_tests/k8s_resources/state/dev/myteam/opensearch-myteam-poweroff.yaml b/integration_tests/k8s_resources/state/dev/myteam/opensearch-myteam-poweroff.yaml index bc82ba64f..253af7fe5 100644 --- a/integration_tests/k8s_resources/state/dev/myteam/opensearch-myteam-poweroff.yaml +++ b/integration_tests/k8s_resources/state/dev/myteam/opensearch-myteam-poweroff.yaml @@ -35,4 +35,4 @@ spec: tenant: nav terminationProtection: true userConfig: - opensearch_version: "2" + opensearch_version: "3.6" diff --git a/integration_tests/k8s_resources/state/dev/myteam/opensearch-myteam-rebalancing.yaml b/integration_tests/k8s_resources/state/dev/myteam/opensearch-myteam-rebalancing.yaml index 6a109cc3f..302943395 100644 --- a/integration_tests/k8s_resources/state/dev/myteam/opensearch-myteam-rebalancing.yaml +++ b/integration_tests/k8s_resources/state/dev/myteam/opensearch-myteam-rebalancing.yaml @@ -35,4 +35,4 @@ spec: tenant: nav terminationProtection: true userConfig: - opensearch_version: "2" + opensearch_version: "3.6" diff --git a/integration_tests/k8s_resources/state/dev/myteam/opensearch-myteam-running.yaml b/integration_tests/k8s_resources/state/dev/myteam/opensearch-myteam-running.yaml index 3e9fd2663..79edb9509 100644 --- a/integration_tests/k8s_resources/state/dev/myteam/opensearch-myteam-running.yaml +++ b/integration_tests/k8s_resources/state/dev/myteam/opensearch-myteam-running.yaml @@ -35,4 +35,4 @@ spec: tenant: nav terminationProtection: true userConfig: - opensearch_version: "2" + opensearch_version: "3.6" diff --git a/integration_tests/opensearch_crud.lua b/integration_tests/opensearch_crud.lua index e54f2bb34..8503eccf6 100644 --- a/integration_tests/opensearch_crud.lua +++ b/integration_tests/opensearch_crud.lua @@ -17,7 +17,7 @@ Test.gql("Create opensearch in non-existing team", function(t) teamSlug: "devteam" tier: SINGLE_NODE memory: GB_16 - version: V2 + version: V3_6 storageGB: 350 } ) { @@ -53,7 +53,7 @@ Test.gql("Create opensearch as non-team member", function(t) teamSlug: "someteamname" tier: SINGLE_NODE memory: GB_16 - version: V2 + version: V3_6 storageGB: 350 } ) { @@ -89,7 +89,7 @@ Test.gql("Create opensearch as team member", function(t) teamSlug: "someteamname" tier: SINGLE_NODE memory: GB_16 - version: V2 + version: V3_6 storageGB: 350 } ) { @@ -122,7 +122,7 @@ Test.gql("Create opensearch as team member with existing name", function(t) teamSlug: "someteamname" tier: SINGLE_NODE memory: GB_16 - version: V2 + version: V3_6 storageGB: 350 } ) { @@ -158,7 +158,7 @@ Test.gql("Create opensearch with invalid tier and memory combination", function( teamSlug: "someteamname" tier: HIGH_AVAILABILITY memory: GB_2 - version: V2 + version: V3_6 storageGB: 16 } ) { @@ -196,7 +196,7 @@ Test.gql("Create opensearch with invalid storage capacity", function(t) teamSlug: "someteamname" tier: HIGH_AVAILABILITY memory: GB_4 - version: V2 + version: V3_6 storageGB: 16 } ) { @@ -234,7 +234,7 @@ Test.gql("Create opensearch with invalid storage capacity increment", function(t teamSlug: "someteamname" tier: SINGLE_NODE memory: GB_8 - version: V2 + version: V3_6 storageGB: 180 } ) { @@ -292,7 +292,7 @@ Test.k8s("Validate OpenSearch resource", function(t) tenant = "some-tenant", }, userConfig = { - opensearch_version = "2", + opensearch_version = "3.6", }, }, }) @@ -344,7 +344,7 @@ Test.gql("Create opensearch with tier and memory equivalent to hobbyist plan", f teamSlug: "someteamname" tier: SINGLE_NODE memory: GB_2 - version: V2 + version: V3_6 storageGB: 16 } ) { @@ -397,7 +397,7 @@ Test.k8s("Validate hobbyist OpenSearch resource", function(t) tenant = "some-tenant", }, userConfig = { - opensearch_version = "2", + opensearch_version = "3.6", }, }, }) @@ -449,7 +449,7 @@ Test.gql("Update OpenSearch in non-existing team", function(t) teamSlug: "devteam" tier: SINGLE_NODE memory: GB_16 - version: V2 + version: V3_6 storageGB: 350 } ) { @@ -485,7 +485,7 @@ Test.gql("Update OpenSearch as non-team-member", function(t) teamSlug: "devteam" tier: SINGLE_NODE memory: GB_16 - version: V2 + version: V3_6 storageGB: 350 } ) { @@ -521,7 +521,7 @@ Test.gql("Update OpenSearch as team-member", function(t) teamSlug: "someteamname" tier: HIGH_AVAILABILITY memory: GB_4 - version: V2 + version: V3_6 storageGB: 1020 } ) { @@ -574,7 +574,7 @@ Test.k8s("Validate OpenSearch resource after update", function(t) tenant = "some-tenant", }, userConfig = { - opensearch_version = "2", + opensearch_version = "3.6", }, }, }) @@ -645,7 +645,7 @@ Test.gql("Downgrade OpenSearch as team-member", function(t) teamSlug: "someteamname" tier: HIGH_AVAILABILITY memory: GB_4 - version: V1 + version: V3_3 storageGB: 240 } ) { @@ -660,7 +660,7 @@ Test.gql("Downgrade OpenSearch as team-member", function(t) errors = { { locations = NotNull(), - message = "Cannot change OpenSearch version from V2 to V1. New version must be one of [V2_19]", + message = "Cannot change OpenSearch version from V3_6 to V3_3. No further upgrades available.", path = { "updateOpenSearch", }, @@ -681,7 +681,7 @@ Test.gql("Downgrade OpenSearch without explicit version set", function(t) teamSlug: "someteamname" tier: HIGH_AVAILABILITY memory: GB_4 - version: V1 + version: V3_3 storageGB: 240 } ) { @@ -696,7 +696,7 @@ Test.gql("Downgrade OpenSearch without explicit version set", function(t) errors = { { locations = NotNull(), - message = "Cannot change OpenSearch version from V2 to V1. New version must be one of [V2_19]", + message = "Cannot change OpenSearch version from V3_6 to V3_3. No further upgrades available.", path = { "updateOpenSearch", }, @@ -717,7 +717,7 @@ Test.gql("Update non-console managed OpenSearch as team-member", function(t) teamSlug: "someteamname" tier: HIGH_AVAILABILITY memory: GB_4 - version: V2 + version: V3_6 storageGB: 240 } ) { @@ -753,7 +753,7 @@ Test.gql("Update OpenSearch with tier and memory equivalent to hobbyist plan", f teamSlug: "someteamname" tier: SINGLE_NODE memory: GB_2 - version: V2 + version: V3_6 storageGB: 16 } ) { @@ -806,7 +806,7 @@ Test.k8s("Validate hobbyist OpenSearch resource after update", function(t) tenant = "some-tenant", }, userConfig = { - opensearch_version = "2", + opensearch_version = "3.6", }, }, }) @@ -857,7 +857,7 @@ Test.gql("Create opensearch in other team", function(t) teamSlug: "%s" tier: SINGLE_NODE memory: GB_16 - version: V2 + version: V3_6 storageGB: 350 } ) { diff --git a/integration_tests/opensearchversion.lua b/integration_tests/opensearchversion.lua index 727f0b877..bfef1ce86 100644 --- a/integration_tests/opensearchversion.lua +++ b/integration_tests/opensearchversion.lua @@ -28,8 +28,8 @@ Test.gql("Show version of OpenSearch instance", function(t) { name = "opensearch-slug-1-opensearch", version = { - actual = "2.17.2", - desiredMajor = "V2", + actual = "3.6.0", + desiredMajor = "V3_6", }, }, }, diff --git a/internal/graph/gengql/root_.generated.go b/internal/graph/gengql/root_.generated.go index bb3a21a01..004e4571c 100644 --- a/internal/graph/gengql/root_.generated.go +++ b/internal/graph/gengql/root_.generated.go @@ -25642,16 +25642,14 @@ enum OpenSearchMemory { } enum OpenSearchMajorVersion { - "OpenSearch Version 3.6.x" + "OpenSearch Version 3.6 LTS - default" V3_6 "OpenSearch Version 3.3.x" - V3_3 - "OpenSearch Version 2.19.x" + V3_3 @deprecated(reason: "Vendor support disappears 2027-02-01") + "OpenSearch Version 2.19 LTS" V2_19 - "OpenSearch Version 2.17.x" - V2 - "OpenSearch Version 1.3.x" - V1 + "OpenSearch Version 2.19 LTS - backwards compatible" + V2 @deprecated(reason: "Use ` + "`" + `V2_19` + "`" + ` instead") } input CreateOpenSearchInput { diff --git a/internal/graph/schema/opensearch.graphqls b/internal/graph/schema/opensearch.graphqls index 0c6887512..9c1a8e7fc 100644 --- a/internal/graph/schema/opensearch.graphqls +++ b/internal/graph/schema/opensearch.graphqls @@ -242,16 +242,14 @@ enum OpenSearchMemory { } enum OpenSearchMajorVersion { - "OpenSearch Version 3.6.x" + "OpenSearch Version 3.6 LTS - default" V3_6 "OpenSearch Version 3.3.x" - V3_3 - "OpenSearch Version 2.19.x" + V3_3 @deprecated(reason: "Vendor support disappears 2027-02-01") + "OpenSearch Version 2.19 LTS" V2_19 - "OpenSearch Version 2.17.x" - V2 - "OpenSearch Version 1.3.x" - V1 + "OpenSearch Version 2.19 LTS - backwards compatible" + V2 @deprecated(reason: "Use `V2_19` instead") } input CreateOpenSearchInput { diff --git a/internal/persistence/opensearch/models.go b/internal/persistence/opensearch/models.go index 6ca38f8a3..62abf1834 100644 --- a/internal/persistence/opensearch/models.go +++ b/internal/persistence/opensearch/models.go @@ -20,7 +20,6 @@ import ( "github.com/nais/api/internal/validate" "github.com/nais/api/internal/workload" aiven_io_v1alpha1 "github.com/nais/liberator/pkg/apis/aiven.io/v1alpha1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -109,8 +108,7 @@ type OpenSearchAccess struct { } type OpenSearchStatus struct { - State string `json:"state"` - Conditions []metav1.Condition `json:"conditions"` + State string `json:"state"` } type OpenSearchOrder struct { @@ -215,21 +213,18 @@ func toOpenSearch(u *unstructured.Unstructured, envName string) (*OpenSearch, er } return &OpenSearch{ - Name: name, + AivenProject: obj.Spec.Project, EnvironmentName: envName, + Labels: model.UserLabels(obj.GetLabels()), + MajorVersion: majorVersion, + Memory: machine.Memory, + Name: name, + Status: &OpenSearchStatus{State: obj.Status.State}, + StorageGB: storageGB, + TeamSlug: slug.Slug(obj.GetNamespace()), TerminationProtection: terminationProtection, - Status: &OpenSearchStatus{ - Conditions: obj.Status.Conditions, - State: obj.Status.State, - }, - TeamSlug: slug.Slug(obj.GetNamespace()), - WorkloadReference: workload.ReferenceFromOwnerReferences(obj.GetOwnerReferences()), - AivenProject: obj.Spec.Project, - Tier: machine.Tier, - Memory: machine.Memory, - MajorVersion: majorVersion, - StorageGB: storageGB, - Labels: model.UserLabels(obj.GetLabels()), + Tier: machine.Tier, + WorkloadReference: workload.ReferenceFromOwnerReferences(obj.GetOwnerReferences()), }, nil } @@ -371,7 +366,6 @@ type CreateOpenSearchPayload struct { type OpenSearchMajorVersion string const ( - OpenSearchMajorVersionV1 OpenSearchMajorVersion = "V1" OpenSearchMajorVersionV2 OpenSearchMajorVersion = "V2" OpenSearchMajorVersionV2_19 OpenSearchMajorVersion = "V2_19" OpenSearchMajorVersionV3_3 OpenSearchMajorVersion = "V3_3" @@ -389,7 +383,6 @@ func (u upgradePath) String() string { } var upgradePaths = map[OpenSearchMajorVersion]upgradePath{ - OpenSearchMajorVersionV1: {OpenSearchMajorVersionV2, OpenSearchMajorVersionV2_19}, OpenSearchMajorVersionV2: {OpenSearchMajorVersionV2_19}, OpenSearchMajorVersionV2_19: {OpenSearchMajorVersionV3_3, OpenSearchMajorVersionV3_6}, OpenSearchMajorVersionV3_3: {OpenSearchMajorVersionV3_6}, @@ -416,7 +409,6 @@ func (e OpenSearchMajorVersion) ValidateUpgradePath(other OpenSearchMajorVersion func (e OpenSearchMajorVersion) IsValid() bool { switch e { case - OpenSearchMajorVersionV1, OpenSearchMajorVersionV2, OpenSearchMajorVersionV2_19, OpenSearchMajorVersionV3_3, @@ -447,11 +439,9 @@ func (e OpenSearchMajorVersion) MarshalGQL(w io.Writer) { fmt.Fprint(w, strconv.Quote(e.String())) } -// ToAivenString returns the version string without the "V" prefix, e.g. "2" or "1". +// ToAivenString returns the version as Aiven writes it in userConfig, e.g. "2.19". func (e OpenSearchMajorVersion) ToAivenString() (string, error) { switch e { - case OpenSearchMajorVersionV1: - return "1", nil case OpenSearchMajorVersionV2: return "2", nil case OpenSearchMajorVersionV2_19: @@ -467,8 +457,6 @@ func (e OpenSearchMajorVersion) ToAivenString() (string, error) { func OpenSearchMajorVersionFromAivenString(s string) (OpenSearchMajorVersion, error) { switch { - case strings.HasPrefix(s, "1"): - return OpenSearchMajorVersionV1, nil case strings.HasPrefix(s, "2.19"): return OpenSearchMajorVersionV2_19, nil case strings.HasPrefix(s, "2"): diff --git a/internal/persistence/opensearch/queries.go b/internal/persistence/opensearch/queries.go index f29857ece..d7cd5804e 100644 --- a/internal/persistence/opensearch/queries.go +++ b/internal/persistence/opensearch/queries.go @@ -141,7 +141,7 @@ func GetOpenSearchVersion(ctx context.Context, os *OpenSearch) (*OpenSearchVersi } if major == "" { - major = OpenSearchMajorVersionV2 + major = OpenSearchMajorVersionV3_6 } return &OpenSearchVersion{ diff --git a/internal/thirdparty/aiven/fake.go b/internal/thirdparty/aiven/fake.go index 95b364981..ed1e8d534 100644 --- a/internal/thirdparty/aiven/fake.go +++ b/internal/thirdparty/aiven/fake.go @@ -107,7 +107,7 @@ func (f *FakeAivenClient) ServiceGet(_ context.Context, _ string, serviceName st Time: "12:34:56", }, Metadata: map[string]any{ - "opensearch_version": "2.17.2", + "opensearch_version": "3.6.0", }, }, nil }