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.

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

Prepare Release 2.5.1 #716

Merged
merged 1 commit into from
Feb 2, 2024
Merged
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
4 changes: 2 additions & 2 deletions charts/opensearch-cluster/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: opensearch-cluster
description: A Helm chart for OpenSearch Cluster
type: application
version: 2.5.0
appVersion: 2.5.0
version: 2.5.1
appVersion: 2.5.1
4 changes: 2 additions & 2 deletions charts/opensearch-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 2.5.0
version: 2.5.1

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: 2.5.0
appVersion: 2.5.1
2 changes: 1 addition & 1 deletion charts/opensearch-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ manager:
parallelRecoveryEnabled: true

image:
repository: public.ecr.aws/opensearch-project/opensearch-operator
repository: opensearchproject/opensearch-operator
gaiksaya marked this conversation as resolved.
Show resolved Hide resolved
## tag default uses appVersion from Chart.yaml, to override specify tag tag: "v1.1"
tag: ""
pullPolicy: "Always"
Expand Down
2 changes: 1 addition & 1 deletion docs/designs/crd.md
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ InitHelperConfig defines global Opensearch InitHelper image configuration
<td>string</td>
<td>Define InitHelper image</td>
<td>false</td>
<td>public.ecr.aws/opensearch-project/opensearch-operator-busybox</td>
<td>docker.io/busybox</td>
</tr><tr>
</tr><tr>
<td><b>imagePullPolicy</b></td>
Expand Down
2 changes: 1 addition & 1 deletion docs/userguide/main.md
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ manager:

### Custom init helper

During cluster initialization the operator uses init containers as helpers. For these containers a busybox image is used ( specifically `public.ecr.aws/opensearch-project/busybox:latest`). In case you are working in an offline environment and the cluster cannot access the registry or you want to customize the image, you can override the image used by specifying the `initHelper` image in your cluster spec:
During cluster initialization the operator uses init containers as helpers. For these containers a busybox image is used ( specifically `docker.io/busybox:latest`). In case you are working in an offline environment and the cluster cannot access the registry or you want to customize the image, you can override the image used by specifying the `initHelper` image in your cluster spec:

```yaml
spec:
Expand Down
3 changes: 2 additions & 1 deletion jenkins/release.jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ pipeline {
string(name: 'RELEASE_VERSION', value: "${OPERATOR_VERSION}"),
booleanParam(name: 'DOCKER_HUB_PROMOTE', value: true),
booleanParam(name: 'ECR_PROMOTE', value: true),
booleanParam(name: 'TAG_LATEST', value: true)
booleanParam(name: 'TAG_LATEST', value: true),
booleanParam(name: 'TAG_MAJOR_VERSION', value: false)
Copy link
Member

Choose a reason for hiding this comment

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

Don't we want to update the major version tag? Example: 2.5.1 -> 2

Copy link
Member Author

Choose a reason for hiding this comment

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

Adding @swoehrl-mw.
Sayali mostly the operator is installed and managed via helm and helm charts have fixed versions in Chart.yml, docker run wont work here hence I dont see a need to keep TAG_MAJOR_VERSION which adds more noise.

Copy link
Member Author

Choose a reason for hiding this comment

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

The docker-promotion job has default TAG_MAJOR_VERSION to true hence disabling it.

]
}
}
Expand Down
Loading