This is an automated email from the ASF dual-hosted git repository.
rkk pushed a commit to branch release/1.4.0
in repository https://gitbox.apache.org/repos/asf/sdap-nexus.git
The following commit(s) were added to refs/heads/release/1.4.0 by this push:
new 70000da Some more version fixes
70000da is described below
commit 70000da7e16daa6428abd2ed1318c2dd55de1079
Author: rileykk <[email protected]>
AuthorDate: Mon Oct 28 08:00:48 2024 -0700
Some more version fixes
---
docs/build.rst | 4 +-
helm/README.md | 76 +++++++++++++++----------------
helm/templates/solr-create-collection.yml | 2 +-
helm/values.yaml | 8 ++--
4 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/docs/build.rst b/docs/build.rst
index de7d546..8bbb3a9 100644
--- a/docs/build.rst
+++ b/docs/build.rst
@@ -25,8 +25,8 @@ We should also set variables for a consistent tag across all
images. These shoul
.. code-block:: bash
- export NEXUS_VERSION=1.2.0
- export INGESTER_VERSION=1.2.0
+ export NEXUS_VERSION=1.4.0
+ export INGESTER_VERSION=1.4.0
To build the necessary images, we will need to first download the latest
releases for SDAP NEXUS and SDAP Ingester ((URL)). We will not need to download
the SDAP Nexusproto release directly.
diff --git a/helm/README.md b/helm/README.md
index ee6fa91..605af9f 100644
--- a/helm/README.md
+++ b/helm/README.md
@@ -133,47 +133,47 @@ The following tables list the configurable parameters of
the NEXUS chart and the
> **Note**: The default configuration values are tuned to run NEXUS in a local
> environment. Setting `ingressEnabled=true` in addition will create a load
> balancer and expose NEXUS at `localhost`.
### SDAP Webapp (Analysis) Parameters
-| Parameter | Description |
Default |
-|---------------------------------------|------------------------------------|---------------------------------------------|
-| `onEarthProxyIP` | IP or hostname to proxy `/onearth`
to (leave blank to disable the proxy)| `""` |
-| `rootWebpage.enabled` | Whether to deploy the root webpage
(just returns HTTP 200) | `true` |
-| `webapp.enabled` | Whether to deploy the webapp |
`true` |
-| `webapp.distributed.image` | Docker image and tag for the webapp|
`nexusjpl/nexus-webapp:distributed.0.2.2` |
-| `webapp.distributed.driver.cores` | Number of cores on Spark driver |
`1` |
-| `webapp.distributed.driver.coreLimit` | Maximum cores on Spark driver, in
millicpus| `1200m` |
-| `webapp.distributed.driver.memory` | Memory on Spark driver |
`512m` |
-| `webapp.distributed.driver.tolerations`| Tolerations for Spark driver |
`nil` |
-| `webapp.distributed.driver.affinity` | Affinity (node or pod) for Spark
driver| `nil` |
-| `webapp.distributed.executor.cores` | Number of cores on Spark workers |
`1` |
-| `webapp.distributed.executor.instances`|Number of Spark workers |
`2` |
-| `webapp.distributed.executor.memory` | Memory on Spark workers |
`512m` |
-| `webapp.distributed.executor.tolerations`| Tolerations for Spark workers |
`nil` |
-| `webapp.distributed.executor.affinity`| Affinity (node or pod) for Spark
workers| `nil` |
+| Parameter | Description
| Default |
+|-------------------------------------------|--------------------------------------------------------------------------|------------------------------------|
+| `onEarthProxyIP` | IP or hostname to proxy
`/onearth` to (leave blank to disable the proxy) | `""`
|
+| `rootWebpage.enabled` | Whether to deploy the root
webpage (just returns HTTP 200) | `true`
|
+| `webapp.enabled` | Whether to deploy the webapp
| `true` |
+| `webapp.distributed.image` | Docker image and tag for the
webapp | `apache/sdap-nexus-webapp:1.4.0`
|
+| `webapp.distributed.driver.cores` | Number of cores on Spark driver
| `1` |
+| `webapp.distributed.driver.coreLimit` | Maximum cores on Spark driver,
in millicpus | `1200m` |
+| `webapp.distributed.driver.memory` | Memory on Spark driver
| `512m` |
+| `webapp.distributed.driver.tolerations` | Tolerations for Spark driver
| `nil` |
+| `webapp.distributed.driver.affinity` | Affinity (node or pod) for Spark
driver | `nil` |
+| `webapp.distributed.executor.cores` | Number of cores on Spark workers
| `1` |
+| `webapp.distributed.executor.instances` | Number of Spark workers
| `2` |
+| `webapp.distributed.executor.memory` | Memory on Spark workers
| `512m` |
+| `webapp.distributed.executor.tolerations` | Tolerations for Spark workers
| `nil` |
+| `webapp.distributed.executor.affinity` | Affinity (node or pod) for Spark
workers | `nil` |
### SDAP Ingestion Parameters
-| Parameter | Description |
Default |
-|---------------------------------------|------------------------------------|---------------------------------------------|
-| `ingestion.enabled` | Enable ingestion by deploying the
Config Operator, Collection Manager, Granule Ingestion| `true` |
-| `ingestion.granuleIngester.replicas` | Number of Granule Ingester replicas
| `2` |
-| `ingestion.granuleIngester.image` | Docker image and tag for Granule
Ingester| `nexusjpl/granule-ingester:0.1.2` |
-| `ingestion.granuleIngester.cpu` | CPUs (request and limit) for each
Granule Ingester replica| `1` |
-| `ingestion.granuleIngester.memory` | Memory (request and limit) for each
Granule Ingester replica| `1Gi` |
-| `ingestion.collectionManager.image` | Docker image and tag for Collection
Manager| `nexusjpl/collection-manager:0.1.2` |
-| `ingestion.collectionManager.cpu` | CPUs (request and limit) for the
Collection Manager | `0.5` |
-| `ingestion.collectionManager.memory` | Memory (request and limit) for the
Collection Manager | `1Gi` |
-| `ingestion.configOperator.image` | Docker image and tag for Config
Operator | `nexusjpl/config-operator:0.0.1` |
-| `ingestion.granules.nfsServer` | An optional URL to an NFS server
containing a directory where granule files are stored. If set, this NFS server
will be mounted in the Collection Manager and Granule Ingester pods.| `nil` |
-| `ingestion.granules.mountPath` | The path in the Collection Manager
and Granule Ingester pods where granule files will be mounted. *Important:* the
`path` property on all collections in the Collections Config file should match
this value.| `/data` |
-| `ingestion.granules.path` | Directory on either the local
filesystem or an NFS mount where granule files are located. This directory will
be mounted onto the Collection Manager and Granule Ingester at
`ingestion.granules.mountPath`. | `/var/lib/sdap/granules` |
-| `ingestion.granules.s3.bucket` | An optional S3 bucket from which to
download granules for ingestion. If this is set, `ingestion.granules.nfsServer`
and `ingestion.granules.path` will be ignored.|`nil`|
-| `ingestion.granules.awsCredsEnvs` | Environment variables containing AWS
credentials. This should be populated if `ingestion.granules.s3.bucket` is set.
See https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-envvars.html
for possible options.|`nil`|
-| `ingestion.collections.createCrd` | Whether to automatically create the
`GitBasedConfig` CRD (custom resource definition). This CRD is only needed if
loading the Collections Config from a Git repository is enabled (i.e., only if
`ingestion.collections.git.url` is set).
-| `ingestion.collections.configMap` | The name of the ConfigMap to use as
the [Collections
Config](https://github.com/apache/incubator-sdap-ingester/tree/dev/collection_manager#the-collections-configuration-file).
If this is set, then the Config Operator and its associated RBAC roles and CRD
will **not** be deployed. Correspondingly, if you do not want to use a Git
repository to store the Collections Config, this value should be set. | `nil`|
-| `ingestion.collections.git.url` | URL to a Git repository containing a
[Collections
Config](https://github.com/apache/incubator-sdap-ingester/tree/dev/collection_manager#the-collections-configuration-file)
file. The file should be at the root of the repository. The repository URL
should be of the form `https://github.com/username/repo.git`.| `nil`|
-| `ingestion.collections.git.branch` | Branch to use when loading a
Collections Config file from a Git repository.| `master`|
-| `ingestion.history.solrEnabled` | Whether to store ingestion history
in Solr, instead of in a filesystem directory. If this is set to `true`,
`ingestion.history.storageClass` will be ignored. | `true`|
-| `ingestion.history.storageClass` | The storage class to use for
storing ingestion history files. This will only be used if
`ingestion.history.solrEnabled` is set to `false`. | `hostpath`|
+| Parameter | Description
| Default
|
+|--------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------|
+| `ingestion.enabled` | Enable ingestion by deploying the
Config Operator, Collection Manager, Granule Ingestion
| `true`
|
+| `ingestion.granuleIngester.replicas` | Number of Granule Ingester replicas
| `2`
|
+| `ingestion.granuleIngester.image` | Docker image and tag for Granule
Ingester
|
`apache/sdap-granule-ingester:1.4.0` |
+| `ingestion.granuleIngester.cpu` | CPUs (request and limit) for each
Granule Ingester replica
| `1`
|
+| `ingestion.granuleIngester.memory` | Memory (request and limit) for each
Granule Ingester replica
| `1Gi`
|
+| `ingestion.collectionManager.image` | Docker image and tag for Collection
Manager
|
`apache/sdap-collection-manager:1.4.0` |
+| `ingestion.collectionManager.cpu` | CPUs (request and limit) for the
Collection Manager
| `0.5`
|
+| `ingestion.collectionManager.memory` | Memory (request and limit) for the
Collection Manager
| `1Gi`
|
+| `ingestion.configOperator.image` | Docker image and tag for Config
Operator
|
`nexusjpl/config-operator:0.0.1` |
+| `ingestion.granules.nfsServer` | An optional URL to an NFS server
containing a directory where granule files are stored. If set, this NFS server
will be mounted in the Collection Manager and Granule Ingester pods.
| `nil`
|
+| `ingestion.granules.mountPath` | The path in the Collection Manager
and Granule Ingester pods where granule files will be mounted. *Important:* the
`path` property on all collections in the Collections Config file should match
this value.
| `/data`
|
+| `ingestion.granules.path` | Directory on either the local
filesystem or an NFS mount where granule files are located. This directory will
be mounted onto the Collection Manager and Granule Ingester at
`ingestion.granules.mountPath`.
|
`/var/lib/sdap/granules` |
+| `ingestion.granules.s3.bucket` | An optional S3 bucket from which to
download granules for ingestion. If this is set, `ingestion.granules.nfsServer`
and `ingestion.granules.path` will be ignored.
| `nil`
|
+| `ingestion.granules.awsCredsEnvs` | Environment variables containing AWS
credentials. This should be populated if `ingestion.granules.s3.bucket` is set.
See https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-envvars.html
for possible options.
| `nil`
|
+| `ingestion.collections.createCrd` | Whether to automatically create the
`GitBasedConfig` CRD (custom resource definition). This CRD is only needed if
loading the Collections Config from a Git repository is enabled (i.e., only if
`ingestion.collections.git.url` is set).
|
|
+| `ingestion.collections.configMap` | The name of the ConfigMap to use as
the [Collections
Config](https://github.com/apache/incubator-sdap-ingester/tree/dev/collection_manager#the-collections-configuration-file).
If this is set, then the Config Operator and its associated RBAC roles and CRD
will **not** be deployed. Correspondingly, if you do not want to use a Git
repository to store the Collections Config, this value should be set. | `nil`
|
+| `ingestion.collections.git.url` | URL to a Git repository containing a
[Collections
Config](https://github.com/apache/incubator-sdap-ingester/tree/dev/collection_manager#the-collections-configuration-file)
file. The file should be at the root of the repository. The repository URL
should be of the form `https://github.com/username/repo.git`.
|
`nil` |
+| `ingestion.collections.git.branch` | Branch to use when loading a
Collections Config file from a Git repository.
| `master`
|
+| `ingestion.history.solrEnabled` | Whether to store ingestion history in
Solr, instead of in a filesystem directory. If this is set to `true`,
`ingestion.history.storageClass` will be ignored.
| `true`
|
+| `ingestion.history.storageClass` | The storage class to use for storing
ingestion history files. This will only be used if
`ingestion.history.solrEnabled` is set to `false`.
|
`hostpath` |
### Cassandra Parameters
diff --git a/helm/templates/solr-create-collection.yml
b/helm/templates/solr-create-collection.yml
index a279325..883a9fb 100644
--- a/helm/templates/solr-create-collection.yml
+++ b/helm/templates/solr-create-collection.yml
@@ -31,7 +31,7 @@ spec:
containers:
- name: solr-create-collection
imagePullPolicy: Always
- image: {{ .Values.solr.initImage | default
"apache/sdap-solr-cloud-init:1.1.0" }}
+ image: {{ .Values.solr.initImage | default
"apache/sdap-solr-cloud-init:1.4.0" }}
resources:
requests:
memory: "0.5Gi"
diff --git a/helm/values.yaml b/helm/values.yaml
index ab86725..2d93825 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -24,7 +24,7 @@ rootWebpage:
webapp:
enabled: true
distributed:
- image: nexusjpl/nexus-webapp:distributed.0.4.1
+ image: apache/sdap-nexus-webapp:1.4.0
## Use any of the driver configuration options available at
##
https://github.com/GoogleCloudPlatform/spark-on-k8s-operator/blob/master/docs/user-guide.md
driver:
@@ -47,7 +47,7 @@ ingestion:
granuleIngester:
replicas: 2
- image: nexusjpl/granule-ingester:0.1.6
+ image: apache/sdap-granule-ingester:1.4.0
## cpu refers to both request and limit
cpu: 1
@@ -56,7 +56,7 @@ ingestion:
memory: 1Gi
collectionManager:
- image: nexusjpl/collection-manager:0.1.6
+ image: apache/sdap-collection-manager:1.4.0
## cpu refers to both request and limit
cpu: 0.5
@@ -144,7 +144,7 @@ external:
solr:
enabled: true
initPodEnabled: true
- initImage: apache/sdap-solr-cloud-init:1.2.0
+ initImage: apache/sdap-solr-cloud-init:1.4.0
image:
repository: nexusjpl/solr
tag: 8.11.1
