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.

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

Add 7.0.0.0 schema and update samples, test-cases as per latest schema #258

Merged
merged 3 commits into from
Nov 29, 2023
Merged

Add 7.0.0.0 schema and update samples, test-cases as per latest schema #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
745ecdd
Add 7.0.0.0 schema and update samples, test-cases as per latest schema
abhishekdwivedi3060 Nov 23, 2023
7f21e86
Fix test-cases
abhishekdwivedi3060 Nov 24, 2023
c5fcbcc
Fix test-cases
abhishekdwivedi3060 Nov 27, 2023
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
5 changes: 2 additions & 3 deletions config/samples/all_flash_cluster_cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:

spec:
size: 2
image: aerospike/aerospike-server-enterprise:6.4.0.0
image: aerospike/aerospike-server-enterprise:7.0.0.0

storage:
filesystemVolumePolicy:
Expand Down Expand Up @@ -82,13 +82,12 @@ spec:
port: 3002
namespaces:
- name: test
memory-size: 3000000000
replication-factor: 2
index-type:
type: flash
mounts:
- /test/dev/xvdf-index
mounts-size-limit: 4294967296
mounts-budget: 4294967296
storage-engine:
type: device
devices:
Expand Down
4 changes: 2 additions & 2 deletions config/samples/dim_nostorage_cluster_cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: aerospike
spec:
size: 2
image: aerospike/aerospike-server-enterprise:6.4.0.0
image: aerospike/aerospike-server-enterprise:7.0.0.0

podSpec:
multiPodPerHost: true
Expand Down Expand Up @@ -51,7 +51,7 @@ spec:
port: 3002
namespaces:
- name: test
memory-size: 3000000000
replication-factor: 2
storage-engine:
type: memory
data-size: 1073741824
4 changes: 2 additions & 2 deletions config/samples/dim_nostorage_cluster_skip_validation_cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ metadata:

spec:
size: 2
image: aerospike/aerospike-server-enterprise:6.4.0.0
image: aerospike/aerospike-server-enterprise:7.0.0.0
podSpec:
multiPodPerHost: true

Expand Down Expand Up @@ -49,7 +49,7 @@ spec:
port: 3002
namespaces:
- name: test
memory-size: 3000000000
replication-factor: 2
storage-engine:
type: memory
data-size: 1073741824
6 changes: 2 additions & 4 deletions config/samples/hdd_dim_storage_cluster_cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:

spec:
size: 2
image: aerospike/aerospike-server-enterprise:6.4.0.0
image: aerospike/aerospike-server-enterprise:7.0.0.0

storage:
filesystemVolumePolicy:
Expand Down Expand Up @@ -64,11 +64,9 @@ spec:
port: 3002
namespaces:
- name: test
memory-size: 3000000000
replication-factor: 2
storage-engine:
type: device
type: memory
files:
- /opt/aerospike/data/test.dat
filesize: 2000000000
data-in-memory: true
3 changes: 1 addition & 2 deletions config/samples/host_network_cluster_cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:

spec:
size: 2
image: aerospike/aerospike-server-enterprise:6.4.0.0
image: aerospike/aerospike-server-enterprise:7.0.0.0

storage:
filesystemVolumePolicy:
Expand Down Expand Up @@ -62,7 +62,6 @@ spec:
port: 3002
namespaces:
- name: test
memory-size: 3000000000
replication-factor: 2
storage-engine:
type: device
Expand Down
4 changes: 2 additions & 2 deletions config/samples/ldap_cluster_cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ metadata:
namespace: aerospike
spec:
size: 2
image: aerospike/aerospike-server-enterprise:6.4.0.0
image: aerospike/aerospike-server-enterprise:7.0.0.0

podSpec:
multiPodPerHost: true
Expand Down Expand Up @@ -91,7 +91,7 @@ spec:
ca-file: /etc/aerospike/secret/cacert.pem
namespaces:
- name: test
memory-size: 3000000000
replication-factor: 2
storage-engine:
type: memory
data-size: 1073741824
5 changes: 2 additions & 3 deletions config/samples/pmem_cluster_cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:

spec:
size: 2
image: aerospike/aerospike-server-enterprise:6.4.0.0
image: aerospike/aerospike-server-enterprise:7.0.0.0

