Skip to content

Commit

Permalink
[#1078] Migration update
Browse files Browse the repository at this point in the history
Changed references of artemiscloud to arkmq-org
  • Loading branch information
howardgao authored and brusdev committed Jan 17, 2025
1 parent 021df40 commit c201fb6
Show file tree
Hide file tree
Showing 143 changed files with 783 additions and 787 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,17 +96,17 @@ jobs:
with:
node-version: 18.x

- name: Checkout artemiscloud.github.io
- name: Checkout arkmq-org.github.io
uses: actions/checkout@v4
with:
repository: artemiscloud/artemiscloud.github.io
path: artemiscloud.github.io
repository: arkmq-org/arkmq-org.github.io
path: arkmq-org.github.io

- name: Build the docs
run: >
rm -rf artemiscloud.github.io/content/en/docs &&
cp -r docs artemiscloud.github.io/content/en &&
cd artemiscloud.github.io &&
rm -rf arkmq-org.github.io/content/en/docs &&
cp -r docs arkmq-org.github.io/content/en &&
cd arkmq-org.github.io &&
npm install && npm run build
- name: Set up QEMU
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ jobs:
RELEASE_TAG="$(grep -m 1 -oP '(?<=Version = ")[^"]+' version/version.go)"
RELEASE_TAG_COMMIT="$(git rev-list -n 1 ${RELEASE_TAG} || true)"
if [ "$RELEASE_TAG_COMMIT" != "$HEAD_COMMIT" ]; then
git config user.name 'artemiscloud-bot'
git config user.email 'bot@artemiscloud.io'
git config user.name 'arkmq-bot'
git config user.email 'bot@arkmq-org.io'
git tag -a ${RELEASE_TAG} -m ${RELEASE_TAG} --force
git push origin $RELEASE_TAG --force
fi
Expand All @@ -48,25 +48,25 @@ jobs:
- name: Check doc.crds.dev
run: for i in {1..30}; do curl "https://doc.crds.dev/github.com/${{ github.repository }}@${{ github.ref_name }}" | grep 'ActiveMQArtemis' && break; sleep 1; done

- name: Checkout artemiscloud.github.io
- name: Checkout arkmq-org.github.io
uses: actions/checkout@v4
with:
repository: ${{ github.repository_owner }}/artemiscloud.github.io
path: artemiscloud.github.io
repository: ${{ github.repository_owner }}/arkmq-org.github.io
path: arkmq-org.github.io
token: ${{ secrets.BOT_TOKEN }}

- name: Build the docs
run: >
rm -rf artemiscloud.github.io/content/en/docs &&
cp -r docs artemiscloud.github.io/content/en &&
cd artemiscloud.github.io &&
rm -rf arkmq-org.github.io/content/en/docs &&
cp -r docs arkmq-org.github.io/content/en &&
cd arkmq-org.github.io &&
npm install && npm run build
- name: Push the docs
run: >
cd artemiscloud.github.io &&
git config user.name 'ArtemisCloud Bot' &&
git config user.email 'artemiscloudbot@users.noreply.github.com' &&
cd arkmq-org.github.io &&
git config user.name 'Arkmq Bot' &&
git config user.email 'arkmqbot@users.noreply.github.com' &&
git add --all && git commit --all --allow-empty --message 'Update docs to ${{ github.ref_name }}' && git push
- name: Set up QEMU
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ jobs:

- name: Set up the repo
run: |
git config user.name 'artemiscloud-bot'
git config user.email 'bot@artemiscloud.io'
git config user.name 'arkmq-bot'
git config user.email 'bot@arkmq-org.io'
git push
- name: Update version
Expand Down Expand Up @@ -94,17 +94,17 @@ jobs:
NEWLINE=$(echo 'XG4K' | base64 -d)
VERSION_FILE='version/version.go'
RELATED_IMAGES_FILE='config/manager/activemq_artemis_manager_related_images.yaml'
for ACTIVEMQ_ARTEMIS_BROKER_TAG in $(skopeo list-tags docker://quay.io/artemiscloud/activemq-artemis-broker-kubernetes | jq -r '[.Tags[] | select(. | startswith("artemis."))] | .[-5:] | .[]'); do
for ACTIVEMQ_ARTEMIS_BROKER_TAG in $(skopeo list-tags docker://quay.io/arkmq-org/activemq-artemis-broker-kubernetes | jq -r '[.Tags[] | select(. | startswith("artemis."))] | .[-5:] | .[]'); do
echo "ACTIVEMQ_ARTEMIS_BROKER_TAG: ${ACTIVEMQ_ARTEMIS_BROKER_TAG}"
ACTIVEMQ_ARTEMIS_VERSION="${ACTIVEMQ_ARTEMIS_BROKER_TAG/artemis./}"
ACTIVEMQ_ARTEMIS_COMPACT_VERSION=${ACTIVEMQ_ARTEMIS_VERSION//./}
ACTIVEMQ_ARTEMIS_BROKER_INIT_DIGEST="$(skopeo inspect docker://quay.io/artemiscloud/activemq-artemis-broker-init:${ACTIVEMQ_ARTEMIS_BROKER_TAG} | jq -r '.Digest')"
ACTIVEMQ_ARTEMIS_BROKER_KUBERNETES_DIGEST="$(skopeo inspect docker://quay.io/artemiscloud/activemq-artemis-broker-kubernetes:${ACTIVEMQ_ARTEMIS_BROKER_TAG} | jq -r '.Digest')"
ACTIVEMQ_ARTEMIS_BROKER_INIT_DIGEST="$(skopeo inspect docker://quay.io/arkmq-org/activemq-artemis-broker-init:${ACTIVEMQ_ARTEMIS_BROKER_TAG} | jq -r '.Digest')"
ACTIVEMQ_ARTEMIS_BROKER_KUBERNETES_DIGEST="$(skopeo inspect docker://quay.io/arkmq-org/activemq-artemis-broker-kubernetes:${ACTIVEMQ_ARTEMIS_BROKER_TAG} | jq -r '.Digest')"
if ! grep "${ACTIVEMQ_ARTEMIS_VERSION}" ${VERSION_FILE}; then
YACFG_BROKER_PROFILE="${ACTIVEMQ_ARTEMIS_VERSION}"
ACTIVEMQ_ARTEMIS_BROKER_INIT_VERSION="$(skopeo inspect docker://quay.io/artemiscloud/activemq-artemis-broker-init@${ACTIVEMQ_ARTEMIS_BROKER_INIT_DIGEST} | jq -r '.Labels.version')"
INIT_IMAGE_TAG="$(git ls-remote --tags https://github.com/artemiscloud/activemq-artemis-broker-init-image.git | grep -Po "(?<=refs/tags/)${ACTIVEMQ_ARTEMIS_BROKER_INIT_VERSION}[^^]*$" | head -1)"
INIT_IMAGE_DOCKERFILE="$(curl -L https://raw.githubusercontent.com/artemiscloud/activemq-artemis-broker-init-image/${INIT_IMAGE_TAG}/Dockerfile)"
ACTIVEMQ_ARTEMIS_BROKER_INIT_VERSION="$(skopeo inspect docker://quay.io/arkmq-org/activemq-artemis-broker-init@${ACTIVEMQ_ARTEMIS_BROKER_INIT_DIGEST} | jq -r '.Labels.version')"
INIT_IMAGE_TAG="$(git ls-remote --tags https://github.com/arkmq-org/activemq-artemis-broker-init-image.git | grep -Po "(?<=refs/tags/)${ACTIVEMQ_ARTEMIS_BROKER_INIT_VERSION}[^^]*$" | head -1)"
INIT_IMAGE_DOCKERFILE="$(curl -L https://raw.githubusercontent.com/arkmq-org/activemq-artemis-broker-init-image/${INIT_IMAGE_TAG}/Dockerfile)"
REMOTE_SOURCE_REF="$(echo "${INIT_IMAGE_DOCKERFILE}" | grep -Po '(?<=REMOTE_SOURCE_REF=).*')"
REMOTE_SOURCE_REP="$(echo "${INIT_IMAGE_DOCKERFILE}" | grep -Po '(?<=REMOTE_SOURCE_REP=https://github.com/).*(?=.git)')"
YACFG_BROKER_PROFILES="$(curl -L https://raw.githubusercontent.com/${REMOTE_SOURCE_REP}/${REMOTE_SOURCE_REF}/setup.py | grep -Po '(?<=artemis/)[0-9.]+' | sort -rV | uniq)"
Expand All @@ -119,12 +119,12 @@ jobs:
echo "" >> ${RELATED_IMAGES_FILE}
echo " # ${ACTIVEMQ_ARTEMIS_VERSION}" >> ${RELATED_IMAGES_FILE}
echo " - name: RELATED_IMAGE_ActiveMQ_Artemis_Broker_Init_${ACTIVEMQ_ARTEMIS_COMPACT_VERSION}" >> ${RELATED_IMAGES_FILE}
echo " value: quay.io/artemiscloud/activemq-artemis-broker-init@${ACTIVEMQ_ARTEMIS_BROKER_INIT_DIGEST}" >> ${RELATED_IMAGES_FILE}
echo " value: quay.io/arkmq-org/activemq-artemis-broker-init@${ACTIVEMQ_ARTEMIS_BROKER_INIT_DIGEST}" >> ${RELATED_IMAGES_FILE}
echo " - name: RELATED_IMAGE_ActiveMQ_Artemis_Broker_Kubernetes_${ACTIVEMQ_ARTEMIS_COMPACT_VERSION}" >> ${RELATED_IMAGES_FILE}
echo " value: quay.io/artemiscloud/activemq-artemis-broker-kubernetes@${ACTIVEMQ_ARTEMIS_BROKER_KUBERNETES_DIGEST}" >> ${RELATED_IMAGES_FILE}
echo " value: quay.io/arkmq-org/activemq-artemis-broker-kubernetes@${ACTIVEMQ_ARTEMIS_BROKER_KUBERNETES_DIGEST}" >> ${RELATED_IMAGES_FILE}
else
sed -i "/RELATED_IMAGE_ActiveMQ_Artemis_Broker_Init_${ACTIVEMQ_ARTEMIS_COMPACT_VERSION}/,/value:/ s~value:.*~value: quay.io/artemiscloud/activemq-artemis-broker-init@${ACTIVEMQ_ARTEMIS_BROKER_INIT_DIGEST}~" ${RELATED_IMAGES_FILE}
sed -i "/RELATED_IMAGE_ActiveMQ_Artemis_Broker_Kubernetes_${ACTIVEMQ_ARTEMIS_COMPACT_VERSION}/,/value:/ s~value:.*~value: quay.io/artemiscloud/activemq-artemis-broker-kubernetes@${ACTIVEMQ_ARTEMIS_BROKER_KUBERNETES_DIGEST}~" ${RELATED_IMAGES_FILE}
sed -i "/RELATED_IMAGE_ActiveMQ_Artemis_Broker_Init_${ACTIVEMQ_ARTEMIS_COMPACT_VERSION}/,/value:/ s~value:.*~value: quay.io/arkmq-org/activemq-artemis-broker-init@${ACTIVEMQ_ARTEMIS_BROKER_INIT_DIGEST}~" ${RELATED_IMAGES_FILE}
sed -i "/RELATED_IMAGE_ActiveMQ_Artemis_Broker_Kubernetes_${ACTIVEMQ_ARTEMIS_COMPACT_VERSION}/,/value:/ s~value:.*~value: quay.io/arkmq-org/activemq-artemis-broker-kubernetes@${ACTIVEMQ_ARTEMIS_BROKER_KUBERNETES_DIGEST}~" ${RELATED_IMAGES_FILE}
fi
done
make build && make generate-deploy && make bundle && git status
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM registry.access.redhat.com/ubi9/go-toolset:1.21.11 as builder
ARG TARGETOS
ARG TARGETARCH

ENV GO_MODULE=github.com/artemiscloud/activemq-artemis-operator
ENV GO_MODULE=github.com/arkmq-org/activemq-artemis-operator

### BEGIN REMOTE SOURCE
# Use the COPY instruction only inside the REMOTE SOURCE block
Expand Down Expand Up @@ -69,7 +69,7 @@ RUN microdnf update -y --setopt=install_weak_deps=0 && rm -rf /var/cache/yum
USER ${USER_UID}
ENTRYPOINT ["${USER_HOME}/bin/entrypoint"]

LABEL name="artemiscloud/activemq-artemis-operator"
LABEL name="arkmq-org/activemq-artemis-operator"
LABEL description="ActiveMQ Artemis Broker Operator"
LABEL maintainer="Roddie Kieley <[email protected]>"
LABEL version="1.2.8"
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ KUBE_CLI=kubectl
OPERATOR_VERSION := 1.2.8
OPERATOR_ACCOUNT_NAME := activemq-artemis-operator
OPERATOR_CLUSTER_ROLE_NAME := operator-role
OPERATOR_IMAGE_REPO := quay.io/artemiscloud/activemq-artemis-operator
OPERATOR_IMAGE_REPO := quay.io/arkmq-org/activemq-artemis-operator
OPERATOR_NAMESPACE := activemq-artemis-operator
BUNDLE_PACKAGE := $(OPERATOR_NAMESPACE)
BUNDLE_ANNOTATION_PACKAGE := $(BUNDLE_PACKAGE)
GO_MODULE := github.com/artemiscloud/activemq-artemis-operator
GO_MODULE := github.com/arkmq-org/activemq-artemis-operator
OS := $(shell go env GOOS)
ARCH := $(shell go env GOARCH)

Expand Down Expand Up @@ -54,8 +54,8 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
# This variable is used to construct full image tags for bundle and catalog images.
#
# For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
# quay.io/artemiscloud/activemq-artemis-operator-bundle:$VERSION and quay.io/artemiscloud/activemq-artemis-operator-catalog:$VERSION.
IMAGE_TAG_BASE ?= quay.io/artemiscloud/activemq-artemis-operator
# quay.io/arkmq-org/activemq-artemis-operator-bundle:$VERSION and quay.io/arkmq-org/activemq-artemis-operator-catalog:$VERSION.
IMAGE_TAG_BASE ?= quay.io/arkmq-org/activemq-artemis-operator

# BUNDLE_IMG defines the image:tag used for the bundle.
# You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
Expand Down
30 changes: 15 additions & 15 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ plugins:
manifests.sdk.operatorframework.io/v2: {}
scorecard.sdk.operatorframework.io/v2: {}
projectName: activemq-artemis-operator
repo: github.com/artemiscloud/activemq-artemis-operator
repo: github.com/arkmq-org/activemq-artemis-operator
resources:
- api:
crdVersion: v1
namespaced: true
domain: amq.io
group: broker
kind: ActiveMQArtemis
path: github.com/artemiscloud/activemq-artemis-operator/api/v2alpha1
path: github.com/arkmq-org/activemq-artemis-operator/api/v2alpha1
plural: activemqartemises
version: v2alpha1
- api:
Expand All @@ -22,7 +22,7 @@ resources:
domain: amq.io
group: broker
kind: ActiveMQArtemis
path: github.com/artemiscloud/activemq-artemis-operator/api/v2alpha2
path: github.com/arkmq-org/activemq-artemis-operator/api/v2alpha2
plural: activemqartemises
version: v2alpha2
- api:
Expand All @@ -31,7 +31,7 @@ resources:
domain: amq.io
group: broker
kind: ActiveMQArtemis
path: github.com/artemiscloud/activemq-artemis-operator/api/v2alpha3
path: github.com/arkmq-org/activemq-artemis-operator/api/v2alpha3
plural: activemqartemises
version: v2alpha3
- api:
Expand All @@ -40,7 +40,7 @@ resources:
domain: amq.io
group: broker
kind: ActiveMQArtemis
path: github.com/artemiscloud/activemq-artemis-operator/api/v2alpha4
path: github.com/arkmq-org/activemq-artemis-operator/api/v2alpha4
plural: activemqartemises
version: v2alpha4
- api:
Expand All @@ -50,7 +50,7 @@ resources:
domain: amq.io
group: broker
kind: ActiveMQArtemis
path: github.com/artemiscloud/activemq-artemis-operator/api/v2alpha5
path: github.com/arkmq-org/activemq-artemis-operator/api/v2alpha5
plural: activemqartemises
version: v2alpha5
- api:
Expand All @@ -60,7 +60,7 @@ resources:
domain: amq.io
group: broker
kind: ActiveMQArtemis
path: github.com/artemiscloud/activemq-artemis-operator/api/v1beta1
path: github.com/arkmq-org/activemq-artemis-operator/api/v1beta1
plural: activemqartemises
version: v1beta1
webhooks:
Expand All @@ -74,15 +74,15 @@ resources:
domain: amq.io
group: broker
kind: ActiveMQArtemisAddress
path: github.com/artemiscloud/activemq-artemis-operator/api/v2alpha1
path: github.com/arkmq-org/activemq-artemis-operator/api/v2alpha1
version: v2alpha1
- api:
crdVersion: v1
namespaced: true
domain: amq.io
group: broker
kind: ActiveMQArtemisAddress
path: github.com/artemiscloud/activemq-artemis-operator/api/v2alpha2
path: github.com/arkmq-org/activemq-artemis-operator/api/v2alpha2
version: v2alpha2
- api:
crdVersion: v1
Expand All @@ -91,7 +91,7 @@ resources:
domain: amq.io
group: broker
kind: ActiveMQArtemisAddress
path: github.com/artemiscloud/activemq-artemis-operator/api/v2alpha3
path: github.com/arkmq-org/activemq-artemis-operator/api/v2alpha3
version: v2alpha3
webhooks:
conversion: true
Expand All @@ -104,7 +104,7 @@ resources:
domain: amq.io
group: broker
kind: ActiveMQArtemisAddress
path: github.com/artemiscloud/activemq-artemis-operator/api/v1beta1
path: github.com/arkmq-org/activemq-artemis-operator/api/v1beta1
version: v1beta1
webhooks:
conversion: true
Expand All @@ -118,7 +118,7 @@ resources:
domain: amq.io
group: broker
kind: ActiveMQArtemisScaledown
path: github.com/artemiscloud/activemq-artemis-operator/api/v2alpha1
path: github.com/arkmq-org/activemq-artemis-operator/api/v2alpha1
version: v2alpha1
- api:
crdVersion: v1
Expand All @@ -127,7 +127,7 @@ resources:
domain: amq.io
group: broker
kind: ActiveMQArtemisScaledown
path: github.com/artemiscloud/activemq-artemis-operator/api/v1beta1
path: github.com/arkmq-org/activemq-artemis-operator/api/v1beta1
version: v1beta1
- api:
crdVersion: v1
Expand All @@ -136,7 +136,7 @@ resources:
domain: amq.io
group: broker
kind: ActiveMQArtemisSecurity
path: github.com/artemiscloud/activemq-artemis-operator/api/v1alpha1
path: github.com/arkmq-org/activemq-artemis-operator/api/v1alpha1
version: v1alpha1
webhooks:
conversion: true
Expand All @@ -149,7 +149,7 @@ resources:
domain: amq.io
group: broker
kind: ActiveMQArtemisSecurity
path: github.com/artemiscloud/activemq-artemis-operator/api/v1beta1
path: github.com/arkmq-org/activemq-artemis-operator/api/v1beta1
version: v1beta1
webhooks:
conversion: true
Expand Down
2 changes: 1 addition & 1 deletion bundle.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ COPY bundle/manifests /manifests/
COPY bundle/metadata /metadata/
COPY bundle/tests/scorecard /tests/scorecard/

LABEL name="artemiscloud/activemq-artemis-operator-bundle"
LABEL name="arkmq-org/activemq-artemis-operator-bundle"
LABEL description="ActiveMQ Artemis Broker Operator Bundle"
LABEL maintainer="Roddie Kieley <[email protected]>"
LABEL version="1.0.10"
Loading

0 comments on commit c201fb6

Please sign in to comment.