Skip to content
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
76 changes: 34 additions & 42 deletions .github/workflows/publish-image.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Publish Image to GitHub Container Registry
name: Publish Image

on:
push:
Expand All @@ -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
Expand All @@ -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: .
Expand All @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# ===========================

# Current Operator version
VERSION ?= 0.19.1
VERSION ?= 0.20.0

# Default bundle image tag
BUNDLE_IMG ?= controller-bundle:$(VERSION)
Expand Down
4 changes: 2 additions & 2 deletions charts/redis-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1179,6 +1179,8 @@ spec:
- name
type: object
type: array
hostPort:
type: integer
initContainer:
description: InitContainer for each Redis pods
properties:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,8 @@ spec:
type: array
hostNetwork:
type: boolean
hostPort:
type: integer
initContainer:
description: InitContainer for each Redis pods
properties:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1188,6 +1188,8 @@ spec:
- name
type: object
type: array
hostPort:
type: integer
initContainer:
description: InitContainer for each Redis pods
properties:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1113,6 +1113,8 @@ spec:
- name
type: object
type: array
hostPort:
type: integer
initContainer:
description: InitContainer for each Redis pods
properties:
Expand Down Expand Up @@ -2524,6 +2526,9 @@ spec:
properties:
additionalSentinelConfig:
type: string
announceHostnames:
default: "no"
type: string
downAfterMilliseconds:
default: "30000"
type: string
Expand Down Expand Up @@ -2634,9 +2639,6 @@ spec:
resolveHostnames:
default: "no"
type: string
announceHostnames:
default: "no"
type: string
required:
- redisReplicationName
type: object
Expand Down
1 change: 0 additions & 1 deletion pkg/agent/sidecar.go

This file was deleted.

Loading