Skip to content

Commit

Permalink
prepare for v1.0.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
howardgao committed Feb 9, 2022
1 parent fa30b76 commit 4145eb1
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ COPY entrypoint/ entrypoint/
# Build
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o /tmp/activemq-artemis-operator/${BROKER_NAME}-operator main.go

FROM registry.access.redhat.com/ubi8:8.5-214 AS base-env
FROM registry.access.redhat.com/ubi8:8.5-226 AS base-env

ENV BROKER_NAME=activemq-artemis
ENV OPERATOR=/home/${BROKER_NAME}-operator/bin/${BROKER_NAME}-operator
Expand All @@ -35,7 +35,7 @@ ENV USER_NAME=${BROKER_NAME}-operator
ENV CGO_ENABLED=0
ENV GOPATH=/tmp/go
ENV JBOSS_IMAGE_NAME="amq7/amq-broker-rhel8-operator"
ENV JBOSS_IMAGE_VERSION="0.20"
ENV JBOSS_IMAGE_VERSION="1.0"

WORKDIR /

Expand All @@ -60,4 +60,4 @@ LABEL \
maintainer="Roddie Kieley <rkieley@redhat.com>" \
name="amq7/amq-broker-rhel8-operator" \
summary="ActiveMQ Artemis Broker Operator" \
version="0.20"
version="1.0"
2 changes: 1 addition & 1 deletion Dockerfile_debug
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ COPY entrypoint/ entrypoint/
# Build
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -gcflags \"all=-N\" -v -o /tmp/activemq-artemis-operator/${BROKER_NAME}-operator main.go

FROM registry.access.redhat.com/ubi8:8.5-214 AS base-env
FROM registry.access.redhat.com/ubi8:8.5-226 AS base-env

ENV BROKER_NAME=activemq-artemis
ENV OPERATOR=/home/${BROKER_NAME}-operator/bin/${BROKER_NAME}-operator
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
# To re-generate a bundle for another specific version without changing the standard setup, you can:
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
VERSION ?= 0.0.1
VERSION ?= 1.0.0

KUBE_CLI=kubectl
OPERATOR_VERSION := 0.20.1
OPERATOR_VERSION := 1.0.0
OPERATOR_ACCOUNT_NAME := activemq-artemis-operator
OPERATOR_CLUSTER_ROLE_NAME := activemq-artemis-operator
OPERATOR_IMAGE_REPO := quay.io/artemiscloud/activemq-artemis-operator
Expand Down
2 changes: 1 addition & 1 deletion config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ spec:
- name: RELATED_IMAGE_ActiveMQ_Artemis_Broker_Kubernetes_2200
value: quay.io/artemiscloud/activemq-artemis-broker-kubernetes:0.2.9
image: controller:latest
imagePullPolicy: Always
# imagePullPolicy: Always
name: manager
securityContext:
allowPrivilegeEscalation: false
Expand Down
4 changes: 2 additions & 2 deletions version/version.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package version

var (
Version = "0.20.2"
Version = "1.0.0"
// PriorVersion - prior version
PriorVersion = "0.20.1"
)
Expand All @@ -24,7 +24,7 @@ var OperandVersionFromOperatorVersion map[string]string = map[string]string{
"0.19.0": "2.16.0",
"0.20.0": "2.18.0",
"0.20.1": "2.18.0",
"0.20.2": "2.20.0",
"1.0.0": "2.20.0",
}
var FullVersionFromMinorVersion map[string]string = map[string]string{
"150": "2.15.0",
Expand Down

0 comments on commit 4145eb1

Please sign in to comment.