Skip to content

Commit

Permalink
Revert to use the opster API's and onboard to OpenSearch universal re…
Browse files Browse the repository at this point in the history
…lease mechanism (#710)

### Description
Revert to use the opster API's and onboard to [OpenSearch universal
release process
](https://github.com/opensearch-project/opensearch-build/blob/main/ONBOARDING.md#onboarding-to-universal--1-click-release-process).

### Issues Resolved

#709

#674

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and
signing off your commits, please check
[here](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).

---------

Signed-off-by: Prudhvi Godithi <[email protected]>
  • Loading branch information
prudhvigodithi authored Jan 30, 2024
1 parent 1de571c commit 81db8a3
Show file tree
Hide file tree
Showing 147 changed files with 1,320 additions and 1,441 deletions.
30 changes: 0 additions & 30 deletions .github/workflows/busybox.yaml

This file was deleted.

88 changes: 0 additions & 88 deletions .github/workflows/prepare-release.yaml

This file was deleted.

16 changes: 2 additions & 14 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,12 @@ jobs:
run: |
echo "RELEASE_VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV
- name: Build and Push docker image
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
cd opensearch-operator
make test
export IMG=public.ecr.aws/opsterio/opensearch-operator:$RELEASE_VERSION
echo $IMG
aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/opsterio
docker buildx build -t $IMG --platform="linux/amd64,linux/arm,linux/arm64" . -f Dockerfile --push
- name: Make sure helm chart has correct versions
run: |
sed -i -e 's/^appVersion:.*/appVersion: '$RELEASE_VERSION'/' charts/opensearch-operator/Chart.yaml
sed -i -e 's/^version:.*/version: '$RELEASE_VERSION'/' charts/opensearch-operator/Chart.yaml
sed -i -e 's/^appVersion:.*/appVersion: '$RELEASE_VERSION'/' charts/opensearch-cluster/Chart.yaml
sed -i -e 's/^version:.*/version: '$RELEASE_VERSION'/' charts/opensearch-cluster/Chart.yaml
- name: Install Helm
uses: azure/setup-helm@v1
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![build](https://github.com/opensearch-project/opensearch-k8s-operator/actions/workflows/docker-build.yaml/badge.svg) ![test](https://github.com/opster/opensearch-k8s-operator/actions/workflows/testing.yaml/badge.svg) ![release](https://img.shields.io/github/v/release/opster/opensearch-k8s-operator) [![Golang Lint](https://github.com/Opster/opensearch-k8s-operator/actions/workflows/linting.yaml/badge.svg)](https://github.com/Opster/opensearch-k8s-operator/actions/workflows/linting.yaml) [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/opensearch-operator)](https://artifacthub.io/packages/search?repo=opensearch-operator)
![build](https://github.com/opensearch-project/opensearch-k8s-operator/actions/workflows/docker-build.yaml/badge.svg) ![test](https://github.com/opensearch-project/opensearch-k8s-operator/actions/workflows/testing.yaml/badge.svg) ![release](https://img.shields.io/github/v/release/opster/opensearch-k8s-operator) [![Golang Lint](https://github.com/Opster/opensearch-k8s-operator/actions/workflows/linting.yaml/badge.svg)](https://github.com/Opster/opensearch-k8s-operator/actions/workflows/linting.yaml) [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/opensearch-operator)](https://artifacthub.io/packages/search?repo=opensearch-operator)

# OpenSearch Kubernetes Operator

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- if eq .Values.opensearchCluster.enabled true }}
apiVersion: opensearch.org/v1
apiVersion: opensearch.opster.io/v1
kind: OpenSearchCluster
metadata:
name: {{ .Values.clusterName | default .Release.Name}}
Expand Down
6 changes: 1 addition & 5 deletions charts/opensearch-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The Operator can be easily installed using helm on any CNCF-certified Kubernetes

#### Get Repo Info
```
helm repo add opensearch-operator helm repo add opensearch-charts https://opensearch-project.github.io/opensearch-k8s-operator
helm repo add opensearch-operator https://opensearch-project.github.io/opensearch-k8s-operator/
helm repo update
```
#### Install Chart
Expand All @@ -27,7 +27,3 @@ helm repo update
helm upgrade [RELEASE_NAME] opensearch-operator/opensearch-operator
```

## Installation Tutorial and Demo

[![Watch the video](https://opster.com/wp-content/uploads/2022/05/Operator-Installation-Tutorial.png)](https://player.vimeo.com/video/708641527)

Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.10.0
creationTimestamp: null
name: opensearchactiongroups.opensearch.org
name: opensearchactiongroups.opensearch.opster.io
spec:
group: opensearch.org
group: opensearch.opster.io
names:
kind: OpensearchActionGroup
listKind: OpensearchActionGroupList
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.10.0
creationTimestamp: null
name: opensearchclusters.opensearch.org
name: opensearchclusters.opensearch.opster.io
spec:
group: opensearch.org
group: opensearch.opster.io
names:
kind: OpenSearchCluster
listKind: OpenSearchClusterList
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.10.0
creationTimestamp: null
name: opensearchcomponenttemplates.opensearch.org
name: opensearchcomponenttemplates.opensearch.opster.io
spec:
group: opensearch.org
group: opensearch.opster.io
names:
kind: OpensearchComponentTemplate
listKind: OpensearchComponentTemplateList
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.10.0
creationTimestamp: null
name: opensearchindextemplates.opensearch.org
name: opensearchindextemplates.opensearch.opster.io
spec:
group: opensearch.org
group: opensearch.opster.io
names:
kind: OpensearchIndexTemplate
listKind: OpensearchIndexTemplateList
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.10.0
creationTimestamp: null
name: opensearchismpolicies.opensearch.org
name: opensearchismpolicies.opensearch.opster.io
spec:
group: opensearch.org
group: opensearch.opster.io
names:
kind: OpenSearchISMPolicy
listKind: OpenSearchISMPolicyList
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.10.0
creationTimestamp: null
name: opensearchroles.opensearch.org
name: opensearchroles.opensearch.opster.io
spec:
group: opensearch.org
group: opensearch.opster.io
names:
kind: OpensearchRole
listKind: OpensearchRoleList
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.10.0
creationTimestamp: null
name: opensearchtenants.opensearch.org
name: opensearchtenants.opensearch.opster.io
spec:
group: opensearch.org
group: opensearch.opster.io
names:
kind: OpensearchTenant
listKind: OpensearchTenantList
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.10.0
creationTimestamp: null
name: opensearchuserrolebindings.opensearch.org
name: opensearchuserrolebindings.opensearch.opster.io
spec:
group: opensearch.org
group: opensearch.opster.io
names:
kind: OpensearchUserRoleBinding
listKind: OpensearchUserRoleBindingList
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.10.0
creationTimestamp: null
name: opensearchusers.opensearch.org
name: opensearchusers.opensearch.opster.io
spec:
group: opensearch.org
group: opensearch.opster.io
names:
kind: OpensearchUser
listKind: OpensearchUserList
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ data:
port: 9443
leaderElection:
leaderElect: true
resourceName: a867c7dc.opensearch.org
resourceName: a867c7dc.opensearch.opster.io
kind: ConfigMap
metadata:
name: {{ include "opensearch-operator.fullname" . }}-manager-config
Loading

0 comments on commit 81db8a3

Please sign in to comment.