Skip to content

feat(aiven)!: expose Valkey version and error when no version is known #508

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

Draft
x10an14-nav wants to merge 1 commit into
base: main
Choose a base branch
from
+1,979 −362
Draft

feat(aiven)!: expose Valkey version and error when no version is known #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions data/k8s/dev/devteam/another-opensearch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ spec:
userConfig:
opensearch_version: "2"
status:
version: "2.19.3"
conditions:
- lastTransitionTime: "2023-11-08T10:36:06Z"
message: Instance was created or update on Aiven side
Expand Down
2 changes: 2 additions & 0 deletions data/k8s/dev/devteam/opensearch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ spec:
tenant: nav
terminationProtection: true
status:
version: "2.19.3"
conditions:
- lastTransitionTime: "2023-11-08T10:24:54Z"
message: Instance was created or update on Aiven side
Expand Down Expand Up @@ -79,6 +80,7 @@ spec:
tenant: nav
terminationProtection: true
status:
version: "2.19.3"
conditions:
- lastTransitionTime: "2023-11-08T10:24:54Z"
message: Instance was created or update on Aiven side
Expand Down
2 changes: 2 additions & 0 deletions data/k8s/dev/devteam/valkey.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ spec:
tenant: nav
terminationProtection: true
status:
version: "8.1.9"
conditions:
- lastTransitionTime: "2023-11-20T19:07:04Z"
message: Instance was created or update on Aiven side
Expand Down Expand Up @@ -68,6 +69,7 @@ spec:
tenant: nav
terminationProtection: true
status:
version: "8.1.9"
conditions:
- lastTransitionTime: "2023-11-20T19:07:04Z"
message: Instance was created or update on Aiven side
Expand Down
118 changes: 59 additions & 59 deletions flake.lock
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
(
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;
newVersionNotInNixpkgs = -1 == builtins.compareVersions nixpkgsVersion version;
newVersionNotInNixpkgs = -1 == prev.lib.compareVersions nixpkgsVersion version;
in
{
go = if newVersionNotInNixpkgs then newerGoVersion else prev.go;
Expand Down Expand Up @@ -70,7 +70,7 @@
nodejs_22

mise
nodePackages.prettier
prettier
]
++ [ gqlgen ];
};
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ require (
cloud.google.com/go/pubsub v1.50.1
github.com/99designs/gqlgen v0.17.90
github.com/GoogleCloudPlatform/k8s-config-connector v1.128.0
github.com/Masterminds/semver/v3 v3.4.0
github.com/aiven/go-client-codegen v0.106.0
github.com/blevesearch/bleve/v2 v2.5.0
github.com/blevesearch/bleve_index_api v1.2.7
Expand Down Expand Up @@ -108,7 +109,6 @@ require (
github.com/BurntSushi/toml v1.6.0 // indirect
github.com/DataDog/sketches-go v1.4.8 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.4.0 // indirect
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/RoaringBitmap/roaring/v2 v2.4.5 // indirect
Expand Down
47 changes: 47 additions & 0 deletions integration_tests/k8s_resources/opensearch_crud/dev/someteamname/opensearch_downgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
apiVersion: aiven.io/v1alpha1
kind: OpenSearch
metadata:
annotations:
controllers.aiven.io/generation-was-processed: "2"
controllers.aiven.io/instance-is-running: "true"
nais.io/created_by: aiven-iac-migration
creationTimestamp: "2023-11-08T10:35:59Z"
finalizers:
- finalizers.aiven.io/delete-remote-resource
generation: 2
labels:
team: teampam
nais.io/managed-by: console
name: opensearch-someteamname-downgrade
namespace: teampam
resourceVersion: "3990043291"
uid: 3b9e5e9b-3cf5-4c3c-a1fd-925fa7b04fe1
spec:
cloudName: google-europe-north1
connInfoSecretTarget:
name: ""
disk_space: 525G
plan: hobbyist
project: nav-prod
projectVpcId: fff21e17-95d5-408b-8df5-15aacf38f5de
tags:
environment: prod
team: teampam
tenant: nav
terminationProtection: true
userConfig:
opensearch_version: "3.6"
status:
version: "3.6.0"
conditions:
- lastTransitionTime: "2023-11-08T10:36:06Z"
message: Instance was created or update on Aiven side
reason: Updated
status: "True"
type: Initialized
- lastTransitionTime: "2024-01-10T09:40:58Z"
message: Instance is running on Aiven side
reason: CheckRunning
status: "True"
type: Running
state: RUNNING
1 change: 1 addition & 0 deletions integration_tests/k8s_resources/opensearch_crud/dev/someteamname/opensearch_noversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ spec:
tenant: nav
terminationProtection: true
status:
version: "3.3.0"
conditions:
- lastTransitionTime: "2023-11-08T10:36:06Z"
message: Instance was created or update on Aiven side
Expand Down
29 changes: 29 additions & 0 deletions integration_tests/k8s_resources/opensearch_version/dev/myteam/opensearch-myteam-crpin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
apiVersion: aiven.io/v1alpha1
kind: OpenSearch
metadata:
annotations:
controllers.aiven.io/generation-was-processed: "1"
controllers.aiven.io/instance-is-running: "true"
labels:
nais.io/managed-by: console
name: opensearch-myteam-crpin
spec:
cloudName: google-europe-north1
connInfoSecretTarget:
name: ""
disk_space: 16G
plan: hobbyist
project: nav-dev
projectVpcId: fff21e17-95d5-408b-8df5-15aacf38f5de
terminationProtection: true
userConfig:
opensearch_version: "1"
status:
version: "2.19.3"
conditions:
- lastTransitionTime: "2024-01-10T09:40:58Z"
message: Instance is running on Aiven side
reason: CheckRunning
status: "True"
type: Running
state: RUNNING
26 changes: 26 additions & 0 deletions integration_tests/k8s_resources/opensearch_version/dev/myteam/opensearch-myteam-nocrd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
apiVersion: aiven.io/v1alpha1
kind: OpenSearch
metadata:
annotations:
controllers.aiven.io/generation-was-processed: "1"
controllers.aiven.io/instance-is-running: "true"
labels:
nais.io/managed-by: console
name: opensearch-myteam-nocrd
spec:
cloudName: google-europe-north1
connInfoSecretTarget:
name: ""
disk_space: 16G
plan: hobbyist
project: nav-dev
projectVpcId: fff21e17-95d5-408b-8df5-15aacf38f5de
terminationProtection: true
status:
conditions:
- lastTransitionTime: "2024-01-10T09:40:58Z"
message: Instance is running on Aiven side
reason: CheckRunning
status: "True"
type: Running
state: RUNNING
28 changes: 28 additions & 0 deletions integration_tests/k8s_resources/opensearch_version/dev/myteam/opensearch-myteam-nometa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
apiVersion: aiven.io/v1alpha1
kind: OpenSearch
metadata:
annotations:
controllers.aiven.io/generation-was-processed: "1"
controllers.aiven.io/instance-is-running: "true"
labels:
nais.io/managed-by: console
name: opensearch-myteam-nometa
spec:
cloudName: google-europe-north1
connInfoSecretTarget:
name: ""
disk_space: 16G
plan: hobbyist
project: nav-dev
projectVpcId: fff21e17-95d5-408b-8df5-15aacf38f5de
terminationProtection: true
userConfig:
opensearch_version: "2"
status:
conditions:
- lastTransitionTime: "2024-01-10T09:40:58Z"
message: Instance is running on Aiven side
reason: CheckRunning
status: "True"
type: Running
state: RUNNING
1 change: 1 addition & 0 deletions integration_tests/k8s_resources/simple/dev/slug-1/opensearch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ spec:
userConfig:
opensearch_version: "2"
status:
version: "2.19.3"
conditions:
- lastTransitionTime: "2023-11-08T10:36:06Z"
message: Instance was created or update on Aiven side
Expand Down
1 change: 1 addition & 0 deletions integration_tests/k8s_resources/simple/dev/slug-1/valkey.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ spec:
tenant: nav
terminationProtection: true
status:
version: "9.1.0"
conditions:
- lastTransitionTime: "2023-11-20T19:07:04Z"
message: Instance was created or update on Aiven side
Expand Down
2 changes: 2 additions & 0 deletions integration_tests/k8s_resources/state/dev/myteam/opensearch-myteam-poweroff.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ spec:
terminationProtection: true
userConfig:
opensearch_version: "2"
status:
state: POWEROFF
2 changes: 2 additions & 0 deletions integration_tests/k8s_resources/state/dev/myteam/opensearch-myteam-rebalancing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ spec:
terminationProtection: true
userConfig:
opensearch_version: "2"
status:
state: REBALANCING
2 changes: 2 additions & 0 deletions integration_tests/k8s_resources/state/dev/myteam/opensearch-myteam-running.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ spec:
terminationProtection: true
userConfig:
opensearch_version: "2"
status:
state: RUNNING
2 changes: 2 additions & 0 deletions integration_tests/k8s_resources/state/dev/myteam/valkey-myteam-poweroff.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ spec:
team: slug-1
tenant: nav
terminationProtection: true
status:
state: POWEROFF
2 changes: 2 additions & 0 deletions integration_tests/k8s_resources/state/dev/myteam/valkey-myteam-rebalancing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ spec:
team: slug-1
tenant: nav
terminationProtection: true
status:
state: REBALANCING
2 changes: 2 additions & 0 deletions integration_tests/k8s_resources/state/dev/myteam/valkey-myteam-running.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ spec:
team: slug-1
tenant: nav
terminationProtection: true
status:
state: RUNNING
Loading