diff --git a/api/v1alpha1/activemqartemissecurity_types.go b/api/v1alpha1/activemqartemissecurity_types.go index 35da2ece0..a9d21dc8c 100644 --- a/api/v1alpha1/activemqartemissecurity_types.go +++ b/api/v1alpha1/activemqartemissecurity_types.go @@ -402,6 +402,7 @@ type ActiveMQArtemisSecurityStatus struct { //+kubebuilder:object:root=true //+kubebuilder:subresource:status //+kubebuilder:resource:path=activemqartemissecurities,shortName=aas +//+operator-sdk:csv:customresourcedefinitions:resources={{"Secret", "v1"}} // Security configuration for the broker // +operator-sdk:csv:customresourcedefinitions:displayName="ActiveMQ Artemis Security" diff --git a/api/v1beta1/activemqartemisaddress_types.go b/api/v1beta1/activemqartemisaddress_types.go index 93e3633a1..7d6f9fa02 100644 --- a/api/v1beta1/activemqartemisaddress_types.go +++ b/api/v1beta1/activemqartemisaddress_types.go @@ -145,6 +145,7 @@ type ActiveMQArtemisAddressStatus struct { //+kubebuilder:subresource:status //+kubebuilder:storageversion //+kubebuilder:resource:path=activemqartemisaddresses,shortName=aaa +//+operator-sdk:csv:customresourcedefinitions:resources={{"Secret", "v1"}} // Adding and removing addresses using custom resource definitions // +operator-sdk:csv:customresourcedefinitions:displayName="ActiveMQ Artemis Address" diff --git a/api/v1beta1/activemqartemisscaledown_types.go b/api/v1beta1/activemqartemisscaledown_types.go index 4f60b8a5c..9b7fa984e 100644 --- a/api/v1beta1/activemqartemisscaledown_types.go +++ b/api/v1beta1/activemqartemisscaledown_types.go @@ -30,7 +30,7 @@ type ActiveMQArtemisScaledownSpec struct { // Important: Run "make" to regenerate code after modifying this file // Triggered by main ActiveMQArtemis CRD messageMigration entry - //+operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Local Only",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:booleanSwitch"} + //+operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Temporary",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:booleanSwitch"} LocalOnly bool `json:"localOnly"` // Specifies the minimum/maximum amount of compute resources required/allowed //+operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Resource Requirements",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:resourceRequirements"} @@ -47,6 +47,7 @@ type ActiveMQArtemisScaledownStatus struct { //+kubebuilder:storageversion //+kubebuilder:subresource:status //+kubebuilder:resource:path=activemqartemisscaledowns,shortName=aad +//+operator-sdk:csv:customresourcedefinitions:resources={{"Secret", "v1"}} // Provides message migration on clustered broker scaledown // +operator-sdk:csv:customresourcedefinitions:displayName="ActiveMQ Artemis Scaledown" diff --git a/api/v1beta1/activemqartemissecurity_types.go b/api/v1beta1/activemqartemissecurity_types.go index 24c3a6cce..266fa899f 100644 --- a/api/v1beta1/activemqartemissecurity_types.go +++ b/api/v1beta1/activemqartemissecurity_types.go @@ -403,6 +403,7 @@ type ActiveMQArtemisSecurityStatus struct { //+kubebuilder:subresource:status //+kubebuilder:storageversion //+kubebuilder:resource:path=activemqartemissecurities,shortName=aas +//+operator-sdk:csv:customresourcedefinitions:resources={{"Secret", "v1"}} // Security configuration for the broker // +operator-sdk:csv:customresourcedefinitions:displayName="ActiveMQ Artemis Security" diff --git a/api/v2alpha1/activemqartemis_types.go b/api/v2alpha1/activemqartemis_types.go index 84a3106eb..4115f94a6 100644 --- a/api/v2alpha1/activemqartemis_types.go +++ b/api/v2alpha1/activemqartemis_types.go @@ -101,6 +101,7 @@ type ActiveMQArtemisStatus struct { //+kubebuilder:subresource:status //+kubebuilder:resource:path=activemqartemises //+kubebuilder:resource:path=activemqartemises,shortName=aa +//+operator-sdk:csv:customresourcedefinitions:resources={{"Secret", "v1"}} // ActiveMQArtemis is the Schema for the activemqartemises API type ActiveMQArtemis struct { diff --git a/api/v2alpha1/activemqartemisaddress_types.go b/api/v2alpha1/activemqartemisaddress_types.go index 2243447b2..af3130bec 100644 --- a/api/v2alpha1/activemqartemisaddress_types.go +++ b/api/v2alpha1/activemqartemisaddress_types.go @@ -42,6 +42,7 @@ type ActiveMQArtemisAddressStatus struct { //+kubebuilder:object:root=true //+kubebuilder:subresource:status //+kubebuilder:resource:path=activemqartemisaddresses,shortName=aaa +//+operator-sdk:csv:customresourcedefinitions:resources={{"Secret", "v1"}} // ActiveMQArtemisAddress is the Schema for the activemqartemisaddresses API type ActiveMQArtemisAddress struct { diff --git a/api/v2alpha1/activemqartemisscaledown_types.go b/api/v2alpha1/activemqartemisscaledown_types.go index bb46dc944..49fec21b6 100644 --- a/api/v2alpha1/activemqartemisscaledown_types.go +++ b/api/v2alpha1/activemqartemisscaledown_types.go @@ -29,7 +29,7 @@ type ActiveMQArtemisScaledownSpec struct { // Important: Run "make" to regenerate code after modifying this file // Triggered by main ActiveMQArtemis CRD messageMigration entry - //+operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Local Only",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:booleanSwitch"} + //+operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Temporary",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:booleanSwitch"} LocalOnly bool `json:"localOnly"` } @@ -42,6 +42,7 @@ type ActiveMQArtemisScaledownStatus struct { //+kubebuilder:object:root=true //+kubebuilder:subresource:status //+kubebuilder:resource:path=activemqartemisscaledowns,shortName=aad +//+operator-sdk:csv:customresourcedefinitions:resources={{"Secret", "v1"}} // ActiveMQArtemisScaledown is the Schema for the activemqartemisscaledowns API type ActiveMQArtemisScaledown struct { diff --git a/api/v2alpha2/activemqartemis_types.go b/api/v2alpha2/activemqartemis_types.go index fcfb5bd3b..49fffb20c 100644 --- a/api/v2alpha2/activemqartemis_types.go +++ b/api/v2alpha2/activemqartemis_types.go @@ -109,6 +109,7 @@ type ActiveMQArtemisStatus struct { //+kubebuilder:subresource:status //+kubebuilder:resource:path=activemqartemises //+kubebuilder:resource:path=activemqartemises,shortName=aa +//+operator-sdk:csv:customresourcedefinitions:resources={{"Secret", "v1"}} // ActiveMQArtemis is the Schema for the activemqartemises API type ActiveMQArtemis struct { diff --git a/api/v2alpha2/activemqartemisaddress_types.go b/api/v2alpha2/activemqartemisaddress_types.go index b3c94871e..2fdaa486d 100644 --- a/api/v2alpha2/activemqartemisaddress_types.go +++ b/api/v2alpha2/activemqartemisaddress_types.go @@ -43,6 +43,7 @@ type ActiveMQArtemisAddressStatus struct { //+kubebuilder:object:root=true //+kubebuilder:subresource:status //+kubebuilder:resource:path=activemqartemisaddresses,shortName=aaa +//+operator-sdk:csv:customresourcedefinitions:resources={{"Secret", "v1"}} // ActiveMQArtemisAddress is the Schema for the activemqartemisaddresses API type ActiveMQArtemisAddress struct { diff --git a/api/v2alpha3/activemqartemis_types.go b/api/v2alpha3/activemqartemis_types.go index 5bf32109e..c196af4ea 100644 --- a/api/v2alpha3/activemqartemis_types.go +++ b/api/v2alpha3/activemqartemis_types.go @@ -190,6 +190,7 @@ type ActiveMQArtemisStatus struct { //+kubebuilder:subresource:status //+kubebuilder:resource:path=activemqartemises //+kubebuilder:resource:path=activemqartemises,shortName=aa +//+operator-sdk:csv:customresourcedefinitions:resources={{"Secret", "v1"}} // ActiveMQArtemis is the Schema for the activemqartemises API type ActiveMQArtemis struct { diff --git a/api/v2alpha3/activemqartemisaddress_types.go b/api/v2alpha3/activemqartemisaddress_types.go index 27bebfba0..c2760e03f 100644 --- a/api/v2alpha3/activemqartemisaddress_types.go +++ b/api/v2alpha3/activemqartemisaddress_types.go @@ -76,6 +76,7 @@ type ActiveMQArtemisAddressStatus struct { //+kubebuilder:object:root=true //+kubebuilder:subresource:status //+kubebuilder:resource:path=activemqartemisaddresses,shortName=aaa +//+operator-sdk:csv:customresourcedefinitions:resources={{"Secret", "v1"}} // ActiveMQArtemisAddress is the Schema for the activemqartemisaddresses API type ActiveMQArtemisAddress struct { diff --git a/api/v2alpha4/activemqartemis_types.go b/api/v2alpha4/activemqartemis_types.go index dc349bc6b..2a5da5aa5 100644 --- a/api/v2alpha4/activemqartemis_types.go +++ b/api/v2alpha4/activemqartemis_types.go @@ -193,6 +193,7 @@ type ActiveMQArtemisStatus struct { //+kubebuilder:subresource:status //+kubebuilder:resource:path=activemqartemises //+kubebuilder:resource:path=activemqartemises,shortName=aa +//+operator-sdk:csv:customresourcedefinitions:resources={{"Secret", "v1"}} // ActiveMQArtemis is the Schema for the activemqartemises API type ActiveMQArtemis struct { diff --git a/api/v2alpha5/activemqartemis_types.go b/api/v2alpha5/activemqartemis_types.go index fd37ed68a..9659d6a42 100644 --- a/api/v2alpha5/activemqartemis_types.go +++ b/api/v2alpha5/activemqartemis_types.go @@ -221,6 +221,7 @@ type ActiveMQArtemisStatus struct { //+kubebuilder:subresource:status //+kubebuilder:resource:path=activemqartemises //+kubebuilder:resource:path=activemqartemises,shortName=aa +//+operator-sdk:csv:customresourcedefinitions:resources={{"Secret", "v1"}} // ActiveMQArtemis is the Schema for the activemqartemises API type ActiveMQArtemis struct { diff --git a/bundle/manifests/activemq-artemis-operator.clusterserviceversion.yaml b/bundle/manifests/activemq-artemis-operator.clusterserviceversion.yaml index aea3ff93a..22efa8567 100644 --- a/bundle/manifests/activemq-artemis-operator.clusterserviceversion.yaml +++ b/bundle/manifests/activemq-artemis-operator.clusterserviceversion.yaml @@ -247,6 +247,10 @@ spec: displayName: ActiveMQ Artemis Address kind: ActiveMQArtemisAddress name: activemqartemisaddresses.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 specDescriptors: - description: The Address Name displayName: Address Name @@ -425,18 +429,30 @@ spec: displayName: Active MQArtemis Address kind: ActiveMQArtemisAddress name: activemqartemisaddresses.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 version: v2alpha1 - description: ActiveMQArtemisAddress is the Schema for the activemqartemisaddresses API displayName: Active MQArtemis Address kind: ActiveMQArtemisAddress name: activemqartemisaddresses.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 version: v2alpha2 - description: ActiveMQArtemisAddress is the Schema for the activemqartemisaddresses API displayName: Active MQArtemis Address kind: ActiveMQArtemisAddress name: activemqartemisaddresses.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 version: v2alpha3 - description: A stateful deployment of one or more brokers displayName: ActiveMQ Artemis @@ -1390,26 +1406,46 @@ spec: displayName: Active MQArtemis kind: ActiveMQArtemis name: activemqartemises.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 version: v2alpha1 - description: ActiveMQArtemis is the Schema for the activemqartemises API displayName: Active MQArtemis kind: ActiveMQArtemis name: activemqartemises.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 version: v2alpha2 - description: ActiveMQArtemis is the Schema for the activemqartemises API displayName: Active MQArtemis kind: ActiveMQArtemis name: activemqartemises.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 version: v2alpha3 - description: ActiveMQArtemis is the Schema for the activemqartemises API displayName: Active MQArtemis kind: ActiveMQArtemis name: activemqartemises.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 version: v2alpha4 - description: ActiveMQArtemis is the Schema for the activemqartemises API displayName: Active MQArtemis kind: ActiveMQArtemis name: activemqartemises.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 version: v2alpha5 - description: ActiveMQArtemisScaledown is the Schema for the activemqartemisscaledowns API @@ -1422,9 +1458,13 @@ spec: displayName: Active MQArtemis Scaledown kind: ActiveMQArtemisScaledown name: activemqartemisscaledowns.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 specDescriptors: - description: Triggered by main ActiveMQArtemis CRD messageMigration entry - displayName: Local Only + displayName: Temporary path: localOnly x-descriptors: - urn:alm:descriptor:com.tectonic.ui:booleanSwitch @@ -1433,6 +1473,10 @@ spec: displayName: ActiveMQ Artemis Security kind: ActiveMQArtemisSecurity name: activemqartemissecurities.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 specDescriptors: - description: Apply this security config to the broker crs in the current namespace. A value of * or empty string means applying to all broker crs. Default apply @@ -1951,6 +1995,10 @@ spec: displayName: ActiveMQ Artemis Security kind: ActiveMQArtemisSecurity name: activemqartemissecurities.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 specDescriptors: - description: Apply this security config to the broker crs in the current namespace. A value of * or empty string means applying to all broker crs. Default apply @@ -2572,7 +2620,7 @@ spec: fieldPath: metadata.annotations['olm.targetNamespaces'] - name: ENABLE_WEBHOOKS value: "false" - image: quay.io/msarawan/operator:1.0.14 + image: quay.io/artemiscloud/activemq-artemis-operator:1.0.15 livenessProbe: httpGet: path: /healthz diff --git a/bundle/tests/scorecard/config.yaml b/bundle/tests/scorecard/config.yaml index 14c9f7c39..c7dd40cbb 100644 --- a/bundle/tests/scorecard/config.yaml +++ b/bundle/tests/scorecard/config.yaml @@ -8,7 +8,7 @@ stages: - entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.15.0 + image: quay.io/operator-framework/scorecard-test:v1.31 labels: suite: basic test: basic-check-spec-test @@ -18,7 +18,7 @@ stages: - entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.15.0 + image: quay.io/operator-framework/scorecard-test:v1.31 labels: suite: olm test: olm-bundle-validation-test @@ -28,7 +28,7 @@ stages: - entrypoint: - scorecard-test - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.15.0 + image: quay.io/operator-framework/scorecard-test:v1.31 labels: suite: olm test: olm-crds-have-validation-test @@ -38,7 +38,7 @@ stages: - entrypoint: - scorecard-test - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.15.0 + image: quay.io/operator-framework/scorecard-test:v1.31 labels: suite: olm test: olm-crds-have-resources-test @@ -48,7 +48,7 @@ stages: - entrypoint: - scorecard-test - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.15.0 + image: quay.io/operator-framework/scorecard-test:v1.31 labels: suite: olm test: olm-spec-descriptors-test @@ -58,7 +58,7 @@ stages: - entrypoint: - scorecard-test - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.15.0 + image: quay.io/operator-framework/scorecard-test:v1.31 labels: suite: olm test: olm-status-descriptors-test diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index dde137346..f23c1b046 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -17,5 +17,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: - name: controller - newName: quay.io/msarawan/operator - newTag: 1.0.14 + newName: quay.io/artemiscloud/activemq-artemis-operator + newTag: 1.0.15 diff --git a/config/manifests/bases/activemq-artemis-operator.clusterserviceversion.yaml b/config/manifests/bases/activemq-artemis-operator.clusterserviceversion.yaml index 586da4e78..bfdc89c6d 100644 --- a/config/manifests/bases/activemq-artemis-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/activemq-artemis-operator.clusterserviceversion.yaml @@ -21,6 +21,10 @@ spec: displayName: ActiveMQ Artemis Address kind: ActiveMQArtemisAddress name: activemqartemisaddresses.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 specDescriptors: - description: The Address Name displayName: Address Name @@ -199,18 +203,30 @@ spec: displayName: Active MQArtemis Address kind: ActiveMQArtemisAddress name: activemqartemisaddresses.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 version: v2alpha3 - description: ActiveMQArtemisAddress is the Schema for the activemqartemisaddresses API displayName: Active MQArtemis Address kind: ActiveMQArtemisAddress name: activemqartemisaddresses.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 version: v2alpha2 - description: ActiveMQArtemisAddress is the Schema for the activemqartemisaddresses API displayName: Active MQArtemis Address kind: ActiveMQArtemisAddress name: activemqartemisaddresses.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 version: v2alpha1 - description: A stateful deployment of one or more brokers displayName: ActiveMQ Artemis @@ -1164,35 +1180,59 @@ spec: displayName: Active MQArtemis kind: ActiveMQArtemis name: activemqartemises.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 version: v2alpha5 - description: ActiveMQArtemis is the Schema for the activemqartemises API displayName: Active MQArtemis kind: ActiveMQArtemis name: activemqartemises.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 version: v2alpha4 - description: ActiveMQArtemis is the Schema for the activemqartemises API displayName: Active MQArtemis kind: ActiveMQArtemis name: activemqartemises.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 version: v2alpha3 - description: ActiveMQArtemis is the Schema for the activemqartemises API displayName: Active MQArtemis kind: ActiveMQArtemis name: activemqartemises.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 version: v2alpha2 - description: ActiveMQArtemis is the Schema for the activemqartemises API displayName: Active MQArtemis kind: ActiveMQArtemis name: activemqartemises.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 version: v2alpha1 - description: ActiveMQArtemisScaledown is the Schema for the activemqartemisscaledowns API displayName: Active MQArtemis Scaledown kind: ActiveMQArtemisScaledown name: activemqartemisscaledowns.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 specDescriptors: - description: Triggered by main ActiveMQArtemis CRD messageMigration entry - displayName: Local Only + displayName: Temporary path: localOnly x-descriptors: - urn:alm:descriptor:com.tectonic.ui:booleanSwitch @@ -1201,6 +1241,10 @@ spec: displayName: ActiveMQ Artemis Security kind: ActiveMQArtemisSecurity name: activemqartemissecurities.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 specDescriptors: - description: Apply this security config to the broker crs in the current namespace. A value of * or empty string means applying to all broker crs. Default apply @@ -1719,6 +1763,10 @@ spec: displayName: ActiveMQ Artemis Security kind: ActiveMQArtemisSecurity name: activemqartemissecurities.broker.amq.io + resources: + - kind: Secret + name: "" + version: v1 specDescriptors: - description: Apply this security config to the broker crs in the current namespace. A value of * or empty string means applying to all broker crs. Default apply diff --git a/config/scorecard/patches/basic.config.yaml b/config/scorecard/patches/basic.config.yaml index c19af06f9..c8c4b236d 100644 --- a/config/scorecard/patches/basic.config.yaml +++ b/config/scorecard/patches/basic.config.yaml @@ -4,7 +4,7 @@ entrypoint: - scorecard-test - basic-check-spec - image: quay.io/operator-framework/scorecard-test:v1.15.0 + image: quay.io/operator-framework/scorecard-test:v1.31 labels: suite: basic test: basic-check-spec-test diff --git a/config/scorecard/patches/olm.config.yaml b/config/scorecard/patches/olm.config.yaml index 0e4888c96..b557bb5c6 100644 --- a/config/scorecard/patches/olm.config.yaml +++ b/config/scorecard/patches/olm.config.yaml @@ -4,7 +4,7 @@ entrypoint: - scorecard-test - olm-bundle-validation - image: quay.io/operator-framework/scorecard-test:v1.15.0 + image: quay.io/operator-framework/scorecard-test:v1.31 labels: suite: olm test: olm-bundle-validation-test @@ -14,7 +14,7 @@ entrypoint: - scorecard-test - olm-crds-have-validation - image: quay.io/operator-framework/scorecard-test:v1.15.0 + image: quay.io/operator-framework/scorecard-test:v1.31 labels: suite: olm test: olm-crds-have-validation-test @@ -24,7 +24,7 @@ entrypoint: - scorecard-test - olm-crds-have-resources - image: quay.io/operator-framework/scorecard-test:v1.15.0 + image: quay.io/operator-framework/scorecard-test:v1.31 labels: suite: olm test: olm-crds-have-resources-test @@ -34,7 +34,7 @@ entrypoint: - scorecard-test - olm-spec-descriptors - image: quay.io/operator-framework/scorecard-test:v1.15.0 + image: quay.io/operator-framework/scorecard-test:v1.31 labels: suite: olm test: olm-spec-descriptors-test @@ -44,7 +44,7 @@ entrypoint: - scorecard-test - olm-status-descriptors - image: quay.io/operator-framework/scorecard-test:v1.15.0 + image: quay.io/operator-framework/scorecard-test:v1.31 labels: suite: olm test: olm-status-descriptors-test