Skip to content

Commit

Permalink
[#1] Migration update
Browse files Browse the repository at this point in the history
Updated artemiscloud references to arkmq-org
  • Loading branch information
howardgao authored and gaohoward committed Dec 11, 2024
1 parent 9fb7784 commit f451e5a
Show file tree
Hide file tree
Showing 17 changed files with 50 additions and 50 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# artemiscloud-examples
examples from artemiscloud
# Arkmq-examples
examples from arkmq-org
4 changes: 2 additions & 2 deletions openshift-templates/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ArtemisCloud OpenShift Template Examples
# Arkmq-org OpenShift Template Examples

This dir contains the following ArtemisCloud OpenShift template examples.
This dir contains the following Arkmq-org OpenShift template examples.

* activemq-artemis-basic.yaml
* activemq-artemis-custom.yaml
Expand Down
6 changes: 3 additions & 3 deletions openshift-templates/activemq-artemis-basic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ metadata:
openshift.io/display-name: ActiveMQ Artemis Broker 2.17 (Ephemeral, no SSL)
openshift.io/provider-display-name: Apache Artemis
tags: messaging,amq,xpaas
template.openshift.io/documentation-url: 'https://github.com/artemiscloud/activemq-artemis-broker-openshift-image'
template.openshift.io/documentation-url: 'https://github.com/arkmq-org/activemq-artemis-broker-openshift-image'
template.openshift.io/long-description: >-
This template defines resources needed to develop a ActiveMQ Artemis Broker 2.17 based application, including a deployment configuration, using ephemeral (temporary) storage.
template.openshift.io/support-url: 'https://github.com/artemiscloud'
template.openshift.io/support-url: 'https://github.com/arkmq-org'
version: '1.0'
name: activemq-artemis-basic
objects:
Expand Down Expand Up @@ -290,7 +290,7 @@ parameters:
displayName: Image
name: IMAGE
required: true
value: quay.io/artemiscloud/activemq-artemis-broker-kubernetes:0.2.2
value: quay.io/arkmq-org/activemq-artemis-broker-kubernetes:0.2.2
- description: Name of a secret containing credential data such as passwords and SSL related files
displayName: Secret Name
name: AMQ_CREDENTIAL_SECRET
Expand Down
6 changes: 3 additions & 3 deletions openshift-templates/activemq-artemis-custom.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ metadata:
openshift.io/display-name: ActiveMQ Artemis Broker 2.17 Custom Config (Ephemeral, no SSL)
openshift.io/provider-display-name: Apache Artemis
tags: messaging,amq,xpaas
template.openshift.io/documentation-url: 'https://github.com/artemiscloud/activemq-artemis-broker-openshift-image'
template.openshift.io/documentation-url: 'https://github.com/arkmq-org/activemq-artemis-broker-openshift-image'
template.openshift.io/long-description: >-
This template defines resources needed to develop a ActiveMQ Artemis Broker 2.17 based application, including a deployment configuration, using ephemeral (temporary) storage.
template.openshift.io/support-url: 'https://github.com/artemiscloud'
template.openshift.io/support-url: 'https://github.com/arkmq-org'
version: '1.0'
name: activemq-artemis-custom
objects:
Expand Down Expand Up @@ -292,7 +292,7 @@ parameters:
displayName: Image
name: IMAGE
required: true
value: quay.io/artemiscloud/activemq-artemis-broker-kubernetes:0.2.2
value: quay.io/arkmq-org/activemq-artemis-broker-kubernetes:0.2.2
- description: Name of a secret containing credential data such as usernames and passwords
displayName: Secret Name
name: AMQ_CREDENTIAL_SECRET
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ metadata:
openshift.io/display-name: ActiveMQ Artemis Broker 2.17 (Persistence, clustered, with SSL)
openshift.io/provider-display-name: Apache Artemis
tags: messaging,amq,xpaas
template.openshift.io/documentation-url: 'https://github.com/artemiscloud/activemq-artemis-broker-openshift-image'
template.openshift.io/documentation-url: 'https://github.com/arkmq-org/activemq-artemis-broker-openshift-image'
template.openshift.io/long-description: >-
This template defines resources needed to develop a ActiveMQ Artemis Broker 2.17 based application, including a statefulset configuration, using persistent storage and secure communication using SSL.
template.openshift.io/support-url: 'https://github.com/artemiscloud'
template.openshift.io/support-url: 'https://github.com/arkmq-org'
version: '1.0'
name: activemq-artemis-persistence-clustered-ssl
objects:
Expand Down Expand Up @@ -619,7 +619,7 @@ parameters:
displayName: Image
name: IMAGE
required: true
value: quay.io/artemiscloud/activemq-artemis-broker-kubernetes:0.2.2
value: quay.io/arkmq-org/activemq-artemis-broker-kubernetes:0.2.2
- description: Whether to enable artemis metrics plugin
displayName: Enable Metrics Plugin
name: AMQ_ENABLE_METRICS_PLUGIN
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ metadata:
openshift.io/display-name: ActiveMQ Artemis Broker 2.17 (Persistence, clustered, no SSL)
openshift.io/provider-display-name: Apache Artemis
tags: messaging,amq,xpaas
template.openshift.io/documentation-url: 'https://github.com/artemiscloud/activemq-artemis-broker-openshift-image'
template.openshift.io/documentation-url: 'https://github.com/arkmq-org/activemq-artemis-broker-openshift-image'
template.openshift.io/long-description: >-
This template defines resources needed to develop a ActiveMQ Artemis Broker 2.17 based application, including a statefulset configuration, using persistent storage.
template.openshift.io/support-url: 'https://github.com/artemiscloud'
template.openshift.io/support-url: 'https://github.com/arkmq-org'
version: '1.0'
name: activemq-artemis-persistence-clustered
objects:
Expand Down Expand Up @@ -532,7 +532,7 @@ parameters:
displayName: Image
name: IMAGE
required: true
value: quay.io/artemiscloud/activemq-artemis-broker-kubernetes:0.2.2
value: quay.io/arkmq-org/activemq-artemis-broker-kubernetes:0.2.2
- description: Name of a secret containing credential data such as usernames and passwords
displayName: Secret Name
name: AMQ_CREDENTIAL_SECRET
Expand Down
6 changes: 3 additions & 3 deletions openshift-templates/activemq-artemis-persistence-ssl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ metadata:
openshift.io/display-name: ActiveMQ Artemis Broker 2.17 (Persistence, with SSL)
openshift.io/provider-display-name: Apache Artemis
tags: messaging,amq,xpaas
template.openshift.io/documentation-url: 'https://github.com/artemiscloud/activemq-artemis-broker-openshift-image'
template.openshift.io/documentation-url: 'https://github.com/arkmq-org/activemq-artemis-broker-openshift-image'
template.openshift.io/long-description: >-
This template defines resources needed to develop a ActiveMQ Artemis Broker 2.17 based application, including a statefulset configuration, persistent storage and secure communication using SSL.
template.openshift.io/support-url: 'https://github.com/artemiscloud'
template.openshift.io/support-url: 'https://github.com/arkmq-org'
version: '1.0'
name: activemq-artemis-persistence-ssl
objects:
Expand Down Expand Up @@ -367,7 +367,7 @@ parameters:
displayName: Image
name: IMAGE
required: true
value: quay.io/artemiscloud/activemq-artemis-broker-kubernetes:0.2.2
value: quay.io/arkmq-org/activemq-artemis-broker-kubernetes:0.2.2
- description: Whether to enable artemis metrics plugin
displayName: Enable Metrics Plugin
name: AMQ_ENABLE_METRICS_PLUGIN
Expand Down
6 changes: 3 additions & 3 deletions openshift-templates/activemq-artemis-persistence.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ metadata:
openshift.io/display-name: ActiveMQ Artemis Broker 2.17 (Persistence, no SSL)
openshift.io/provider-display-name: Apache Artemis
tags: messaging,amq,xpaas
template.openshift.io/documentation-url: 'https://github.com/artemiscloud/activemq-artemis-broker-openshift-image'
template.openshift.io/documentation-url: 'https://github.com/arkmq-org/activemq-artemis-broker-openshift-image'
template.openshift.io/long-description: >-
This template defines resources needed to develop a ActiveMQ Artemis Broker 2.17 based application, including a statefulset configuration, using persistent storage.
template.openshift.io/support-url: 'https://github.com/artemiscloud'
template.openshift.io/support-url: 'https://github.com/arkmq-org'
version: '1.0'
name: activemq-artemis-persistence
objects:
Expand Down Expand Up @@ -274,7 +274,7 @@ parameters:
displayName: Image
name: IMAGE
required: true
value: quay.io/artemiscloud/activemq-artemis-broker-kubernetes:0.2.2
value: quay.io/arkmq-org/activemq-artemis-broker-kubernetes:0.2.2
- description: Name of a secret containing credential data such as usernames and passwords
displayName: Secret Name
name: AMQ_CREDENTIAL_SECRET
Expand Down
6 changes: 3 additions & 3 deletions openshift-templates/activemq-artemis-ssl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ metadata:
openshift.io/display-name: ActiveMQ Artemis Broker 2.17 (Ephemeral, with SSL)
openshift.io/provider-display-name: Apache Artemis
tags: messaging,amq,xpaas
template.openshift.io/documentation-url: 'https://github.com/artemiscloud/activemq-artemis-broker-openshift-image'
template.openshift.io/documentation-url: 'https://github.com/arkmq-org/activemq-artemis-broker-openshift-image'
template.openshift.io/long-description: >-
This template defines resources needed to develop a ActiveMQ Artemis Broker 2.17 based application, including a deployment configuration, using ephemeral (temporary) storage and secure communication using SSL.
template.openshift.io/support-url: 'https://github.com/artemiscloud'
template.openshift.io/support-url: 'https://github.com/arkmq-org'
version: '1.0'
name: activemq-artemis-ssl
objects:
Expand Down Expand Up @@ -427,7 +427,7 @@ parameters:
displayName: Image
name: IMAGE
required: true
value: quay.io/artemiscloud/activemq-artemis-broker-kubernetes:0.2.2
value: quay.io/arkmq-org/activemq-artemis-broker-kubernetes:0.2.2
- description: Whether to enable artemis metrics plugin
displayName: Enable Metrics Plugin
name: AMQ_ENABLE_METRICS_PLUGIN
Expand Down
2 changes: 1 addition & 1 deletion operator/deploy_operator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"

source ${BASEDIR}/setup_env.sh

BASE_URL="https://raw.githubusercontent.com/artemiscloud/activemq-artemis-operator/${OPERATOR_VERSION}/deploy"
BASE_URL="https://raw.githubusercontent.com/arkmq-org/activemq-artemis-operator/${OPERATOR_VERSION}/deploy"

${KUBE_CLI} create -f ${BASE_URL}/crds/broker_activemqartemis_crd.yaml
${KUBE_CLI} create -f ${BASE_URL}/crds/broker_activemqartemissecurity_crd.yaml
Expand Down
4 changes: 2 additions & 2 deletions operator/init/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Artemis Cloud Broker Operator Custom Init Image Examples
# Arkmq Broker Operator Custom Init Image Examples

This dir contains the following ArtemisCloud Operator custom init examples.
This dir contains the following arkmq-org Operator custom init examples.

* credential - configuring a new account for Artemis Broker management console with limited rights.
* jdbc - configuring Artemis Broker to use a mysql database as its data store.
Expand Down
8 changes: 4 additions & 4 deletions operator/init/credential/README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# ArtemisCloud Operator Custom Init Image Example - CREDENTIAL
# ActiveMQ Artemis Operator Custom Init Image Example - CREDENTIAL

This example demonstrates how to use custom init image to configure
a broker instance deployed by [ActiveMQ Artemis broker operator](https://github.com/artemiscloud/activemq-artemis-operator) to run in a kubernetes/openshift cluster.
a broker instance deployed by [ActiveMQ Artemis broker operator](https://github.com/arkmq-org/activemq-artemis-operator) to run in a kubernetes/openshift cluster.

It configures a broker instance to add a new user account to access the broker's management console with limited rights.

This example is for demo purpose only and should not be used in real productization environment.

## About ArtemisCloud Broker Operator Custom Init Image
## About ActiveMQ Artemis Operator Custom Init Image

Users can configure ActiveMQ Artemis Broker via custom resources ([examples](https://github.com/artemiscloud/activemq-artemis-operator/tree/master/deploy/examples)). The available configuration parameters are defined in CRD files.
Users can configure ActiveMQ Artemis Broker via custom resources ([examples](https://github.com/arkmq-org/activemq-artemis-operator/tree/master/deploy/examples)). The available configuration parameters are defined in CRD files.

In cases where users need some peculiar aspects of configuration that may be out of scope of CRD definitions,
they can just provide their own custom init image in the custom resource file. During deployment the operator installs the custom init image in broker's init container so it runs before the broker starts. The custom init image's config script will be called so it can adjust the broker configuration as needed.
Expand Down
8 changes: 4 additions & 4 deletions operator/init/jdbc/README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# ArtemisCloud Operator Custom Init Image Example - JDBC
# ActiveMQ Artemis Operator Custom Init Image Example - JDBC

This example demonstrates how to use custom init image to configure
a broker instance deployed by [ActiveMQ Artemis broker operator](https://github.com/artemiscloud/activemq-artemis-operator) to run in a kubernetes/openshift cluster.
a broker instance deployed by [ActiveMQ Artemis broker operator](https://github.com/arkmq-org/activemq-artemis-operator) to run in a kubernetes/openshift cluster.

It configures a broker instance that uses [mysql](https://www.mysql.com/) database as it's persistence store.

This example should not be used in real productization environment.

## About ArtemisCloud Broker Operator Custom Init Image
## About ActiveMQ Artemis Operator Custom Init Image

Users can configure ActiveMQ Artemis Broker via custom resources ([examples](https://github.com/artemiscloud/activemq-artemis-operator/tree/master/deploy/examples)). The available configuration parameters are defined in CRD files.
Users can configure ActiveMQ Artemis Broker via custom resources ([examples](https://github.com/arkmq-org/activemq-artemis-operator/tree/master/deploy/examples)). The available configuration parameters are defined in CRD files.

In cases where users need some peculiar aspects of configuration that may be out of scope of CRD definitions,
they can just provide their own custom init image in the custom resource file. During deployment the operator installs the custom init image in broker's init container so it runs before the broker starts. The custom init image's config script will be called so it can adjust the broker configuration as needed.
Expand Down
8 changes: 4 additions & 4 deletions operator/keycloak/README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# ArtemisCloud Operator Security Configuration Example - Keycloak Integration
# ActiveMQ Artemis Operator Security Configuration Example - Keycloak Integration

This example demonstrates how to configure security for
an ActiveMQ Artemis broker deployed by [ArtemisCloud operator](https://github.com/artemiscloud/activemq-artemis-operator) to run in a kubernetes/openshift cluster using security custom resources.
an ActiveMQ Artemis broker deployed by [arkmq-org operator](https://github.com/arkmq-org/activemq-artemis-operator) to run in a kubernetes/openshift cluster using security custom resources.

The ArtemisCould operator provides a security custom resource definition (CRD) that allows users to configure security for a broker, including

* JASS login modules for broker and managment console. Currently it supports PropertiesLoginModule, GuestLoginModule and KeycloakLoginModule.
* JAAS login modules for broker and management console. Currently it supports PropertiesLoginModule, GuestLoginModule and KeycloakLoginModule.
* Role-based permissions on addresses.
* Management access control.

Expand Down Expand Up @@ -76,7 +76,7 @@ The keycloak server has pre-configured with two users
| jdoe | password | guest |
| mdoe | password | amq |

## Step 1 Deploy ArtemisCloud operator
## Step 1 Deploy the operator

From the keycloak example dir run

Expand Down
6 changes: 3 additions & 3 deletions operator/prometheus/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ArtemisCloud Operator Example - Prometheus Plugin
# ActiveMQ Artemis Operator Example - Prometheus Plugin

This example demonstrates how to use [Prometheus Operator](https://github.com/prometheus-operator/prometheus-operator) to collect
metrics from brokers deployed by the artemiscloud operator.
metrics from brokers deployed by the operator.

This example is for demonstration purpose only and is not intended to be used in a real productization environment.

Expand All @@ -20,7 +20,7 @@ there are three sub-directories that contains different kind of resources.

## Get started

1. Deploy the ArtemisCloud Operator. Run:
1. Deploy the operator. Run:

`$ ../deploy_operator.sh`

Expand Down
12 changes: 6 additions & 6 deletions operator/setup_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
##
## - Operator deployment
##
## By default the script uses the latest tag on artemiscloud respository
## By default the script uses the latest tag on arkmq-org respository
## to install the operator (i.e. in deploy/install dir)
## If you want to use a specific commit/tag you can define the env variable
## OPERATOR_VERSION to override the default.
Expand All @@ -18,13 +18,13 @@
##
## By default the script uses the image specified in the operator yaml in deploy/install
## dir at the OPERATOR_VERSION source tag. To use a different Operator
## image, define the OPR_IMG_TAG (for example `export OPR_IMG_TAG=quay.io/artemiscloud/activemq-artemis-operator:dev.latest`)
## image, define the OPR_IMG_TAG (for example `export OPR_IMG_TAG=quay.io/arkmq-org/activemq-artemis-operator:dev.latest`)
##
## - Broker image
##
## By default the broker image uses the latest tag specified in the operator yaml
## To use a different image you can define the BROKER_TAG env var
## (for example `export BROKER_TAG=quay.io/artemiscloud/activemq-artemis-broker-kubernetes:dev.latest`)
## (for example `export BROKER_TAG=quay.io/arkmq-org/activemq-artemis-broker-kubernetes:dev.latest`)
##
## - Init image
##
Expand All @@ -40,7 +40,7 @@ function find_broker_image_tag {
opr_ver=$1
img_type=$2

opr_yaml_url=https://raw.githubusercontent.com/artemiscloud/activemq-artemis-operator/${opr_ver}/config/manager/manager.yaml
opr_yaml_url=https://raw.githubusercontent.com/arkmq-org/activemq-artemis-operator/${opr_ver}/config/manager/manager.yaml

raw_opr_yaml="$(curl ${opr_yaml_url} 2>/dev/null)"

Expand Down Expand Up @@ -69,9 +69,9 @@ function find_broker_image_tag {
echo "$last_found_img"
}

ARTEMISCLOUD_REPO=https://github.com/artemiscloud/activemq-artemis-operator.git
ARKMQ_ORG_REPO=https://github.com/arkmq-org/activemq-artemis-operator.git

LATEST_TAG=$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${ARTEMISCLOUD_REPO} '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3)
LATEST_TAG=$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${ARKMQ_ORG_REPO} '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3)

export OPERATOR_VERSION=${OPERATOR_VERSION:-${LATEST_TAG}}
echo "Using operator version ${OPERATOR_VERSION}"
Expand Down
2 changes: 1 addition & 1 deletion operator/undeploy_operator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"

source ${BASEDIR}/setup_env.sh

BASE_URL="https://raw.githubusercontent.com/artemiscloud/activemq-artemis-operator/${OPERATOR_VERSION}/deploy"
BASE_URL="https://raw.githubusercontent.com/arkmq-org/activemq-artemis-operator/${OPERATOR_VERSION}/deploy"

${KUBE_CLI} delete -f ${BASE_URL}/crds/broker_activemqartemis_crd.yaml
${KUBE_CLI} delete -f ${BASE_URL}/crds/broker_activemqartemissecurity_crd.yaml
Expand Down

0 comments on commit f451e5a

Please sign in to comment.