storage:
filesystemVolumePolicy:
Expand Down Expand Up @@ -73,7 +73,6 @@ spec:
port: 3002
namespaces:
- name: test
memory-size: 3000000000
replication-factor: 2
storage-engine:
type: pmem
Expand All @@ -84,4 +83,4 @@ spec:
type: pmem
mounts:
- /mnt/pmem1
mounts-size-limit: 1073741824
mounts-budget: 1073741824
4 changes: 2 additions & 2 deletions config/samples/podspec_cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:

spec:
size: 2
image: aerospike/aerospike-server-enterprise:6.4.0.0
image: aerospike/aerospike-server-enterprise:7.0.0.0

storage:
filesystemVolumePolicy:
Expand Down Expand Up @@ -91,7 +91,7 @@ spec:

namespaces:
- name: test
memory-size: 3000000000
replication-factor: 2
storage-engine:
type: memory
data-size: 1073741824
5 changes: 2 additions & 3 deletions config/samples/rack_enabled_cluster_cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:

spec:
size: 2
image: aerospike/aerospike-server-enterprise:6.4.0.0
image: aerospike/aerospike-server-enterprise:7.0.0.0
rackConfig:
namespaces:
- test
Expand Down Expand Up @@ -74,14 +74,13 @@ spec:

namespaces:
- name: test
memory-size: 3000000000
replication-factor: 2
storage-engine:
type: device
devices:
- /test/dev/xvdf
- name: testMem
memory-size: 3000000000
replication-factor: 1
storage-engine:
type: memory
data-size: 1073741824
3 changes: 1 addition & 2 deletions config/samples/sc_mode_cluster_cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:

spec:
size: 4
image: aerospike/aerospike-server-enterprise:6.4.0.0
image: aerospike/aerospike-server-enterprise:7.0.0.0

rosterNodeBlockList:
- 1A0
Expand Down Expand Up @@ -71,7 +71,6 @@ spec:
port: 3002
namespaces:
- name: test
memory-size: 3000000000
replication-factor: 2
strong-consistency: true
storage-engine:
Expand Down
3 changes: 1 addition & 2 deletions config/samples/shadow_device_cluster_cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
spec:
# Add fields here
size: 2
image: aerospike/aerospike-server-enterprise:6.4.0.0
image: aerospike/aerospike-server-enterprise:7.0.0.0

storage:
filesystemVolumePolicy:
Expand Down Expand Up @@ -71,7 +71,6 @@ spec:
port: 3002
namespaces:
- name: test
memory-size: 3000000000
replication-factor: 2
storage-engine:
type: device
Expand Down
3 changes: 1 addition & 2 deletions config/samples/shadow_file_cluster_cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
spec:
# Add fields here
size: 2
image: aerospike/aerospike-server-enterprise:6.4.0.0
image: aerospike/aerospike-server-enterprise:7.0.0.0

storage:
filesystemVolumePolicy:
Expand Down Expand Up @@ -71,7 +71,6 @@ spec:
port: 3002
namespaces:
- name: test
memory-size: 3000000000
replication-factor: 2
storage-engine:
type: device
Expand Down
3 changes: 1 addition & 2 deletions config/samples/ssd_storage_cluster_cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:

spec:
size: 2
image: aerospike/aerospike-server-enterprise:6.4.0.0
image: aerospike/aerospike-server-enterprise:7.0.0.0

storage:
filesystemVolumePolicy:
Expand Down Expand Up @@ -62,7 +62,6 @@ spec:
port: 3002
namespaces:
- name: test
memory-size: 3000000000
replication-factor: 2
storage-engine:
type: device
Expand Down
4 changes: 1 addition & 3 deletions config/samples/tls_cluster_cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:

spec:
size: 4
image: aerospike/aerospike-server-enterprise:6.4.0.0
image: aerospike/aerospike-server-enterprise:7.0.0.0

storage:
filesystemVolumePolicy:
Expand Down Expand Up @@ -77,11 +77,9 @@ spec:

namespaces:
- name: bar
memory-size: 3000000000
replication-factor: 1
storage-engine:
type: device
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here type: should be memory.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have intentionally removed the data-in-memory wherever the functionality is not related to data-in-memory

