diff --git a/.github/workflows/publish-image.yaml b/.github/workflows/publish-image.yaml index 6eed93bad8..9faf8a5b3e 100644 --- a/.github/workflows/publish-image.yaml +++ b/.github/workflows/publish-image.yaml @@ -1,4 +1,4 @@ -name: Publish Image to GitHub Container Registry +name: Publish Image on: push: @@ -8,9 +8,10 @@ on: env: REGISTRY: ghcr.io REPOSITORY: ot-container-kit/redis-operator + QuayImageName: quay.io/opstree/redis-operator jobs: - build-and-push: + release-ghcr-image: runs-on: ubuntu-latest steps: - name: Checkout code @@ -33,7 +34,7 @@ jobs: run: | echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV - - name: Build and Push Operator image + - name: Build and push image uses: docker/build-push-action@v6 with: context: . @@ -44,49 +45,40 @@ jobs: ${{ env.REGISTRY }}/${{ env.REPOSITORY }}/redis-operator:latest platforms: linux/amd64,linux/arm64 -# name: Release container images -# on: -# pull_request: -# types: [closed] -# branches: -# - main - -# env: -# APPLICATION_NAME: redis-operator -# QuayImageName: quay.io/opstree/redis-operator -# APP_VERSION: "v0.15.2" -# DOCKERFILE_PATH: './Dockerfile' - -# jobs: -# release_image: -# if: github.event.pull_request.merged == true -# runs-on: ubuntu-latest -# environment: release-image -# steps: -# - name: Checkout -# uses: actions/checkout@v2 + release-quay-image: + runs-on: ubuntu-latest + environment: release-image + steps: + - name: Checkout + uses: actions/checkout@v4 -# - name: Set up Docker Buildx -# uses: docker/setup-buildx-action@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 -# - name: Set up QEMU -# uses: docker/setup-qemu-action@v3 + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 -# - name: Login to Quay.io -# uses: docker/login-action@v3 -# with: -# registry: quay.io -# username: ${{ secrets.QUAY_USERNAME }} -# password: ${{ secrets.QUAY_PASSWORD }} + - name: Login to Quay.io + uses: docker/login-action@v3 + with: + registry: quay.io + username: ${{ secrets.QUAY_USERNAME }} + password: ${{ secrets.QUAY_PASSWORD }} -# - name: Build and push multi-arch latest image -# uses: docker/build-push-action@v2 -# with: -# context: . -# file: ${{ env.DOCKERFILE_PATH }} -# platforms: linux/amd64,linux/arm64 -# push: true -# tags: ${{ env.QuayImageName }}:${{ env.APP_VERSION }}, ${{ env.QuayImageName }}:latest + - name: Setup Env + run: | + echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV + + - name: Build and push image + uses: docker/build-push-action@v6 + with: + context: . + file: Dockerfile + platforms: linux/amd64,linux/arm64 + push: true + tags: | + ${{ env.QuayImageName }}:${{ env.TAG }} + ${{ env.QuayImageName }}:latest # trivy_scan: # needs: [release_image] diff --git a/Makefile b/Makefile index 9940186197..4ecdd960f0 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # =========================== # Current Operator version -VERSION ?= 0.19.1 +VERSION ?= 0.20.0 # Default bundle image tag BUNDLE_IMG ?= controller-bundle:$(VERSION) diff --git a/charts/redis-operator/Chart.yaml b/charts/redis-operator/Chart.yaml index 793593e9ef..8201a756bf 100644 --- a/charts/redis-operator/Chart.yaml +++ b/charts/redis-operator/Chart.yaml @@ -1,7 +1,7 @@ --- apiVersion: v2 -version: 0.19.3 -appVersion: "0.19.1" +version: 0.20.0 +appVersion: "0.20.0" description: Provides easy redis setup definitions for Kubernetes services, and deployment. engine: gotpl maintainers: diff --git a/charts/redis-operator/crds/redis.redis.opstreelabs.in_redis.yaml b/charts/redis-operator/crds/redis.redis.opstreelabs.in_redis.yaml index 33fa9cb5a5..ccb44c6fb4 100644 --- a/charts/redis-operator/crds/redis.redis.opstreelabs.in_redis.yaml +++ b/charts/redis-operator/crds/redis.redis.opstreelabs.in_redis.yaml @@ -1179,6 +1179,8 @@ spec: - name type: object type: array + hostPort: + type: integer initContainer: description: InitContainer for each Redis pods properties: diff --git a/charts/redis-operator/crds/redis.redis.opstreelabs.in_redisclusters.yaml b/charts/redis-operator/crds/redis.redis.opstreelabs.in_redisclusters.yaml index 75e8121692..98ff2f4005 100644 --- a/charts/redis-operator/crds/redis.redis.opstreelabs.in_redisclusters.yaml +++ b/charts/redis-operator/crds/redis.redis.opstreelabs.in_redisclusters.yaml @@ -329,6 +329,8 @@ spec: type: array hostNetwork: type: boolean + hostPort: + type: integer initContainer: description: InitContainer for each Redis pods properties: diff --git a/charts/redis-operator/crds/redis.redis.opstreelabs.in_redisreplications.yaml b/charts/redis-operator/crds/redis.redis.opstreelabs.in_redisreplications.yaml index e7edb78ad0..4b7953e07a 100644 --- a/charts/redis-operator/crds/redis.redis.opstreelabs.in_redisreplications.yaml +++ b/charts/redis-operator/crds/redis.redis.opstreelabs.in_redisreplications.yaml @@ -1188,6 +1188,8 @@ spec: - name type: object type: array + hostPort: + type: integer initContainer: description: InitContainer for each Redis pods properties: diff --git a/charts/redis-operator/crds/redis.redis.opstreelabs.in_redissentinels.yaml b/charts/redis-operator/crds/redis.redis.opstreelabs.in_redissentinels.yaml index 3a7572bfc7..6dde261fab 100644 --- a/charts/redis-operator/crds/redis.redis.opstreelabs.in_redissentinels.yaml +++ b/charts/redis-operator/crds/redis.redis.opstreelabs.in_redissentinels.yaml @@ -1113,6 +1113,8 @@ spec: - name type: object type: array + hostPort: + type: integer initContainer: description: InitContainer for each Redis pods properties: @@ -2524,6 +2526,9 @@ spec: properties: additionalSentinelConfig: type: string + announceHostnames: + default: "no" + type: string downAfterMilliseconds: default: "30000" type: string @@ -2634,9 +2639,6 @@ spec: resolveHostnames: default: "no" type: string - announceHostnames: - default: "no" - type: string required: - redisReplicationName type: object diff --git a/pkg/agent/sidecar.go b/pkg/agent/sidecar.go deleted file mode 100644 index 488315541b..0000000000 --- a/pkg/agent/sidecar.go +++ /dev/null @@ -1 +0,0 @@ -package agent