diff --git a/.osdk-scorecard.yaml b/.osdk-scorecard.yaml index d79c0d84d..1050bc605 100644 --- a/.osdk-scorecard.yaml +++ b/.osdk-scorecard.yaml @@ -14,4 +14,4 @@ scorecard: - "deploy/crds/app.kiegroup.org_v1alpha1_kogitoapp_cr.yaml" - "deploy/crds/app.kiegroup.org_v1alpha1_kogitodataindex_cr.yaml" - "deploy/crds/app.kiegroup.org_v1alpha1_kogitoinfra_cr.yaml" - csv-path: "deploy/olm-catalog/kogito-cloud-operator/0.6.0/kogito-cloud-operator.v0.6.0.clusterserviceversion.yaml" + csv-path: "deploy/olm-catalog/kogito-operator/0.6.0/kogito-operator.v0.6.0.clusterserviceversion.yaml" diff --git a/README.md b/README.md index b673df7f6..41809281f 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ The Kogito Operator is available in the OperatorHub as a community operator. To You can also verify the Operator availability in the catalog by running the following command: ```bash -$ oc describe operatorsource.operators.coreos.com/kogitocloud-operator -n openshift-marketplace +$ oc describe operatorsource.operators.coreos.com/kogito-operator -n openshift-marketplace ``` Follow the OpenShift Web Console instructions in the **Catalog** -> **OperatorHub** section in the left menu to install it in any namespace in the cluster. @@ -97,7 +97,7 @@ Follow the OpenShift Web Console instructions in the **Catalog** -> **OperatorHu If you cannot find the Kogito Operator in OperatorHub, you can install it manually by creating an entry in the OperatorHub Catalog: ```bash -$ oc create -f deploy/olm-catalog/kogito-cloud-operator/kogitocloud-operatorsource.yaml +$ oc create -f deploy/olm-catalog/kogito-operator/kogito-operator-operatorsource.yaml ``` After several minutes, the Operator appears under the **Catalog** -> **OperatorHub** section in the OpenShift Web Console. To find the Operator, search by the _Kogito_ name. You can then install the Operator as described in the [Automatically in OperatorHub](#automatically-in-operatorhub) section. @@ -166,13 +166,13 @@ To view the Operator logs, first identify where the operator is deployed: $ oc get pods NAME READY STATUS RESTARTS AGE -kogito-cloud-operator-6d7b6d4466-9ng8t 1/1 Running 0 26m +kogito-operator-6d7b6d4466-9ng8t 1/1 Running 0 26m ``` Use the pod name as the input in the following command: ```bash -$ oc logs -f kogito-cloud-operator-6d7b6d4466-9ng8t +$ oc logs -f kogito-operator-6d7b6d4466-9ng8t ``` ## Kogito Data Index Service deployment @@ -727,27 +727,27 @@ To install the Kogito Operator on OpenShift 4.x for end-to-end (E2E) testing, en Push the Operator bundle to your quay application repository as shown in the following example: ```bash -$ operator-courier push deploy/olm-catalog/kogito-cloud-operator/ namespace kogitocloud-operator 0.6.0 "basic XXXXXXXXX" +$ operator-courier push deploy/olm-catalog/kogito-operator/ namespace kogito-operator 0.6.0 "basic XXXXXXXXX" ``` If you push to another quay repository, replace `namespace` with your user name or the other namespace. The push command does not overwrite an existing repository, so you must delete the bundle before you can build and upload a new version. After you upload the bundle, create an [Operator Source](https://github.com/operator-framework/community-operators/blob/master/docs/testing-operators.md#linking-the-quay-application-repository-to-your-openshift-40-cluster) to load your operator bundle in OpenShift. -The OpenShift cluster needs access to the created application. Ensure that the application is **public** or that you have configured the private repository credentials in the cluster. To make the application public, go to your `quay.io` account, and in the **Applications** tab look for the `kogitocloud-operator` application. Under the settings section, click **make public**. +The OpenShift cluster needs access to the created application. Ensure that the application is **public** or that you have configured the private repository credentials in the cluster. To make the application public, go to your `quay.io` account, and in the **Applications** tab look for the `kogito-operator` application. Under the settings section, click **make public**. ```bash ## Kogito imagestreams should already be installed and available, for example: $ oc apply -f https://raw.githubusercontent.com/kiegroup/kogito-cloud/master/s2i/kogito-imagestream.yaml -n openshift -$ oc create -f deploy/olm-catalog/kogito-cloud-operator/kogitocloud-operatorsource.yaml +$ oc create -f deploy/olm-catalog/kogito-operator/kogito-operator-operatorsource.yaml ``` -Replace `registryNamespace` in the `kogitocloud-operatorsource.yaml` file with your quay namespace. The name, display name, and publisher of the Operator are the only other attributes that you can modify. +Replace `registryNamespace` in the `kogito-operator-operatorsource.yaml` file with your quay namespace. The name, display name, and publisher of the Operator are the only other attributes that you can modify. After several minutes, the Operator appears under **Catalog** -> **OperatorHub** in the OpenShift Web Console. To find the Operator, filter the provider type by _Custom_. To verify the operator status, run the following command: ```bash -$ oc describe operatorsource.operators.coreos.com/kogitocloud-operator -n openshift-marketplace +$ oc describe operatorsource.operators.coreos.com/kogito-operator -n openshift-marketplace ``` ### Running End-to-End (E2E) tests diff --git a/cmd/kogito/command/shared/install_operator_test.go b/cmd/kogito/command/shared/install_operator_test.go index be2718338..0ce9eeb9a 100644 --- a/cmd/kogito/command/shared/install_operator_test.go +++ b/cmd/kogito/command/shared/install_operator_test.go @@ -90,7 +90,7 @@ func TestMustInstallOperatorIfNotExists_WithOperatorHub(t *testing.T) { Namespace: operatorMarketplaceNamespace, }, Status: operatormkt.OperatorSourceStatus{ - Packages: "cert-utils-operator,spark-gcp,metering,spinnaker-operator,apicurito,kubefed,prometheus,hawtio-operator,t8c,hazelcast-enterprise,opsmx-spinnaker-operator,ibmcloud-operator,openebs,iot-simulator,submariner,microcks,enmasse,teiid,federation,aqua,eclipse-che,3scale-community-operator,jaeger,openshift-pipelines-operator,awss3-operator-registry,service-binding-operator,node-network-operator,myvirtualdirectory,triggermesh,namespace-configuration-operator,maistraoperator,camel-k,federatorai,knative-serving-operator,syndesis,knative-kafka-operator,postgresql,event-streams-topic,planetscale,kiali,ripsaw,esindex-operator,halkyon,quay,kogitocloud-operator,seldon-operator,cockroachdb,atlasmap-operator,strimzi-kafka-operator,knative-camel-operator,lightbend-console-operator,descheduler,node-problem-detector,opendatahub-operator,radanalytics-spark,hco-operatorhub,smartgateway-operator,etcd,knative-eventing-operator,postgresql-operator-dev4devs-com,twistlock,microsegmentation-operator,open-liberty,akka-cluster-operator,grafana-operator,kubeturbo,appsody-community-operator,infinispan", + Packages: "cert-utils-operator,spark-gcp,metering,spinnaker-operator,apicurito,kubefed,prometheus,hawtio-operator,t8c,hazelcast-enterprise,opsmx-spinnaker-operator,ibmcloud-operator,openebs,iot-simulator,submariner,microcks,enmasse,teiid,federation,aqua,eclipse-che,3scale-community-operator,jaeger,openshift-pipelines-operator,awss3-operator-registry,service-binding-operator,node-network-operator,myvirtualdirectory,triggermesh,namespace-configuration-operator,maistraoperator,camel-k,federatorai,knative-serving-operator,syndesis,knative-kafka-operator,postgresql,event-streams-topic,planetscale,kiali,ripsaw,esindex-operator,halkyon,quay,kogito-operator,seldon-operator,cockroachdb,atlasmap-operator,strimzi-kafka-operator,knative-camel-operator,lightbend-console-operator,descheduler,node-problem-detector,opendatahub-operator,radanalytics-spark,hco-operatorhub,smartgateway-operator,etcd,knative-eventing-operator,postgresql-operator-dev4devs-com,twistlock,microsegmentation-operator,open-liberty,akka-cluster-operator,grafana-operator,kubeturbo,appsody-community-operator,infinispan", }, } client := test.SetupFakeKubeCli(&v1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: ns}}, operatorSource) @@ -108,7 +108,7 @@ func TestTryToInstallOperatorIfNotExists_WithOperatorHub(t *testing.T) { Namespace: operatorMarketplaceNamespace, }, Status: operatormkt.OperatorSourceStatus{ - Packages: "cert-utils-operator,spark-gcp,metering,spinnaker-operator,apicurito,kubefed,prometheus,hawtio-operator,t8c,hazelcast-enterprise,opsmx-spinnaker-operator,ibmcloud-operator,openebs,iot-simulator,submariner,microcks,enmasse,teiid,federation,aqua,eclipse-che,3scale-community-operator,jaeger,openshift-pipelines-operator,awss3-operator-registry,service-binding-operator,node-network-operator,myvirtualdirectory,triggermesh,namespace-configuration-operator,maistraoperator,camel-k,federatorai,knative-serving-operator,syndesis,knative-kafka-operator,postgresql,event-streams-topic,planetscale,kiali,ripsaw,esindex-operator,halkyon,quay,kogitocloud-operator,seldon-operator,cockroachdb,atlasmap-operator,strimzi-kafka-operator,knative-camel-operator,lightbend-console-operator,descheduler,node-problem-detector,opendatahub-operator,radanalytics-spark,hco-operatorhub,smartgateway-operator,etcd,knative-eventing-operator,postgresql-operator-dev4devs-com,twistlock,microsegmentation-operator,open-liberty,akka-cluster-operator,grafana-operator,kubeturbo,appsody-community-operator,infinispan", + Packages: "cert-utils-operator,spark-gcp,metering,spinnaker-operator,apicurito,kubefed,prometheus,hawtio-operator,t8c,hazelcast-enterprise,opsmx-spinnaker-operator,ibmcloud-operator,openebs,iot-simulator,submariner,microcks,enmasse,teiid,federation,aqua,eclipse-che,3scale-community-operator,jaeger,openshift-pipelines-operator,awss3-operator-registry,service-binding-operator,node-network-operator,myvirtualdirectory,triggermesh,namespace-configuration-operator,maistraoperator,camel-k,federatorai,knative-serving-operator,syndesis,knative-kafka-operator,postgresql,event-streams-topic,planetscale,kiali,ripsaw,esindex-operator,halkyon,quay,kogito-operator,seldon-operator,cockroachdb,atlasmap-operator,strimzi-kafka-operator,knative-camel-operator,lightbend-console-operator,descheduler,node-problem-detector,opendatahub-operator,radanalytics-spark,hco-operatorhub,smartgateway-operator,etcd,knative-eventing-operator,postgresql-operator-dev4devs-com,twistlock,microsegmentation-operator,open-liberty,akka-cluster-operator,grafana-operator,kubeturbo,appsody-community-operator,infinispan", }, } client := test.SetupFakeKubeCli(&v1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: ns}}, operatorSource) diff --git a/cmd/kogito/command/shared/operatorhub.go b/cmd/kogito/command/shared/operatorhub.go index cfefaf115..0c6f931cb 100644 --- a/cmd/kogito/command/shared/operatorhub.go +++ b/cmd/kogito/command/shared/operatorhub.go @@ -25,7 +25,7 @@ import ( ) const ( - defaultOperatorPackageName = "kogitocloud-operator" + defaultOperatorPackageName = "kogito-operator" communityOperatorSource = "community-operators" operatorMarketplaceNamespace = "openshift-marketplace" ) diff --git a/deploy/crds/app.kiegroup.org_kogitoapps_crd.yaml b/deploy/crds/app.kiegroup.org_kogitoapps_crd.yaml index cc66c681b..0be424102 100644 --- a/deploy/crds/app.kiegroup.org_kogitoapps_crd.yaml +++ b/deploy/crds/app.kiegroup.org_kogitoapps_crd.yaml @@ -310,7 +310,7 @@ spec: conditions: description: History of conditions for the service items: - description: Condition is the condition for the kogito-cloud-operator + description: Condition is the condition for the kogito-operator properties: lastTransitionTime: format: date-time diff --git a/deploy/olm-catalog/kogito-cloud-operator/kogito-cloud-operator.package.yaml b/deploy/olm-catalog/kogito-cloud-operator/kogito-cloud-operator.package.yaml deleted file mode 100644 index 4a0b74044..000000000 --- a/deploy/olm-catalog/kogito-cloud-operator/kogito-cloud-operator.package.yaml +++ /dev/null @@ -1,7 +0,0 @@ -channels: -- currentCSV: kogito-cloud-operator.v0.6.0 - name: alpha -- currentCSV: kogito-cloud-operator.v0.6.0 - name: dev-preview -defaultChannel: alpha -packageName: kogitocloud-operator diff --git a/deploy/olm-catalog/kogito-cloud-operator/0.4.0/app_v1alpha1_kogitoapp_crd.yaml b/deploy/olm-catalog/kogito-operator/0.4.0/app_v1alpha1_kogitoapp_crd.yaml similarity index 100% rename from deploy/olm-catalog/kogito-cloud-operator/0.4.0/app_v1alpha1_kogitoapp_crd.yaml rename to deploy/olm-catalog/kogito-operator/0.4.0/app_v1alpha1_kogitoapp_crd.yaml diff --git a/deploy/olm-catalog/kogito-cloud-operator/0.4.0/app_v1alpha1_kogitodataindex_crd.yaml b/deploy/olm-catalog/kogito-operator/0.4.0/app_v1alpha1_kogitodataindex_crd.yaml similarity index 100% rename from deploy/olm-catalog/kogito-cloud-operator/0.4.0/app_v1alpha1_kogitodataindex_crd.yaml rename to deploy/olm-catalog/kogito-operator/0.4.0/app_v1alpha1_kogitodataindex_crd.yaml diff --git a/deploy/olm-catalog/kogito-cloud-operator/0.4.0/kogito-cloud-operator.v0.4.0.clusterserviceversion.yaml b/deploy/olm-catalog/kogito-operator/0.4.0/kogito-cloud-operator.v0.4.0.clusterserviceversion.yaml similarity index 100% rename from deploy/olm-catalog/kogito-cloud-operator/0.4.0/kogito-cloud-operator.v0.4.0.clusterserviceversion.yaml rename to deploy/olm-catalog/kogito-operator/0.4.0/kogito-cloud-operator.v0.4.0.clusterserviceversion.yaml diff --git a/deploy/olm-catalog/kogito-cloud-operator/0.5.0/app_v1alpha1_kogitoapp_crd.yaml b/deploy/olm-catalog/kogito-operator/0.5.0/app_v1alpha1_kogitoapp_crd.yaml similarity index 100% rename from deploy/olm-catalog/kogito-cloud-operator/0.5.0/app_v1alpha1_kogitoapp_crd.yaml rename to deploy/olm-catalog/kogito-operator/0.5.0/app_v1alpha1_kogitoapp_crd.yaml diff --git a/deploy/olm-catalog/kogito-cloud-operator/0.5.0/app_v1alpha1_kogitodataindex_crd.yaml b/deploy/olm-catalog/kogito-operator/0.5.0/app_v1alpha1_kogitodataindex_crd.yaml similarity index 100% rename from deploy/olm-catalog/kogito-cloud-operator/0.5.0/app_v1alpha1_kogitodataindex_crd.yaml rename to deploy/olm-catalog/kogito-operator/0.5.0/app_v1alpha1_kogitodataindex_crd.yaml diff --git a/deploy/olm-catalog/kogito-cloud-operator/0.5.0/kogito-cloud-operator.v0.5.0.clusterserviceversion.yaml b/deploy/olm-catalog/kogito-operator/0.5.0/kogito-cloud-operator.v0.5.0.clusterserviceversion.yaml similarity index 100% rename from deploy/olm-catalog/kogito-cloud-operator/0.5.0/kogito-cloud-operator.v0.5.0.clusterserviceversion.yaml rename to deploy/olm-catalog/kogito-operator/0.5.0/kogito-cloud-operator.v0.5.0.clusterserviceversion.yaml diff --git a/deploy/olm-catalog/kogito-cloud-operator/0.6.0/app.kiegroup.org_kogitoapps_crd.yaml b/deploy/olm-catalog/kogito-operator/0.6.0/app.kiegroup.org_kogitoapps_crd.yaml similarity index 99% rename from deploy/olm-catalog/kogito-cloud-operator/0.6.0/app.kiegroup.org_kogitoapps_crd.yaml rename to deploy/olm-catalog/kogito-operator/0.6.0/app.kiegroup.org_kogitoapps_crd.yaml index cc66c681b..0be424102 100644 --- a/deploy/olm-catalog/kogito-cloud-operator/0.6.0/app.kiegroup.org_kogitoapps_crd.yaml +++ b/deploy/olm-catalog/kogito-operator/0.6.0/app.kiegroup.org_kogitoapps_crd.yaml @@ -310,7 +310,7 @@ spec: conditions: description: History of conditions for the service items: - description: Condition is the condition for the kogito-cloud-operator + description: Condition is the condition for the kogito-operator properties: lastTransitionTime: format: date-time diff --git a/deploy/olm-catalog/kogito-cloud-operator/0.6.0/app.kiegroup.org_kogitodataindices_crd.yaml b/deploy/olm-catalog/kogito-operator/0.6.0/app.kiegroup.org_kogitodataindices_crd.yaml similarity index 100% rename from deploy/olm-catalog/kogito-cloud-operator/0.6.0/app.kiegroup.org_kogitodataindices_crd.yaml rename to deploy/olm-catalog/kogito-operator/0.6.0/app.kiegroup.org_kogitodataindices_crd.yaml diff --git a/deploy/olm-catalog/kogito-cloud-operator/0.6.0/app.kiegroup.org_kogitoinfras_crd.yaml b/deploy/olm-catalog/kogito-operator/0.6.0/app.kiegroup.org_kogitoinfras_crd.yaml similarity index 100% rename from deploy/olm-catalog/kogito-cloud-operator/0.6.0/app.kiegroup.org_kogitoinfras_crd.yaml rename to deploy/olm-catalog/kogito-operator/0.6.0/app.kiegroup.org_kogitoinfras_crd.yaml diff --git a/deploy/olm-catalog/kogito-cloud-operator/0.6.0/kogito-cloud-operator.v0.6.0.clusterserviceversion.yaml b/deploy/olm-catalog/kogito-operator/0.6.0/kogito-operator.v0.6.0.clusterserviceversion.yaml similarity index 96% rename from deploy/olm-catalog/kogito-cloud-operator/0.6.0/kogito-cloud-operator.v0.6.0.clusterserviceversion.yaml rename to deploy/olm-catalog/kogito-operator/0.6.0/kogito-operator.v0.6.0.clusterserviceversion.yaml index 63a510d77..10cc82aaf 100644 --- a/deploy/olm-catalog/kogito-cloud-operator/0.6.0/kogito-cloud-operator.v0.6.0.clusterserviceversion.yaml +++ b/deploy/olm-catalog/kogito-operator/0.6.0/kogito-operator.v0.6.0.clusterserviceversion.yaml @@ -4,6 +4,21 @@ metadata: annotations: alm-examples: |- [ + { + "apiVersion": "app.kiegroup.org/v1alpha1", + "kind": "KogitoApp", + "metadata": { + "name": "example-quarkus" + }, + "spec": { + "build": { + "gitSource": { + "contextDir": "jbpm-quarkus-example", + "uri": "https://github.com/kiegroup/kogito-examples" + } + } + } + }, { "apiVersion": "app.kiegroup.org/v1alpha1", "kind": "KogitoDataIndex", @@ -35,21 +50,6 @@ metadata: "installInfinispan": false, "installKafka": false } - }, - { - "apiVersion": "app.kiegroup.org/v1alpha1", - "kind": "KogitoApp", - "metadata": { - "name": "example-quarkus" - }, - "spec": { - "build": { - "gitSource": { - "contextDir": "jbpm-quarkus-example", - "uri": "https://github.com/kiegroup/kogito-examples" - } - } - } } ] capabilities: Basic Install @@ -57,13 +57,13 @@ metadata: certified: "false" containerImage: quay.io/kiegroup/kogito-cloud-operator:0.6.0 createdAt: "2019-08-22T13:12:22Z" - description: Kogito Cloud Operator for deployment and management of Kogito Services. + description: Kogito Operator for deployment and management of Kogito Services. repository: https://github.com/kiegroup/kogito-cloud-operator support: Red Hat tectonic-visibility: ocs labels: operator-kogitocloud: "true" - name: kogito-cloud-operator.v0.6.0 + name: kogito-operator.v0.6.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -251,25 +251,25 @@ spec: * Creates two kinds of build configuration: Native or JVM. For more information refer to [Native X JVM Builds](https://github.com/kiegroup/kogito-cloud-operator#native-x-jvm-builds) on our docs * Builds a Kogito Runtime Service from a remote git repository and creates a custom image for the given runtime: Quarkus or Springboot. [See more](https://github.com/kiegroup/kogito-cloud-operator#kogito-runtimes-service-deployment). * Installs the [Kogito Data Index Service](https://github.com/kiegroup/kogito-runtimes/wiki/Data-Index-Service) to enable data index feature for Kogito Runtimes. [See more](https://github.com/kiegroup/kogito-cloud-operator#kogito-data-index-service-installation). - displayName: Kogito Cloud Operator + displayName: Kogito Operator icon: - base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDI0IDEwMjQiPjxkZWZzPjxzdHlsZT4uY2xzLTF7ZmlsbDojMDg1ODcwO30uY2xzLTJ7ZmlsbDojZmZmO30uY2xzLTN7ZmlsbDojZjU4OTFmO30uY2xzLTR7ZmlsbDojOTdkNGU4O308L3N0eWxlPjwvZGVmcz48dGl0bGU+a29naXRvX2ljb25fcmdiX2NvbG9yX2RlZmF1bHQ8L3RpdGxlPjxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTkyOS4zNywzMC41QTcwLjMxLDcwLjMxLDAsMCwwLDg3Mi4xOSwxQzg2OC4wOSwxLDczOCwyMy42Nyw3MzgsMjMuNjdhNzAuMTUsNzAuMTUsMCwwLDAtNDguMSwzMy4yNUw2NjgsOTMuNzdjLTQ4LjQxLTQyLjQ2LTEwMS43NC02NC43LTE1Ni02NC43UzQwNC40Myw1MS4zMSwzNTYsOTMuNzdMMzM0LjExLDU2LjkyQTcwLjEzLDcwLjEzLDAsMCwwLDI4NiwyMy42N1MxNTUuOSwxLDE1MS44MSwxQTcwLjE5LDcwLjE5LDAsMCwwLDkwLjU0LDEwNS40MWw1MC4yNCw5MGExMTUuMTIsMTE1LjEyLDAsMCwwLDYwLjMsMTY5LjlMMTA4LjMsNzk0LjYsNTEyLDEwMjMsOTE1LjcsNzk0LjYsODIyLjkyLDM2NS4yN2ExMTUuMTIsMTE1LjEyLDAsMCwwLDYwLjMtMTY5LjlsNTAuMjQtOTBBNzAuNDksNzAuNDksMCwwLDAsOTI5LjM3LDMwLjVaIi8+PHBhdGggY2xhc3M9ImNscy0yIiBkPSJNNDgwLjA5LDI3OC4zbDguNTctLjA5TDUxMiwzMDEuNGwyMy4xOS0yMy4xOSw4LjYuMDhjNjMuMjMuNjMsMTIzLjgyLDMuMTQsMTc2LjI4LDcuMjctNDUuOTQtOTkuNDktMTIyLTE4Ni4zLTIwOC0xODYuM1MzNDkuOSwxODYuMDcsMzA0LDI4NS41N0MzNTYuMzksMjgxLjQ0LDQxNi45NCwyNzguOTIsNDgwLjA5LDI3OC4zWiIvPjxwYXRoIGNsYXNzPSJjbHMtMyIgZD0iTTQ0OC43LDY5Ni4xNmExMTYuMzYsMTE2LjM2LDAsMCwwLDEzMS4xNy41MSw1ODEuNDcsNTgxLjQ3LDAsMCwwLTEzMS4xNy0uNTFaIi8+PHBhdGggY2xhc3M9ImNscy00IiBkPSJNNjkxLjU3LDY3OS43M2ExODUuNDQsMTg1LjQ0LDAsMCwwLTE3LjI3LTQxLjQ3Yy0xLjIxLTIuMTItMi41LTQuMTgtMy43OC02LjI0LS43My0xLjE5LTEuNDMtMi40MS0yLjE5LTMuNTgtMS4yLTEuODUtMi40OS0zLjYzLTMuNzUtNS40My0uOTQtMS4zNC0xLjg1LTIuNzEtMi44Mi00LTEuMTItMS41MS0yLjMyLTMtMy40OC00LjQzcy0yLjM4LTMuMDgtMy42NC00LjU3Yy0xLTEuMTgtMi0yLjI5LTMtMy40NEExODYuNjksMTg2LjY5LDAsMCwwLDU3MC43Myw1NTNjLTE3LjI1LDExLjU2LTM5LDIyLjY5LTU4LjczLDIyLjY5UzQ3MC41Miw1NjQuNTcsNDUzLjI3LDU1M2ExODYuNTksMTg2LjU5LDAsMCwwLTgwLjkxLDUzLjZjLTEsMS4xMy0yLDIuMjItMywzLjM3LTEuMjYsMS41LTIuNDQsMy4wNi0zLjY2LDQuNnMtMi4zNCwyLjkxLTMuNDYsNC40MWMtMSwxLjMyLTEuODgsMi42OS0yLjgzLDQtMS4yNiwxLjc5LTIuNTQsMy41Ni0zLjczLDUuNC0uNzcsMS4xOS0xLjQ4LDIuNDItMi4yMiwzLjYyLTEuMjcsMi4wNS0yLjU2LDQuMS0zLjc1LDYuMjFhMTg1LDE4NSwwLDAsMC0xNy4yOCw0MS40N2MxMi44NC00LjQsMjYuNDMtOC4yMyw0MC40Ni0xMS42NywwLDAtLjA1LS4wOS0uMDctLjE0LDEuNDUtLjM1LDIuOTUtLjY2LDQuNDEtMWwxNi45NS00Ny4yNnY0My41MWMxLS4yLDItLjM0LDMtLjU0cTkuNDQtMS44NSwxOS4xNC0zLjM5Yy43OS0uMTMsMS41Ny0uMjcsMi4zNi0uMzlxMTEuNzQtMS44MywyMy44Ni0zLjJsMTMuODctNTUuNTF2NTQuMDljOC41Ni0uNzcsMTcuMjYtMS4zMSwyNi0xLjcybDMuOTItLjE3YzMuMjctLjEzLDYuNTMtLjI3LDkuODMtLjM1LDUuMjMtLjE0LDEwLjUtLjIzLDE1LjgtLjIzLDUuNDksMCwxMC45My4xLDE2LjM0LjI1LDIuOS4wOCw1Ljc5LjE5LDguNjcuMzFsNS43NS4yNmM4LjM2LjQxLDE2LjY2Ljk0LDI0LjgyLDEuNjhWNjAwLjEzbDEzLjg4LDU1LjUzYy41NS4wNiwxLjA5LjE1LDEuNjUuMjIsNy4zLjg1LDE0LjU0LDEuNzksMjEuNjUsMi44OSwyLjczLjQxLDUuMzguOTIsOC4wOCwxLjM3LDMuOTUuNjgsNy45LDEuMzUsMTEuNzgsMi4xLDEuNzIuMzIsMy41LjU4LDUuMi45MlY2MTkuNjVsMTcsNDcuMjljMS4yMy4yOSwyLjQuNjQsMy42Mi45NCwxLjg0LjQ1LDMuNzIuODYsNS41NCwxLjMybC0uMDYuMUM2NjguMTksNjcyLjQ0LDY4MC4yMSw2NzUuODMsNjkxLjU3LDY3OS43M1oiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik03MzcuNTcsMzI4LjA3bC0xMC0uODRjLTUxLjU2LTQuMzgtMTEyLjEzLTcuMS0xNzUuNjctNy45TDUxMiwzNTkuMjRsLTQwLjA5LTM5LjkxYy02My40OC44MS0xMjQsMy41My0xNzUuNTQsNy45bC0xMCwuODVDMjY4LjI3LDM3Ny44MiwyNTgsNDI4LjExLDI1OCw0NzAuMjRjMCw2OS45NCwyOC4zMSwxMDQuMTYsNzQsMTIwLjkzQTIyOS40OCwyMjkuNDgsMCwwLDEsNDE4LjI4LDUyM2EyMC40MywyMC40MywwLDAsMSwzMi4xNi0yNC4xNmMxNi4xMiwxNC45LDQ1Ljg5LDM1LjkxLDYxLjU2LDM1LjkxczQ1Ljk0LTIxLjQzLDYxLjU1LTM1LjkxQTIwLjQzLDIwLjQzLDAsMCwxLDYwNS43Miw1MjMsMjI5LjY1LDIyOS42NSwwLDAsMSw2OTIsNTkxLjE3YzQ1Ljc0LTE2Ljc3LDc0LTUxLDc0LTEyMC45M0M3NjYsNDI4LjExLDc1NS43MywzNzcuODIsNzM3LjU3LDMyOC4wN1pNNDAzLjUsNDYyLjc3Yy0yOS4zMS42Ni01Ni0xNi4yLTc0LjgyLTQzLjUxLDE3LjUzLTI4LjEzLDQzLjQ3LTQ2LjE3LDcyLjc4LTQ2LjgzczU2LDE2LjE5LDc0LjgyLDQzLjUxQzQ1OC43NSw0NDQuMDcsNDMyLjgxLDQ2Mi4xMSw0MDMuNSw0NjIuNzdabTI5MS44Mi0xMy4xOC0zMiwzMi0zMi0zMi0zMiwzMi0zMi0zMiwzMi0zMi0zMi0zMiwzMi0zMiwzMiwzMiwzMi0zMiwzMiwzMi0zMiwzMloiLz48cGF0aCBjbGFzcz0iY2xzLTQiIGQ9Ik02MDguMjMsNzk3bDE5LjkxLDc5LjY3LDc2LjMyLTQzLjE4Vjc0NWwxOS4zOCw3Ny41MywxMTIuMzUtNjMuNTZMNzkxLjUyLDU1Mi4yN2MtMTQuOTQsMzMuOTItNDAuNjgsNTguNzctNzcuMiw3NC4xMkEyMjUuMTQsMjI1LjE0LDAsMCwxLDczMSw2NjguNzFhNDAuOTQsNDAuOTQsMCwwLDEtNTIuNzIsNDkuNzUsNDM4LjI3LDQzOC4yNywwLDAsMC00Ni43My0xMywxNTcuMDcsMTU3LjA3LDAsMCwxLTIzNC42LTEsNDQzLjg2LDQ0My44NiwwLDAsMC01MS4yMywxNEE0MC45NCw0MC45NCwwLDAsMSwyOTMsNjY4LjcxYTIyNC44NiwyMjQuODYsMCwwLDEsMTYuNjktNDIuMzNjLTM2LjUzLTE1LjM0LTYyLjI3LTQwLjItNzcuMjEtNzQuMTFMMTg3LjgxLDc1OC45NCwzMDAuMTYsODIyLjUsMzE5LjU0LDc0NXY4OC41bDc2LjMyLDQzLjE4TDQxNS43Nyw3OTd2OTAuOTNMNTEyLDk0Mi4zNmw5Ni4yMy01NC40NVoiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0yNTMuOTEsMjk4LjQzYTU4MC4wNiw1ODAuMDYsMCwwLDEsNDMuNTUtODcuNjRxMTEuOTMtMTkuNTEsMjQuNjktMzYuNjRMMjczLjc4LDkyLjc5bC0xMjItMjEuNiw3OC43NiwxNDEsLjA2LjA3YTQ0LjgxLDQ0LjgxLDAsMSwwLDIzLjI3LDg2LjEzWiIvPjxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTc5My4zNSwyMTIuM2wuMDctLjA3LDc4Ljc2LTE0MS0xMjIsMjEuNi00OC4zNyw4MS4zNnExMi43MiwxNy4xNywyNC42OSwzNi42NGE1ODAuMDYsNTgwLjA2LDAsMCwxLDQzLjU1LDg3LjY0LDQ0LjgsNDQuOCwwLDEsMCwyMy4yNi04Ni4xM1oiLz48L3N2Zz4= mediatype: image/svg+xml install: spec: deployments: - - name: kogito-cloud-operator + - name: kogito-operator spec: replicas: 1 selector: matchLabels: - name: kogito-cloud-operator + name: kogito-operator strategy: type: Recreate template: metadata: labels: - name: kogito-cloud-operator + name: kogito-operator spec: containers: - command: @@ -291,9 +291,9 @@ spec: value: "false" image: quay.io/kiegroup/kogito-cloud-operator:0.6.0 imagePullPolicy: Always - name: kogito-cloud-operator + name: kogito-operator resources: {} - serviceAccountName: kogito-cloud-operator + serviceAccountName: kogito-operator permissions: - rules: - apiGroups: @@ -355,12 +355,12 @@ spec: - apiGroups: - apps resourceNames: - - kogito-cloud-operator + - kogito-operator resources: - deployments/finalizers verbs: - update - serviceAccountName: kogito-cloud-operator + serviceAccountName: kogito-operator - rules: - apiGroups: - "" @@ -390,8 +390,8 @@ spec: - native - automation labels: - alm-owner-kogitocloud: kogitocloud-operator - operated-by: kogitocloud-operator.0.6.0 + alm-owner-kogito: kogito-operator + operated-by: kogito-operator.0.6.0 links: - name: Product Page url: https://kogito.kie.org/ @@ -406,8 +406,4 @@ spec: provider: name: Red Hat replaces: kogito-cloud-operator.v0.5.0 - selector: - matchLabels: - alm-owner-kogitocloud: kogitocloud-operator - operated-by: kogitocloud-operator.0.5.0 version: 0.6.0 diff --git a/deploy/olm-catalog/kogito-cloud-operator/kogitocloud-operatorsource.yaml b/deploy/olm-catalog/kogito-operator/kogito-operator-operatorsource.yaml similarity index 75% rename from deploy/olm-catalog/kogito-cloud-operator/kogitocloud-operatorsource.yaml rename to deploy/olm-catalog/kogito-operator/kogito-operator-operatorsource.yaml index 88858bd84..6bb4b1470 100644 --- a/deploy/olm-catalog/kogito-cloud-operator/kogitocloud-operatorsource.yaml +++ b/deploy/olm-catalog/kogito-operator/kogito-operator-operatorsource.yaml @@ -1,11 +1,11 @@ apiVersion: operators.coreos.com/v1 kind: OperatorSource metadata: - name: kogitocloud-operator + name: kogito-operator namespace: openshift-marketplace spec: type: appregistry endpoint: https://quay.io/cnr registryNamespace: kiegroup - displayName: "Kogito Cloud Operators" + displayName: "Kogito Operator" publisher: "Red Hat" diff --git a/deploy/olm-catalog/kogito-operator/kogito-operator.package.yaml b/deploy/olm-catalog/kogito-operator/kogito-operator.package.yaml new file mode 100644 index 000000000..358f03907 --- /dev/null +++ b/deploy/olm-catalog/kogito-operator/kogito-operator.package.yaml @@ -0,0 +1,7 @@ +channels: +- currentCSV: kogito-operator.v0.6.0 + name: alpha +- currentCSV: kogito-operator.v0.6.0 + name: dev-preview +defaultChannel: alpha +packageName: kogito-operator diff --git a/deploy/operator.yaml b/deploy/operator.yaml index 4be85017d..65c589b52 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -1,22 +1,22 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: kogito-cloud-operator + name: kogito-operator spec: replicas: 1 strategy: type: Recreate selector: matchLabels: - name: kogito-cloud-operator + name: kogito-operator template: metadata: labels: - name: kogito-cloud-operator + name: kogito-operator spec: - serviceAccountName: kogito-cloud-operator + serviceAccountName: kogito-operator containers: - - name: kogito-cloud-operator + - name: kogito-operator image: quay.io/kiegroup/kogito-cloud-operator:0.6.0 command: - kogito-cloud-operator diff --git a/deploy/role.yaml b/deploy/role.yaml index fd1e68ea8..a50ff623d 100644 --- a/deploy/role.yaml +++ b/deploy/role.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: creationTimestamp: null - name: kogito-cloud-operator + name: kogito-operator rules: - apiGroups: - "" @@ -63,7 +63,7 @@ rules: - apiGroups: - apps resourceNames: - - kogito-cloud-operator + - kogito-operator resources: - deployments/finalizers verbs: diff --git a/deploy/role_binding.yaml b/deploy/role_binding.yaml index abf4ad597..31a357b8f 100644 --- a/deploy/role_binding.yaml +++ b/deploy/role_binding.yaml @@ -1,13 +1,13 @@ kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: kogito-cloud-operator + name: kogito-operator subjects: - kind: ServiceAccount - name: kogito-cloud-operator + name: kogito-operator roleRef: kind: Role - name: kogito-cloud-operator + name: kogito-operator apiGroup: rbac.authorization.k8s.io --- diff --git a/deploy/service_account.yaml b/deploy/service_account.yaml index 8cc301a54..acec223bf 100644 --- a/deploy/service_account.yaml +++ b/deploy/service_account.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: kogito-cloud-operator + name: kogito-operator --- apiVersion: v1 diff --git a/hack/go-build.sh b/hack/go-build.sh index 84ad86f01..9a0b7bf60 100755 --- a/hack/go-build.sh +++ b/hack/go-build.sh @@ -43,7 +43,7 @@ if [[ -z ${CI} ]]; then echo "${CFLAGS}" cekit build "${CFLAGS}" \ - --overrides "{'artifacts': [{'name': 'kogito-cloud-operator.tar.gz', 'md5': '${MD5}', 'url': '${URL}'}]}" + --overrides "{'artifacts': [{'name': 'kogito-operator.tar.gz', 'md5': '${MD5}', 'url': '${URL}'}]}" fi else CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -mod=vendor -v -a -o build/_output/bin/kogito-cloud-operator github.com/kiegroup/kogito-cloud-operator/cmd/manager diff --git a/hack/go-vet.sh b/hack/go-vet.sh index 6ff5a6f17..64485ba1f 100755 --- a/hack/go-vet.sh +++ b/hack/go-vet.sh @@ -18,6 +18,6 @@ if [[ -z ${CI} ]]; then ./hack/go-mod.sh operator-sdk generate k8s operator-sdk generate openapi - operator-sdk olm-catalog gen-csv --csv-version 0.6.0 --update-crds # --from-version 1.0.0 //future + operator-sdk olm-catalog gen-csv --csv-version 0.6.0 --update-crds --operator-name kogito-operator #--from-version 0.6.0 fi go vet ./... \ No newline at end of file diff --git a/hack/pr-operatorhub.sh b/hack/pr-operatorhub.sh index d2e9f48d5..b5af12394 100755 --- a/hack/pr-operatorhub.sh +++ b/hack/pr-operatorhub.sh @@ -17,7 +17,7 @@ # prepare the package for the operatorhub.io to push our changes there # 0. make sure that the operator is ok (e2e) # 1. run this script -# 2. push the results of build/_output/operatorhub/ to https://github.com/operator-framework/community-operators/tree/master/community-operators/kogito-cloud-operator +# 2. push the results of build/_output/operatorhub/ to https://github.com/operator-framework/community-operators/tree/master/community-operators/kogito-operator version=$1 output="build/_output/operatorhub/" @@ -39,8 +39,8 @@ mkdir -p ${output} make test # copy the generated files -cp "deploy/olm-catalog/kogito-cloud-operator/${version}/"*.yaml $output -cp deploy/olm-catalog/kogito-cloud-operator/kogito-cloud-operator.package.yaml $output +cp "deploy/olm-catalog/kogito-operator/${version}/"*.yaml $output +cp deploy/olm-catalog/kogito-operator/kogito-operator.package.yaml $output # basic verification operator-courier verify --ui_validate_io $output diff --git a/pkg/apis/app/v1alpha1/kogitoapp_types.go b/pkg/apis/app/v1alpha1/kogitoapp_types.go index ff6425db8..74481c3d6 100644 --- a/pkg/apis/app/v1alpha1/kogitoapp_types.go +++ b/pkg/apis/app/v1alpha1/kogitoapp_types.go @@ -286,7 +286,7 @@ const ( UnknownReason ReasonType = "Unknown" ) -// Condition is the condition for the kogito-cloud-operator +// Condition is the condition for the kogito-operator // +k8s:openapi-gen=true type Condition struct { Type ConditionType `json:"type"` diff --git a/pkg/apis/app/v1alpha1/zz_generated.openapi.go b/pkg/apis/app/v1alpha1/zz_generated.openapi.go index 0fdb0cbfe..51ba67da1 100644 --- a/pkg/apis/app/v1alpha1/zz_generated.openapi.go +++ b/pkg/apis/app/v1alpha1/zz_generated.openapi.go @@ -198,7 +198,7 @@ func schema_pkg_apis_app_v1alpha1_Condition(ref common.ReferenceCallback) common return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Description: "Condition is the condition for the kogito-cloud-operator", + Description: "Condition is the condition for the kogito-operator", Type: []string{"object"}, Properties: map[string]spec.Schema{ "type": { diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go index 351cd46ff..2732d68e3 100644 --- a/pkg/operator/operator.go +++ b/pkg/operator/operator.go @@ -16,5 +16,5 @@ package operator const ( // Name is the name of the Kogito Operator deployed in a namespace - Name = "kogito-cloud-operator" + Name = "kogito-operator" ) diff --git a/test/e2e/kogitoapp_test.go b/test/e2e/kogitoapp_test.go index cf0779f3a..b195a23f3 100644 --- a/test/e2e/kogitoapp_test.go +++ b/test/e2e/kogitoapp_test.go @@ -173,7 +173,7 @@ func initializeKogitoOperator(t *testing.T, f *framework.Framework, ctx *framewo } // wait for kogito-operator to be ready - err = e2eutil.WaitForOperatorDeployment(t, f.KubeClient, namespace, "kogito-cloud-operator", 1, time.Second*20, time.Second*40) + err = e2eutil.WaitForOperatorDeployment(t, f.KubeClient, namespace, "kogito-operator", 1, time.Second*20, time.Second*40) if err != nil { log.Fatal(err) }