files:
- /opt/aerospike/data/bar.dat
filesize: 2000000000
data-in-memory: true
4 changes: 1 addition & 3 deletions config/samples/xdr_dst_cluster_cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:

spec:
size: 2
image: aerospike/aerospike-server-enterprise:6.4.0.0
image: aerospike/aerospike-server-enterprise:7.0.0.0

storage:
filesystemVolumePolicy:
Expand Down Expand Up @@ -63,11 +63,9 @@ spec:
port: 3002
namespaces:
- name: test
memory-size: 3000000000
replication-factor: 2
storage-engine:
type: device
files:
- /opt/aerospike/data/test.dat
filesize: 2000000000
data-in-memory: true
4 changes: 1 addition & 3 deletions config/samples/xdr_src_cluster_cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:

spec:
size: 2
image: aerospike/aerospike-server-enterprise:6.4.0.0
image: aerospike/aerospike-server-enterprise:7.0.0.0

storage:
filesystemVolumePolicy:
Expand Down Expand Up @@ -84,11 +84,9 @@ spec:

namespaces:
- name: test
memory-size: 3000000000
replication-factor: 2
storage-engine:
type: device
files:
- /opt/aerospike/data/test.dat
filesize: 2000000000
data-in-memory: true
4 changes: 2 additions & 2 deletions helm-charts/aerospike-cluster/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ helm install aerospike ./aerospike-cluster/ \
| ---------- | ----------- | --------- |
| `replicas` | Aerospike cluster size | `3` |
| `image.repository` | Aerospike server container image repository | `aerospike/aerospike-server-enterprise` |
| `image.tag` | Aerospike server container image tag | `6.4.0.0` |
| `image.tag` | Aerospike server container image tag | `7.0.0.0` |
| `imagePullSecrets` | Secrets containing credentials to pull Aerospike container image from a private registry | `{}` (nil) |
| `customLabels` | Custom labels to add on the aerospikecluster resource | `{}` (nil) |
| `aerospikeAccessControl` | Aerospike access control configuration. Define users and roles to be created on the cluster. | `{}` (nil) |
Expand Down Expand Up @@ -85,10 +85,10 @@ aerospikeConfig:

namespaces:
- name: test
memory-size: 1073741824 # 1GiB
replication-factor: 2
storage-engine:
type: memory
data-size: 1073741824 # 1GiB

podSpec:
multiPodPerHost: true
Expand Down
5 changes: 3 additions & 2 deletions helm-charts/aerospike-cluster/templates/aerospike-cluster-cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
size: {{ .Values.replicas | default 3 }}

# Aerospike server docker image
image: {{ .Values.image.repository | default "aerospike/aerospike-server-enterprise" }}:{{ .Values.image.tag | default "6.4.0.0" }}
image: {{ .Values.image.repository | default "aerospike/aerospike-server-enterprise" }}:{{ .Values.image.tag | default "7.0.0.0" }}

# Aerospike access control configuration
{{- with .Values.aerospikeAccessControl }}
Expand All @@ -43,10 +43,11 @@ spec:

namespaces:
- name: test
memory-size: 1073741824 # 1GiB
replication-factor: 2
storage-engine:
type: memory
data-size: 1073741824 # 1GiB

{{- end }}

# Aerospike network policy
Expand Down
4 changes: 2 additions & 2 deletions helm-charts/aerospike-cluster/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ replicas: 3
## Aerospike server docker image
image:
repository: aerospike/aerospike-server-enterprise
tag: 6.4.0.0
tag: 7.0.0.0

## In case the above image is pulled from a registry that requires
## authentication, a secret containining credentials can be added
Expand Down Expand Up @@ -53,10 +53,10 @@ aerospikeConfig:

# namespaces:
# - name: test
# memory-size: 1073741824 # 1GiB
# replication-factor: 2
# storage-engine:
# type: memory
# data-size: 1073741824 # 1GiB


## Aerospike secrets
Expand Down
2 changes: 1 addition & 1 deletion pkg/configschema/schemas
Open in desktop
Submodule schemas updated 1 files
+3,060 −0 json/aerospike/7.0.0.json
Loading