From 74c851592009750c3e49ad5aecbcb034d44ac729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Mon, 23 Dec 2024 11:22:51 +0100 Subject: [PATCH] refactor: package naming MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- README.md | 14 +++--- docs/comparison.md | 2 +- docs/getting-started.md | 12 ++--- docs/reference.md | 38 ++++++++-------- pom.xml | 2 +- .../glue/customresource/glue/GlueStatus.java | 7 --- .../operator/ResourceFlowOperatorStatus.java | 8 ---- .../operator/glue/ControllerConfig.java | 2 +- .../operator/glue/GlueException.java | 2 +- .../operator/glue/Main.java | 2 +- .../operator/glue/Utils.java | 14 +++--- .../glue/conditions/JavaScripCondition.java | 8 ++-- .../glue/conditions/ReadyCondition.java | 4 +- .../glue/customresource/AbstractStatus.java | 2 +- .../glue/DependentResourceSpec.java | 4 +- .../glue/customresource/glue/Glue.java | 4 +- .../glue/customresource/glue/GlueSpec.java | 2 +- .../glue/customresource/glue/GlueStatus.java | 7 +++ .../glue/RelatedResourceSpec.java | 2 +- .../glue/condition/ConditionSpec.java | 2 +- .../condition/JavaScriptConditionSpec.java | 2 +- .../glue/condition/ReadyConditionSpec.java | 2 +- .../customresource/operator/GlueMetadata.java | 2 +- .../customresource/operator/GlueOperator.java | 4 +- .../operator/GlueOperatorSpec.java | 4 +- .../glue/customresource/operator/Parent.java | 2 +- .../operator/ResourceFlowOperatorStatus.java | 8 ++++ .../dependent/GCGenericDependentResource.java | 6 +-- .../dependent/GenericDependentResource.java | 10 ++--- .../GenericResourceDiscriminator.java | 4 +- .../reconciler/ValidationAndErrorHandler.java | 12 ++--- .../glue/reconciler/glue/GlueReconciler.java | 44 ++++++++++--------- .../reconciler/glue/InformerProducer.java | 4 +- .../reconciler/glue/InformerRegister.java | 10 ++--- ...OwnedResourceSecondaryToPrimaryMapper.java | 2 +- .../operator/GlueOperatorReconciler.java | 28 ++++++------ .../templating/GenericTemplateHandler.java | 6 +-- .../operator/glue/GlueLabelSelectorTest.java | 11 ++--- .../GlueOperatorComplexLabelSelectorTest.java | 15 ++++--- .../glue/GlueOperatorLabelSelectorTest.java | 21 ++++----- .../operator/glue/GlueOperatorTest.java | 24 +++++----- .../glue/GlueRelatedResourcesTest.java | 6 +-- .../glue/GlueResourceLabelSelectorTest.java | 2 +- .../operator/glue/GlueTest.java | 11 ++--- .../operator/glue/JavaScripConditionTest.java | 14 +++--- .../operator/glue/TestBase.java | 2 +- .../operator/glue/TestData.java | 8 ++-- .../operator/glue/TestUtils.java | 6 +-- .../ClusterScopeTestCustomResource.java | 2 +- .../customresource/TestCustomResource.java | 4 +- .../customresource/TestCustomResource2.java | 2 +- .../TestCustomResourceSpec.java | 2 +- .../reconciler/glue/InformerRegisterTest.java | 9 ++-- .../MutationWebhookDeploymentE2E.java | 11 +++-- .../operator/glue/sample/webpage/WebPage.java | 2 +- .../glue/sample/webpage/WebPageE2E.java | 11 +++-- .../sample/webpage/WebPageSampleTest.java | 6 +-- .../glue/sample/webpage/WebPageSpec.java | 2 +- .../glue/sample/webpage/WebPageStatus.java | 2 +- src/test/resources/application.properties | 2 +- src/test/resources/glue/ChanginResources.yaml | 2 +- .../resources/glue/ClusterScopeResource.yaml | 4 +- .../resources/glue/ClusterScopedChild.yaml | 2 +- .../glue/ClusterScopedRelatedResource.yaml | 2 +- .../glue/CrossReferenceResource.yaml | 2 +- .../glue/MultiNameRelatedResource.yaml | 2 +- src/test/resources/glue/NonUniqueName.yaml | 2 +- ...RelatedResourceFromDifferentNamespace.yaml | 2 +- .../RelatedResourceSimpleWithCondition.yaml | 2 +- .../glue/RelatesResourceSameType.yaml | 2 +- .../glue/ResourceInDifferentNamespace.yaml | 2 +- src/test/resources/glue/ResourceTemplate.yaml | 2 +- src/test/resources/glue/SimpleGlue.yaml | 2 +- .../glue/SimpleGlueWithLabeledResource.yaml | 2 +- .../glue/TemplateForConcurrency.yaml | 2 +- src/test/resources/glue/Templating.yaml | 2 +- .../glue/TwoResourcesAndCondition.yaml | 2 +- .../resources/glueoperator/Concurrency.yaml | 4 +- .../resources/glueoperator/Concurrency2.yaml | 4 +- .../resources/glueoperator/NonUniqueName.yaml | 4 +- .../glueoperator/ParentLabelSelector.yaml | 4 +- .../glueoperator/SimpleGlueOperator.yaml | 4 +- .../sample/mutation/mutation.glue.yaml | 4 +- .../secretcopy/secret-copy.operator.yaml | 2 +- .../sample/webpage/webpage.operator.yaml | 2 +- 85 files changed, 266 insertions(+), 261 deletions(-) delete mode 100644 src/main/java/io/csviri/operator/glue/customresource/glue/GlueStatus.java delete mode 100644 src/main/java/io/csviri/operator/glue/customresource/operator/ResourceFlowOperatorStatus.java rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/ControllerConfig.java (85%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/GlueException.java (92%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/Main.java (88%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/Utils.java (92%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/conditions/JavaScripCondition.java (93%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/conditions/ReadyCondition.java (87%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/customresource/AbstractStatus.java (85%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/customresource/glue/DependentResourceSpec.java (95%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/customresource/glue/Glue.java (79%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/customresource/glue/GlueSpec.java (95%) create mode 100644 src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/GlueStatus.java rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/customresource/glue/RelatedResourceSpec.java (97%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/customresource/glue/condition/ConditionSpec.java (84%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/customresource/glue/condition/JavaScriptConditionSpec.java (77%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/customresource/glue/condition/ReadyConditionSpec.java (79%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/customresource/operator/GlueMetadata.java (91%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/customresource/operator/GlueOperator.java (80%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/customresource/operator/GlueOperatorSpec.java (87%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/customresource/operator/Parent.java (95%) create mode 100644 src/main/java/io/javaoperatorsdk/operator/glue/customresource/operator/ResourceFlowOperatorStatus.java rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/dependent/GCGenericDependentResource.java (79%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/dependent/GenericDependentResource.java (90%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/dependent/GenericResourceDiscriminator.java (93%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/reconciler/ValidationAndErrorHandler.java (84%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/reconciler/glue/GlueReconciler.java (87%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/reconciler/glue/InformerProducer.java (86%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/reconciler/glue/InformerRegister.java (95%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/reconciler/glue/RelatedAndOwnedResourceSecondaryToPrimaryMapper.java (96%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/reconciler/operator/GlueOperatorReconciler.java (91%) rename src/main/java/io/{csviri => javaoperatorsdk}/operator/glue/templating/GenericTemplateHandler.java (91%) rename src/test/java/io/{csviri => javaoperatorsdk}/operator/glue/GlueLabelSelectorTest.java (76%) rename src/test/java/io/{csviri => javaoperatorsdk}/operator/glue/GlueOperatorComplexLabelSelectorTest.java (81%) rename src/test/java/io/{csviri => javaoperatorsdk}/operator/glue/GlueOperatorLabelSelectorTest.java (75%) rename src/test/java/io/{csviri => javaoperatorsdk}/operator/glue/GlueOperatorTest.java (89%) rename src/test/java/io/{csviri => javaoperatorsdk}/operator/glue/GlueRelatedResourcesTest.java (95%) rename src/test/java/io/{csviri => javaoperatorsdk}/operator/glue/GlueResourceLabelSelectorTest.java (97%) rename src/test/java/io/{csviri => javaoperatorsdk}/operator/glue/GlueTest.java (96%) rename src/test/java/io/{csviri => javaoperatorsdk}/operator/glue/JavaScripConditionTest.java (84%) rename src/test/java/io/{csviri => javaoperatorsdk}/operator/glue/TestBase.java (98%) rename src/test/java/io/{csviri => javaoperatorsdk}/operator/glue/TestData.java (79%) rename src/test/java/io/{csviri => javaoperatorsdk}/operator/glue/TestUtils.java (96%) rename src/test/java/io/{csviri => javaoperatorsdk}/operator/glue/customresource/ClusterScopeTestCustomResource.java (87%) rename src/test/java/io/{csviri => javaoperatorsdk}/operator/glue/customresource/TestCustomResource.java (77%) rename src/test/java/io/{csviri => javaoperatorsdk}/operator/glue/customresource/TestCustomResource2.java (88%) rename src/test/java/io/{csviri => javaoperatorsdk}/operator/glue/customresource/TestCustomResourceSpec.java (89%) rename src/test/java/io/{csviri => javaoperatorsdk}/operator/glue/reconciler/glue/InformerRegisterTest.java (87%) rename src/test/java/io/{csviri => javaoperatorsdk}/operator/glue/sample/mutation/MutationWebhookDeploymentE2E.java (88%) rename src/test/java/io/{csviri => javaoperatorsdk}/operator/glue/sample/webpage/WebPage.java (90%) rename src/test/java/io/{csviri => javaoperatorsdk}/operator/glue/sample/webpage/WebPageE2E.java (89%) rename src/test/java/io/{csviri => javaoperatorsdk}/operator/glue/sample/webpage/WebPageSampleTest.java (93%) rename src/test/java/io/{csviri => javaoperatorsdk}/operator/glue/sample/webpage/WebPageSpec.java (90%) rename src/test/java/io/{csviri => javaoperatorsdk}/operator/glue/sample/webpage/WebPageStatus.java (87%) diff --git a/README.md b/README.md index c7a1b44..402e3fb 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Either in the discussion section here on GitHub or at [Kubernetes Slack Operator The project introduces two Kubernetes custom resources `Glue` and `GlueOperator`. You can use `GlueOperator` to define your own operator. Let's take a look at an example, where we define an operator for WebPage custom resource, that represents a static website served from the Cluster. (You can see the -[full example here](https://github.com/csviri/kubernetes-glue-operator/blob/main/src/test/resources/sample/webpage)) +[full example here](https://github.com/java-operator-sdk/kubernetes-glue-operator/blob/main/src/test/resources/sample/webpage)) ```yaml @@ -48,12 +48,12 @@ spec: ``` To create an operator (or more precisely the controller part) with `kubernetes-glue-operator` we have first apply -the [CRD for WebPage](https://github.com/csviri/kubernetes-glue-operator/blob/main/src/test/resources/sample/webpage/webpage.crd.yml). +the [CRD for WebPage](https://github.com/java-operator-sdk/kubernetes-glue-operator/blob/main/src/test/resources/sample/webpage/webpage.crd.yml). To define how the `WebPage` should be reconciled, thus what resources should be created for a `WebPage`, we prepare a `GlueOperator`: ```yaml -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: GlueOperator metadata: name: webpage-operator @@ -128,11 +128,11 @@ resources are applied, however, there are certain cases when this is needed also The following example shows how to deploy a [dynamic admission controller](https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/) that mutates all the `Pods`, adding annotation on them. Note that this is a tricky situation since the endpoint for the `MutatingWebhookConfiguration` is also a `Pod`, thus 'Pods' should be first up and running before the configuration is applied, otherwise, the mutation webhook will block the changes on the pods, which would render the cluster unable to manage `Pods'. -(Irrelevant details are omitted, see the full version [here](https://github.com/csviri/kubernetes-glue-operator/blob/main/src/test/resources/sample/mutation/mutation.glue.yaml), -see the full E2E test [here](https://github.com/csviri/kubernetes-glue-operator/blob/main/src/test/java/io/csviri/operator/glue/sample/mutation/MutationWebhookDeploymentE2E.java)) +(Irrelevant details are omitted, see the full version [here](https://github.com/java-operator-sdk/kubernetes-glue-operator/blob/main/src/test/resources/sample/mutation/mutation.glue.yaml), +see the full E2E test [here](https://github.com/java-operator-sdk/kubernetes-glue-operator/blob/main/src/test/java/io/java-operator-sdk/operator/glue/sample/mutation/MutationWebhookDeploymentE2E.java)) ```yaml -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: Glue metadata: name: mutation-webhook-deployment @@ -161,7 +161,7 @@ spec: template: spec: containers: - image: ghcr.io/csviri/sample-pod-mutating-webhook:0.1.0 + image: ghcr.io/javaoperatorsdk/sample-pod-mutating-webhook:0.1.0 name: pod-mutating-hook ports: - containerPort: 443 diff --git a/docs/comparison.md b/docs/comparison.md index aca675f..5ea21cd 100644 --- a/docs/comparison.md +++ b/docs/comparison.md @@ -37,7 +37,7 @@ As mentioned before there are solutions that are comparable to ours, and all of In summary *metacontroller* is a bit more generic solution this moment, but with additional complexity to manage, and much harder to start with. - The main practical difference is in supporting ["bulk resources"](https://github.com/csviri/kubernetes-glue-operator/issues/75) + The main practical difference is in supporting ["bulk resources"](https://github.com/java-operator-sdk/kubernetes-glue-operator/issues/75) we will also support it in future versions. - [Helm Operators](https://sdk.operatorframework.io/docs/building-operators/helm/tutorial/) - are a very efficient diff --git a/docs/getting-started.md b/docs/getting-started.md index 93f66e7..48446fe 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -9,35 +9,35 @@ Start a local Kubernetes cluster using for example [Minikube](https://minikube.s Apply the CustomResourceDefinitions: ```bash -kubectl apply -f https://github.com/csviri/kubernetes-glue-operator/releases/latest/download/glues.io.csviri.operator.glue-v1.yml -f https://github.com/csviri/kubernetes-glue-operator/releases/latest/download/glueoperators.io.csviri.operator.glue-v1.yml +kubectl apply -f https://github.com/java-operator-sdk/kubernetes-glue-operator/releases/latest/download/glues.io.java-operator-sdk.operator.glue-v1.yml -f https://github.com/java-operator-sdk/kubernetes-glue-operator/releases/latest/download/glueoperators.io.java-operator-sdk.operator.glue-v1.yml ``` Deploy the `kubernetes-glue-operator`: ```bash -kubectl apply -f https://github.com/csviri/kubernetes-glue-operator/releases/latest/download/kubernetes.yml +kubectl apply -f https://github.com/java-operator-sdk/kubernetes-glue-operator/releases/latest/download/kubernetes.yml ``` Note that this deployment gives the controller access to all the resources on the cluster, this is not what you might want in production. -## Try out the [WebPage Sample](https://github.com/csviri/kubernetes-glue-operator/tree/main/src/test/resources/sample/webpage) +## Try out the [WebPage Sample](https://github.com/java-operator-sdk/kubernetes-glue-operator/tree/main/src/test/resources/sample/webpage) First apply the CustomResourceDefinition for `WebPage` : ```bash -kubectl apply -f https://raw.githubusercontent.com/csviri/kubernetes-glue-operator/main/src/test/resources/sample/webpage/webpage.crd.yaml +kubectl apply -f https://raw.githubusercontent.com/java-operator-sdk/kubernetes-glue-operator/main/src/test/resources/sample/webpage/webpage.crd.yaml ``` Apply the `GlueOperator` for `WebPage`: ```bash -kubectl apply -f https://raw.githubusercontent.com/csviri/kubernetes-glue-operator/main/src/test/resources/sample/webpage/webpage.operator.yaml +kubectl apply -f https://raw.githubusercontent.com/java-operator-sdk/kubernetes-glue-operator/main/src/test/resources/sample/webpage/webpage.operator.yaml ``` Create a new static `WebPage`: ```bash -kubectl apply -f https://raw.githubusercontent.com/csviri/kubernetes-glue-operator/main/src/test/resources/sample/webpage/webpage.sample.yaml +kubectl apply -f https://raw.githubusercontent.com/java-operator-sdk/kubernetes-glue-operator/main/src/test/resources/sample/webpage/webpage.sample.yaml ``` All done! Check the resources created, if using minikube you can open the served WebPage with `minikube service webpage1`. diff --git a/docs/reference.md b/docs/reference.md index 38fa9b9..3f158f2 100644 --- a/docs/reference.md +++ b/docs/reference.md @@ -6,7 +6,7 @@ of [Java Operator SDK](https://github.com/operator-framework/java-operator-sdk) Although it is limited only to Kubernetes resources it makes it very easy to use in language-independent (DependentResources in JOSDK are also covering external resources) way. -## [Glue resource](https://github.com/csviri/kubernetes-glue-operator/releases/latest/download/glues.glue-v1.yml) +## [Glue resource](https://github.com/java-operator-sdk/kubernetes-glue-operator/releases/latest/download/glues.glue-v1.yml) `Glue` is the heart of the operator. Note that `GlueOperator` controller just creates a new `Glue` with a related resource, for each parent custom resource. `Glue` defines `childResources` (sometimes referred to as managed resources) and `related resources`: @@ -40,16 +40,16 @@ It has several attributes: At the moment there are two types of built-in conditions provided: -- **`ReadyCondition`** - check if a resource is up and running. Use it only as a `readyPostCondition`. See sample usage [here](https://github.com/csviri/kubernetes-glue-operator/blob/main/src/test/resources/sample/mutation/mutation.glue.yaml#L24-L25). +- **`ReadyCondition`** - check if a resource is up and running. Use it only as a `readyPostCondition`. See sample usage [here](https://github.com/java-operator-sdk/kubernetes-glue-operator/blob/main/src/test/resources/sample/mutation/mutation.glue.yaml#L24-L25). - **`JSCondition`** - a generic condition, that allows writing conditions in JavaScript. As input, all the resources are available which are either child or related. The script should return a boolean value. - See accessing the related resource in [WebPage sample](https://github.com/csviri/kubernetes-glue-operator/blob/main/src/test/resources/sample/webpage/webpage.operator.yaml#L62-L64), - and cross-referencing resources [here](https://github.com/csviri/kubernetes-glue-operator/blob/main/src/test/resources/glue/TwoResourcesAndCondition.yaml#L23-L28). + See accessing the related resource in [WebPage sample](https://github.com/java-operator-sdk/kubernetes-glue-operator/blob/main/src/test/resources/sample/webpage/webpage.operator.yaml#L62-L64), + and cross-referencing resources [here](https://github.com/java-operator-sdk/kubernetes-glue-operator/blob/main/src/test/resources/glue/TwoResourcesAndCondition.yaml#L23-L28). ### Related resources Related resources are resources that are not reconciled (not created, updated, or deleted) during reconciliation, but serve as an input for it. -See sample usage within `Glue` [here](https://github.com/csviri/kubernetes-glue-operator/blob/main/src/test/resources/glue/RelatedResourceSimpleWithCondition.yaml) +See sample usage within `Glue` [here](https://github.com/java-operator-sdk/kubernetes-glue-operator/blob/main/src/test/resources/glue/RelatedResourceSimpleWithCondition.yaml) The following attributes can be defined for a related resource: - **`name`** - same as for child resource, unique identifier, used to reference the resource. @@ -63,15 +63,15 @@ The following attributes can be defined for a related resource: Both in `JSCondition` and resource templates other resources can be referenced by the name. If there are more `resourceNames` specified for a related resource, the resource is referenced in a form -`[related resource name]#[resource name]`. See sample [here](https://github.com/csviri/kubernetes-glue-operator/blob/main/src/test/resources/glue/MultiNameRelatedResource.yaml). +`[related resource name]#[resource name]`. See sample [here](https://github.com/java-operator-sdk/kubernetes-glue-operator/blob/main/src/test/resources/glue/MultiNameRelatedResource.yaml). When a resource `B` references another resource `A`, resource `A` will be guaranteed to be in the cache - especially for initial reconciliation when the resource is created - only if `B` depends on `A` on it. This is natural, in other words, after reconciliation up-to-date version of the resource is guaranteed to be in the cache after reconciliation. -See sample resource cross-referencing [here](https://github.com/csviri/kubernetes-glue-operator/blob/main/src/test/resources/glue/CrossReferenceResource.yaml). +See sample resource cross-referencing [here](https://github.com/java-operator-sdk/kubernetes-glue-operator/blob/main/src/test/resources/glue/CrossReferenceResource.yaml). -The metadata of `Glue` can be referenced under `glueMetadata`, see sample [here](https://github.com/csviri/kubernetes-glue-operator/blob/main/src/test/resources/glue/TemplateForConcurrency.yaml#L12-L12) +The metadata of `Glue` can be referenced under `glueMetadata`, see sample [here](https://github.com/java-operator-sdk/kubernetes-glue-operator/blob/main/src/test/resources/glue/TemplateForConcurrency.yaml#L12-L12) -In addition to that in `GlueOperator` the **`parent`** attribute can be used to reference the parent resource on which behalf the resources are created. See sample [here](https://github.com/csviri/kubernetes-glue-operator/blob/main/src/test/resources/glueoperator/Templating.yaml). +In addition to that in `GlueOperator` the **`parent`** attribute can be used to reference the parent resource on which behalf the resources are created. See sample [here](https://github.com/java-operator-sdk/kubernetes-glue-operator/blob/main/src/test/resources/glueoperator/Templating.yaml). ### Reconciliation notes @@ -82,7 +82,7 @@ for a resource that depends on it. The `DependentResource` implementation of JOSDK makes all kinds of optimizations on the reconciliation which are utilized (or will be also here). -## [GlueOperator resource](https://github.com/csviri/kubernetes-glue-operator/releases/latest/download/glueoperators.glue-v1.yml) +## [GlueOperator resource](https://github.com/java-operator-sdk/kubernetes-glue-operator/releases/latest/download/glueoperators.glue-v1.yml) The specs of `GlueOperator` are almost identical to `Glue`, it just adds some additional attributes: @@ -94,9 +94,9 @@ The specs of `GlueOperator` are almost identical to `Glue`, it just adds some ad - **`glueMetadata`** - optionally, you can customize the `Glue` resource created for each parent resource. This is especially important when the parent is a cluster scoped resource - in that case it is mandatory to set. Using this you can specify the **`name`** and **`namespace`** of the created `Glue`. - See usage on the sample [secret-copy-operator](https://github.com/csviri/kubernetes-glue-operator/blob/main/src/test/resources/sample/secretcopy/secret-copy.operator.yaml#L10-L12). + See usage on the sample [secret-copy-operator](https://github.com/java-operator-sdk/kubernetes-glue-operator/blob/main/src/test/resources/sample/secretcopy/secret-copy.operator.yaml#L10-L12). -See minimal `GlueOperator` [here](https://github.com/csviri/kubernetes-glue-operator/blob/main/src/test/resources/glueoperator/SimpleGlueOperator.yaml). +See minimal `GlueOperator` [here](https://github.com/java-operator-sdk/kubernetes-glue-operator/blob/main/src/test/resources/glueoperator/SimpleGlueOperator.yaml). ## Deployment @@ -105,7 +105,7 @@ the default [configuration options](https://docs.quarkiverse.io/quarkus-operator defined by QOSDK can be overridden using environment variables. With every release, there are Kubernetes resources provided to make an initial deployment very simple. -See `kubernetes.yml` in [release assets](https://github.com/csviri/kubernetes-glue-operator/releases). +See `kubernetes.yml` in [release assets](https://github.com/java-operator-sdk/kubernetes-glue-operator/releases). While we will provide more options, users are encouraged to enhance/adjust this for their purposes. Since the project is a meta-controller, it needs to have access rights to all the resources it manages. @@ -144,7 +144,7 @@ custom resource tracked, so if there is a label selector defined for `Glue` it n to the `Glue` resource when it is created. Since it is not trivial to parse label selectors, in more complex forms of label selectors (other the ones mentioned above), the labels to add to the `Glue` resources by a `GlueOperator` needs to be specified explicitly using -[`glue.operator.glue-operator-managed-glue-label`](https://github.com/csviri/kubernetes-glue-operator/blob/main/src/main/java/io/csviri/operator/glue/ControllerConfig.java#L10-L10) +[`glue.operator.glue-operator-managed-glue-label`](https://github.com/java-operator-sdk/kubernetes-glue-operator/blob/main/src/main/java/io/java-operator-sdk/operator/glue/ControllerConfig.java#L10-L10) config key (which is a type of map). Therefore, for a label selector that specified two values for a glue: `quarkus.operator-sdk.controllers.glue.selector=mylabel1=value1,mylabel2=value2` @@ -156,7 +156,7 @@ you need to add the following configuration params: `glue.operator.glue-operator-managed-glue-label.mylabel2=value2` This will ensure that the labels are added correctly to the `Glue`. See the related -[integration test](https://github.com/csviri/kubernetes-glue-operator/blob/main/src/test/java/io/csviri/operator/glue/GlueOperatorComplexLabelSelectorTest.java#L23-L23). +[integration test](https://github.com/java-operator-sdk/kubernetes-glue-operator/blob/main/src/test/java/io/java-operator-sdk/operator/glue/GlueOperatorComplexLabelSelectorTest.java#L23-L23). ### Label selectors managed resources @@ -185,12 +185,12 @@ be continuously improved in the follow-up releases. ## Samples -1. [WebPage](https://github.com/csviri/kubernetes-glue-operator/tree/main/src/test/resources/sample/webpage) `GlueOperator`, serves a static website from the cluster. +1. [WebPage](https://github.com/java-operator-sdk/kubernetes-glue-operator/tree/main/src/test/resources/sample/webpage) `GlueOperator`, serves a static website from the cluster. To achieve this, it creates three resources a `Deployment` running Nginx, a `ConfigMap` that contains the HTML file an mounted to nginx, a `Service` and an optional `Ingress` to expose the static web page. -3. [Muatation Hook Deployment](https://github.com/csviri/kubernetes-glue-operator/tree/main/src/test/resources/sample/mutation), described on the project home page. -4. [Additional `Glue` samples](https://github.com/csviri/kubernetes-glue-operator/tree/main/src/test/resources/glue), note that these are used for integration testing. -5. [Additional `GlueOperator` samples](https://github.com/csviri/kubernetes-glue-operator/tree/main/src/test/resources/glueoperator), also used for integration testing. +3. [Muatation Hook Deployment](https://github.com/java-operator-sdk/kubernetes-glue-operator/tree/main/src/test/resources/sample/mutation), described on the project home page. +4. [Additional `Glue` samples](https://github.com/java-operator-sdk/kubernetes-glue-operator/tree/main/src/test/resources/glue), note that these are used for integration testing. +5. [Additional `GlueOperator` samples](https://github.com/java-operator-sdk/kubernetes-glue-operator/tree/main/src/test/resources/glueoperator), also used for integration testing. ## Related documents diff --git a/pom.xml b/pom.xml index cc66bef..6efee69 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - io.csviri.operator.glue + io.javaoperatorsdk.operator.glue kubernetes-glue-operator 0.4.2-SNAPSHOT jar diff --git a/src/main/java/io/csviri/operator/glue/customresource/glue/GlueStatus.java b/src/main/java/io/csviri/operator/glue/customresource/glue/GlueStatus.java deleted file mode 100644 index 3bd28fa..0000000 --- a/src/main/java/io/csviri/operator/glue/customresource/glue/GlueStatus.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.csviri.operator.glue.customresource.glue; - -import io.csviri.operator.glue.customresource.AbstractStatus; - -public class GlueStatus extends AbstractStatus { - -} diff --git a/src/main/java/io/csviri/operator/glue/customresource/operator/ResourceFlowOperatorStatus.java b/src/main/java/io/csviri/operator/glue/customresource/operator/ResourceFlowOperatorStatus.java deleted file mode 100644 index 6a32439..0000000 --- a/src/main/java/io/csviri/operator/glue/customresource/operator/ResourceFlowOperatorStatus.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.csviri.operator.glue.customresource.operator; - -import io.csviri.operator.glue.customresource.AbstractStatus; - -public class ResourceFlowOperatorStatus extends AbstractStatus { - - -} diff --git a/src/main/java/io/csviri/operator/glue/ControllerConfig.java b/src/main/java/io/javaoperatorsdk/operator/glue/ControllerConfig.java similarity index 85% rename from src/main/java/io/csviri/operator/glue/ControllerConfig.java rename to src/main/java/io/javaoperatorsdk/operator/glue/ControllerConfig.java index 998212f..3b24726 100644 --- a/src/main/java/io/csviri/operator/glue/ControllerConfig.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/ControllerConfig.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue; +package io.javaoperatorsdk.operator.glue; import java.util.Map; diff --git a/src/main/java/io/csviri/operator/glue/GlueException.java b/src/main/java/io/javaoperatorsdk/operator/glue/GlueException.java similarity index 92% rename from src/main/java/io/csviri/operator/glue/GlueException.java rename to src/main/java/io/javaoperatorsdk/operator/glue/GlueException.java index 02112b8..c2aecd9 100644 --- a/src/main/java/io/csviri/operator/glue/GlueException.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/GlueException.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue; +package io.javaoperatorsdk.operator.glue; public class GlueException extends RuntimeException { diff --git a/src/main/java/io/csviri/operator/glue/Main.java b/src/main/java/io/javaoperatorsdk/operator/glue/Main.java similarity index 88% rename from src/main/java/io/csviri/operator/glue/Main.java rename to src/main/java/io/javaoperatorsdk/operator/glue/Main.java index 2bda5e7..1e86e41 100644 --- a/src/main/java/io/csviri/operator/glue/Main.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/Main.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue; +package io.javaoperatorsdk.operator.glue; import io.quarkus.runtime.Quarkus; import io.quarkus.runtime.annotations.QuarkusMain; diff --git a/src/main/java/io/csviri/operator/glue/Utils.java b/src/main/java/io/javaoperatorsdk/operator/glue/Utils.java similarity index 92% rename from src/main/java/io/csviri/operator/glue/Utils.java rename to src/main/java/io/javaoperatorsdk/operator/glue/Utils.java index 23f38f6..7149143 100644 --- a/src/main/java/io/csviri/operator/glue/Utils.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/Utils.java @@ -1,22 +1,21 @@ -package io.csviri.operator.glue; +package io.javaoperatorsdk.operator.glue; import java.util.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.csviri.operator.glue.customresource.glue.DependentResourceSpec; -import io.csviri.operator.glue.customresource.glue.Glue; -import io.csviri.operator.glue.customresource.glue.RelatedResourceSpec; import io.fabric8.kubernetes.api.model.GenericKubernetesResource; import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; import io.javaoperatorsdk.operator.api.reconciler.Context; +import io.javaoperatorsdk.operator.glue.customresource.glue.DependentResourceSpec; +import io.javaoperatorsdk.operator.glue.customresource.glue.Glue; +import io.javaoperatorsdk.operator.glue.customresource.glue.RelatedResourceSpec; +import io.javaoperatorsdk.operator.glue.reconciler.glue.GlueReconciler; import io.javaoperatorsdk.operator.processing.GroupVersionKind; import io.javaoperatorsdk.operator.processing.event.ResourceID; import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource; -import static io.csviri.operator.glue.reconciler.glue.GlueReconciler.DEPENDENT_NAME_ANNOTATION_KEY; - public class Utils { private static final Logger log = LoggerFactory.getLogger(Utils.class); @@ -36,7 +35,8 @@ public static Map getActualResourcesByNameInW // therefore "Utils.getName(relatedResourceSpec).equals(sr.getMetadata().getName())" would not // work r.getName() - .equals(sr.getMetadata().getAnnotations().get(DEPENDENT_NAME_ANNOTATION_KEY))) + .equals( + sr.getMetadata().getAnnotations().get(GlueReconciler.DEPENDENT_NAME_ANNOTATION_KEY))) .findFirst(); dependentSpec.ifPresent(spec -> res.put(spec.getName(), sr)); }); diff --git a/src/main/java/io/csviri/operator/glue/conditions/JavaScripCondition.java b/src/main/java/io/javaoperatorsdk/operator/glue/conditions/JavaScripCondition.java similarity index 93% rename from src/main/java/io/csviri/operator/glue/conditions/JavaScripCondition.java rename to src/main/java/io/javaoperatorsdk/operator/glue/conditions/JavaScripCondition.java index 1e06fb2..60c8ce4 100644 --- a/src/main/java/io/csviri/operator/glue/conditions/JavaScripCondition.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/conditions/JavaScripCondition.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue.conditions; +package io.javaoperatorsdk.operator.glue.conditions; import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; @@ -10,13 +10,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.csviri.operator.glue.GlueException; -import io.csviri.operator.glue.Utils; -import io.csviri.operator.glue.customresource.glue.Glue; import io.fabric8.kubernetes.api.model.GenericKubernetesResource; import io.fabric8.kubernetes.client.utils.Serialization; import io.javaoperatorsdk.operator.api.reconciler.Context; import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource; +import io.javaoperatorsdk.operator.glue.GlueException; +import io.javaoperatorsdk.operator.glue.Utils; +import io.javaoperatorsdk.operator.glue.customresource.glue.Glue; import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition; public class JavaScripCondition implements Condition { diff --git a/src/main/java/io/csviri/operator/glue/conditions/ReadyCondition.java b/src/main/java/io/javaoperatorsdk/operator/glue/conditions/ReadyCondition.java similarity index 87% rename from src/main/java/io/csviri/operator/glue/conditions/ReadyCondition.java rename to src/main/java/io/javaoperatorsdk/operator/glue/conditions/ReadyCondition.java index 19f67a3..7cd44e9 100644 --- a/src/main/java/io/csviri/operator/glue/conditions/ReadyCondition.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/conditions/ReadyCondition.java @@ -1,10 +1,10 @@ -package io.csviri.operator.glue.conditions; +package io.javaoperatorsdk.operator.glue.conditions; -import io.csviri.operator.glue.customresource.glue.Glue; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.client.readiness.Readiness; import io.javaoperatorsdk.operator.api.reconciler.Context; import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource; +import io.javaoperatorsdk.operator.glue.customresource.glue.Glue; import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition; public class ReadyCondition implements Condition { diff --git a/src/main/java/io/csviri/operator/glue/customresource/AbstractStatus.java b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/AbstractStatus.java similarity index 85% rename from src/main/java/io/csviri/operator/glue/customresource/AbstractStatus.java rename to src/main/java/io/javaoperatorsdk/operator/glue/customresource/AbstractStatus.java index 4c604ed..5744ef4 100644 --- a/src/main/java/io/csviri/operator/glue/customresource/AbstractStatus.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/AbstractStatus.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue.customresource; +package io.javaoperatorsdk.operator.glue.customresource; import io.javaoperatorsdk.operator.api.ObservedGenerationAwareStatus; diff --git a/src/main/java/io/csviri/operator/glue/customresource/glue/DependentResourceSpec.java b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/DependentResourceSpec.java similarity index 95% rename from src/main/java/io/csviri/operator/glue/customresource/glue/DependentResourceSpec.java rename to src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/DependentResourceSpec.java index 8d230a5..3166d97 100644 --- a/src/main/java/io/csviri/operator/glue/customresource/glue/DependentResourceSpec.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/DependentResourceSpec.java @@ -1,13 +1,13 @@ -package io.csviri.operator.glue.customresource.glue; +package io.javaoperatorsdk.operator.glue.customresource.glue; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import io.csviri.operator.glue.customresource.glue.condition.ConditionSpec; import io.fabric8.crd.generator.annotation.PreserveUnknownFields; import io.fabric8.generator.annotation.Required; import io.fabric8.kubernetes.api.model.GenericKubernetesResource; +import io.javaoperatorsdk.operator.glue.customresource.glue.condition.ConditionSpec; public class DependentResourceSpec { diff --git a/src/main/java/io/csviri/operator/glue/customresource/glue/Glue.java b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/Glue.java similarity index 79% rename from src/main/java/io/csviri/operator/glue/customresource/glue/Glue.java rename to src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/Glue.java index 96dac0d..810da83 100644 --- a/src/main/java/io/csviri/operator/glue/customresource/glue/Glue.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/Glue.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue.customresource.glue; +package io.javaoperatorsdk.operator.glue.customresource.glue; import io.fabric8.kubernetes.api.model.Namespaced; import io.fabric8.kubernetes.client.CustomResource; @@ -6,7 +6,7 @@ import io.fabric8.kubernetes.model.annotation.ShortNames; import io.fabric8.kubernetes.model.annotation.Version; -@Group("io.csviri.operator.glue") +@Group("io.javaoperatorsdk.operator.glue") @Version("v1beta1") @ShortNames("g") public class Glue extends CustomResource diff --git a/src/main/java/io/csviri/operator/glue/customresource/glue/GlueSpec.java b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/GlueSpec.java similarity index 95% rename from src/main/java/io/csviri/operator/glue/customresource/glue/GlueSpec.java rename to src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/GlueSpec.java index 9fb2bc2..ff9c19d 100644 --- a/src/main/java/io/csviri/operator/glue/customresource/glue/GlueSpec.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/GlueSpec.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue.customresource.glue; +package io.javaoperatorsdk.operator.glue.customresource.glue; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/GlueStatus.java b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/GlueStatus.java new file mode 100644 index 0000000..e16ef84 --- /dev/null +++ b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/GlueStatus.java @@ -0,0 +1,7 @@ +package io.javaoperatorsdk.operator.glue.customresource.glue; + +import io.javaoperatorsdk.operator.glue.customresource.AbstractStatus; + +public class GlueStatus extends AbstractStatus { + +} diff --git a/src/main/java/io/csviri/operator/glue/customresource/glue/RelatedResourceSpec.java b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/RelatedResourceSpec.java similarity index 97% rename from src/main/java/io/csviri/operator/glue/customresource/glue/RelatedResourceSpec.java rename to src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/RelatedResourceSpec.java index d740689..8b04101 100644 --- a/src/main/java/io/csviri/operator/glue/customresource/glue/RelatedResourceSpec.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/RelatedResourceSpec.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue.customresource.glue; +package io.javaoperatorsdk.operator.glue.customresource.glue; import java.util.List; import java.util.Objects; diff --git a/src/main/java/io/csviri/operator/glue/customresource/glue/condition/ConditionSpec.java b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/condition/ConditionSpec.java similarity index 84% rename from src/main/java/io/csviri/operator/glue/customresource/glue/condition/ConditionSpec.java rename to src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/condition/ConditionSpec.java index 72f216b..0c4b1bd 100644 --- a/src/main/java/io/csviri/operator/glue/customresource/glue/condition/ConditionSpec.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/condition/ConditionSpec.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue.customresource.glue.condition; +package io.javaoperatorsdk.operator.glue.customresource.glue.condition; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/src/main/java/io/csviri/operator/glue/customresource/glue/condition/JavaScriptConditionSpec.java b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/condition/JavaScriptConditionSpec.java similarity index 77% rename from src/main/java/io/csviri/operator/glue/customresource/glue/condition/JavaScriptConditionSpec.java rename to src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/condition/JavaScriptConditionSpec.java index f767297..c7b3e1b 100644 --- a/src/main/java/io/csviri/operator/glue/customresource/glue/condition/JavaScriptConditionSpec.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/condition/JavaScriptConditionSpec.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue.customresource.glue.condition; +package io.javaoperatorsdk.operator.glue.customresource.glue.condition; public class JavaScriptConditionSpec extends ConditionSpec { diff --git a/src/main/java/io/csviri/operator/glue/customresource/glue/condition/ReadyConditionSpec.java b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/condition/ReadyConditionSpec.java similarity index 79% rename from src/main/java/io/csviri/operator/glue/customresource/glue/condition/ReadyConditionSpec.java rename to src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/condition/ReadyConditionSpec.java index dce709a..c69475f 100644 --- a/src/main/java/io/csviri/operator/glue/customresource/glue/condition/ReadyConditionSpec.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/glue/condition/ReadyConditionSpec.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue.customresource.glue.condition; +package io.javaoperatorsdk.operator.glue.customresource.glue.condition; public class ReadyConditionSpec extends ConditionSpec { diff --git a/src/main/java/io/csviri/operator/glue/customresource/operator/GlueMetadata.java b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/operator/GlueMetadata.java similarity index 91% rename from src/main/java/io/csviri/operator/glue/customresource/operator/GlueMetadata.java rename to src/main/java/io/javaoperatorsdk/operator/glue/customresource/operator/GlueMetadata.java index 011565c..842441a 100644 --- a/src/main/java/io/csviri/operator/glue/customresource/operator/GlueMetadata.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/operator/GlueMetadata.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue.customresource.operator; +package io.javaoperatorsdk.operator.glue.customresource.operator; import java.util.Objects; diff --git a/src/main/java/io/csviri/operator/glue/customresource/operator/GlueOperator.java b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/operator/GlueOperator.java similarity index 80% rename from src/main/java/io/csviri/operator/glue/customresource/operator/GlueOperator.java rename to src/main/java/io/javaoperatorsdk/operator/glue/customresource/operator/GlueOperator.java index 688f90a..c8dd269 100644 --- a/src/main/java/io/csviri/operator/glue/customresource/operator/GlueOperator.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/operator/GlueOperator.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue.customresource.operator; +package io.javaoperatorsdk.operator.glue.customresource.operator; import io.fabric8.kubernetes.api.model.Namespaced; import io.fabric8.kubernetes.client.CustomResource; @@ -6,7 +6,7 @@ import io.fabric8.kubernetes.model.annotation.ShortNames; import io.fabric8.kubernetes.model.annotation.Version; -@Group("io.csviri.operator.glue") +@Group("io.javaoperatorsdk.operator.glue") @Version("v1beta1") @ShortNames("go") public class GlueOperator diff --git a/src/main/java/io/csviri/operator/glue/customresource/operator/GlueOperatorSpec.java b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/operator/GlueOperatorSpec.java similarity index 87% rename from src/main/java/io/csviri/operator/glue/customresource/operator/GlueOperatorSpec.java rename to src/main/java/io/javaoperatorsdk/operator/glue/customresource/operator/GlueOperatorSpec.java index f485e63..3fd4e06 100644 --- a/src/main/java/io/csviri/operator/glue/customresource/operator/GlueOperatorSpec.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/operator/GlueOperatorSpec.java @@ -1,9 +1,9 @@ -package io.csviri.operator.glue.customresource.operator; +package io.javaoperatorsdk.operator.glue.customresource.operator; import java.util.Objects; -import io.csviri.operator.glue.customresource.glue.GlueSpec; import io.fabric8.generator.annotation.Required; +import io.javaoperatorsdk.operator.glue.customresource.glue.GlueSpec; public class GlueOperatorSpec extends GlueSpec { diff --git a/src/main/java/io/csviri/operator/glue/customresource/operator/Parent.java b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/operator/Parent.java similarity index 95% rename from src/main/java/io/csviri/operator/glue/customresource/operator/Parent.java rename to src/main/java/io/javaoperatorsdk/operator/glue/customresource/operator/Parent.java index 54fa936..b8c110a 100644 --- a/src/main/java/io/csviri/operator/glue/customresource/operator/Parent.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/operator/Parent.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue.customresource.operator; +package io.javaoperatorsdk.operator.glue.customresource.operator; import java.util.Objects; diff --git a/src/main/java/io/javaoperatorsdk/operator/glue/customresource/operator/ResourceFlowOperatorStatus.java b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/operator/ResourceFlowOperatorStatus.java new file mode 100644 index 0000000..5ad0174 --- /dev/null +++ b/src/main/java/io/javaoperatorsdk/operator/glue/customresource/operator/ResourceFlowOperatorStatus.java @@ -0,0 +1,8 @@ +package io.javaoperatorsdk.operator.glue.customresource.operator; + +import io.javaoperatorsdk.operator.glue.customresource.AbstractStatus; + +public class ResourceFlowOperatorStatus extends AbstractStatus { + + +} diff --git a/src/main/java/io/csviri/operator/glue/dependent/GCGenericDependentResource.java b/src/main/java/io/javaoperatorsdk/operator/glue/dependent/GCGenericDependentResource.java similarity index 79% rename from src/main/java/io/csviri/operator/glue/dependent/GCGenericDependentResource.java rename to src/main/java/io/javaoperatorsdk/operator/glue/dependent/GCGenericDependentResource.java index 021f513..e325c64 100644 --- a/src/main/java/io/csviri/operator/glue/dependent/GCGenericDependentResource.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/dependent/GCGenericDependentResource.java @@ -1,9 +1,9 @@ -package io.csviri.operator.glue.dependent; +package io.javaoperatorsdk.operator.glue.dependent; -import io.csviri.operator.glue.customresource.glue.Glue; -import io.csviri.operator.glue.templating.GenericTemplateHandler; import io.fabric8.kubernetes.api.model.GenericKubernetesResource; import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected; +import io.javaoperatorsdk.operator.glue.customresource.glue.Glue; +import io.javaoperatorsdk.operator.glue.templating.GenericTemplateHandler; public class GCGenericDependentResource extends GenericDependentResource implements GarbageCollected { diff --git a/src/main/java/io/csviri/operator/glue/dependent/GenericDependentResource.java b/src/main/java/io/javaoperatorsdk/operator/glue/dependent/GenericDependentResource.java similarity index 90% rename from src/main/java/io/csviri/operator/glue/dependent/GenericDependentResource.java rename to src/main/java/io/javaoperatorsdk/operator/glue/dependent/GenericDependentResource.java index 3f72a94..6ac7d9d 100644 --- a/src/main/java/io/csviri/operator/glue/dependent/GenericDependentResource.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/dependent/GenericDependentResource.java @@ -1,13 +1,13 @@ -package io.csviri.operator.glue.dependent; +package io.javaoperatorsdk.operator.glue.dependent; -import io.csviri.operator.glue.Utils; -import io.csviri.operator.glue.customresource.glue.Glue; -import io.csviri.operator.glue.reconciler.glue.GlueReconciler; -import io.csviri.operator.glue.templating.GenericTemplateHandler; import io.fabric8.kubernetes.api.model.GenericKubernetesResource; import io.fabric8.kubernetes.client.utils.Serialization; import io.javaoperatorsdk.operator.api.reconciler.Context; import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter; +import io.javaoperatorsdk.operator.glue.Utils; +import io.javaoperatorsdk.operator.glue.customresource.glue.Glue; +import io.javaoperatorsdk.operator.glue.reconciler.glue.GlueReconciler; +import io.javaoperatorsdk.operator.glue.templating.GenericTemplateHandler; import io.javaoperatorsdk.operator.processing.GroupVersionKind; import io.javaoperatorsdk.operator.processing.dependent.Creator; import io.javaoperatorsdk.operator.processing.dependent.Updater; diff --git a/src/main/java/io/csviri/operator/glue/dependent/GenericResourceDiscriminator.java b/src/main/java/io/javaoperatorsdk/operator/glue/dependent/GenericResourceDiscriminator.java similarity index 93% rename from src/main/java/io/csviri/operator/glue/dependent/GenericResourceDiscriminator.java rename to src/main/java/io/javaoperatorsdk/operator/glue/dependent/GenericResourceDiscriminator.java index 278201f..e351183 100644 --- a/src/main/java/io/csviri/operator/glue/dependent/GenericResourceDiscriminator.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/dependent/GenericResourceDiscriminator.java @@ -1,12 +1,12 @@ -package io.csviri.operator.glue.dependent; +package io.javaoperatorsdk.operator.glue.dependent; import java.util.Objects; import java.util.Optional; -import io.csviri.operator.glue.customresource.glue.Glue; import io.fabric8.kubernetes.api.model.GenericKubernetesResource; import io.javaoperatorsdk.operator.api.reconciler.Context; import io.javaoperatorsdk.operator.api.reconciler.ResourceDiscriminator; +import io.javaoperatorsdk.operator.glue.customresource.glue.Glue; import io.javaoperatorsdk.operator.processing.GroupVersionKind; public class GenericResourceDiscriminator diff --git a/src/main/java/io/csviri/operator/glue/reconciler/ValidationAndErrorHandler.java b/src/main/java/io/javaoperatorsdk/operator/glue/reconciler/ValidationAndErrorHandler.java similarity index 84% rename from src/main/java/io/csviri/operator/glue/reconciler/ValidationAndErrorHandler.java rename to src/main/java/io/javaoperatorsdk/operator/glue/reconciler/ValidationAndErrorHandler.java index 306aafa..87f6749 100644 --- a/src/main/java/io/csviri/operator/glue/reconciler/ValidationAndErrorHandler.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/reconciler/ValidationAndErrorHandler.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue.reconciler; +package io.javaoperatorsdk.operator.glue.reconciler; import java.util.ArrayList; import java.util.HashSet; @@ -9,13 +9,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.csviri.operator.glue.GlueException; -import io.csviri.operator.glue.customresource.AbstractStatus; -import io.csviri.operator.glue.customresource.glue.DependentResourceSpec; -import io.csviri.operator.glue.customresource.glue.GlueSpec; -import io.csviri.operator.glue.customresource.glue.RelatedResourceSpec; import io.fabric8.kubernetes.client.CustomResource; import io.javaoperatorsdk.operator.api.reconciler.ErrorStatusUpdateControl; +import io.javaoperatorsdk.operator.glue.GlueException; +import io.javaoperatorsdk.operator.glue.customresource.AbstractStatus; +import io.javaoperatorsdk.operator.glue.customresource.glue.DependentResourceSpec; +import io.javaoperatorsdk.operator.glue.customresource.glue.GlueSpec; +import io.javaoperatorsdk.operator.glue.customresource.glue.RelatedResourceSpec; import jakarta.inject.Singleton; diff --git a/src/main/java/io/csviri/operator/glue/reconciler/glue/GlueReconciler.java b/src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/GlueReconciler.java similarity index 87% rename from src/main/java/io/csviri/operator/glue/reconciler/glue/GlueReconciler.java rename to src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/GlueReconciler.java index d410a97..3e88d67 100644 --- a/src/main/java/io/csviri/operator/glue/reconciler/glue/GlueReconciler.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/GlueReconciler.java @@ -1,45 +1,47 @@ -package io.csviri.operator.glue.reconciler.glue; +package io.javaoperatorsdk.operator.glue.reconciler.glue; import java.util.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.csviri.operator.glue.Utils; -import io.csviri.operator.glue.conditions.JavaScripCondition; -import io.csviri.operator.glue.conditions.ReadyCondition; -import io.csviri.operator.glue.customresource.glue.DependentResourceSpec; -import io.csviri.operator.glue.customresource.glue.Glue; -import io.csviri.operator.glue.customresource.glue.GlueStatus; -import io.csviri.operator.glue.customresource.glue.condition.ConditionSpec; -import io.csviri.operator.glue.customresource.glue.condition.JavaScriptConditionSpec; -import io.csviri.operator.glue.customresource.glue.condition.ReadyConditionSpec; -import io.csviri.operator.glue.dependent.GCGenericDependentResource; -import io.csviri.operator.glue.dependent.GenericDependentResource; -import io.csviri.operator.glue.dependent.GenericResourceDiscriminator; -import io.csviri.operator.glue.reconciler.ValidationAndErrorHandler; -import io.csviri.operator.glue.reconciler.operator.GlueOperatorReconciler; -import io.csviri.operator.glue.templating.GenericTemplateHandler; import io.fabric8.kubernetes.api.model.GenericKubernetesResource; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.client.dsl.base.PatchContext; import io.fabric8.kubernetes.client.dsl.base.PatchType; import io.javaoperatorsdk.operator.api.reconciler.*; +import io.javaoperatorsdk.operator.glue.Utils; +import io.javaoperatorsdk.operator.glue.conditions.JavaScripCondition; +import io.javaoperatorsdk.operator.glue.conditions.ReadyCondition; +import io.javaoperatorsdk.operator.glue.customresource.glue.DependentResourceSpec; +import io.javaoperatorsdk.operator.glue.customresource.glue.Glue; +import io.javaoperatorsdk.operator.glue.customresource.glue.GlueStatus; +import io.javaoperatorsdk.operator.glue.customresource.glue.condition.ConditionSpec; +import io.javaoperatorsdk.operator.glue.customresource.glue.condition.JavaScriptConditionSpec; +import io.javaoperatorsdk.operator.glue.customresource.glue.condition.ReadyConditionSpec; +import io.javaoperatorsdk.operator.glue.dependent.GCGenericDependentResource; +import io.javaoperatorsdk.operator.glue.dependent.GenericDependentResource; +import io.javaoperatorsdk.operator.glue.dependent.GenericResourceDiscriminator; +import io.javaoperatorsdk.operator.glue.reconciler.ValidationAndErrorHandler; +import io.javaoperatorsdk.operator.glue.reconciler.operator.GlueOperatorReconciler; +import io.javaoperatorsdk.operator.glue.templating.GenericTemplateHandler; import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition; import io.javaoperatorsdk.operator.processing.dependent.workflow.KubernetesResourceDeletedCondition; import io.javaoperatorsdk.operator.processing.dependent.workflow.WorkflowBuilder; -import static io.csviri.operator.glue.Utils.getResourceForSSAFrom; -import static io.csviri.operator.glue.reconciler.operator.GlueOperatorReconciler.FOR_GLUE_OPERATOR_LABEL_VALUE; -import static io.csviri.operator.glue.reconciler.operator.GlueOperatorReconciler.PARENT_RELATED_RESOURCE_NAME; +import static io.javaoperatorsdk.operator.glue.Utils.getResourceForSSAFrom; +import static io.javaoperatorsdk.operator.glue.reconciler.operator.GlueOperatorReconciler.FOR_GLUE_OPERATOR_LABEL_VALUE; +import static io.javaoperatorsdk.operator.glue.reconciler.operator.GlueOperatorReconciler.PARENT_RELATED_RESOURCE_NAME; @ControllerConfiguration(name = GlueReconciler.GLUE_RECONCILER_NAME) public class GlueReconciler implements Reconciler, Cleaner, ErrorStatusHandler { private static final Logger log = LoggerFactory.getLogger(GlueReconciler.class); - public static final String DEPENDENT_NAME_ANNOTATION_KEY = "io.csviri.operator.resourceflow/name"; - public static final String PARENT_GLUE_FINALIZER_PREFIX = "io.csviri.operator.resourceflow.glue/"; + public static final String DEPENDENT_NAME_ANNOTATION_KEY = + "io.javaoperatorsdk.operator.resourceflow/name"; + public static final String PARENT_GLUE_FINALIZER_PREFIX = + "io.javaoperatorsdk.operator.resourceflow.glue/"; public static final String GLUE_RECONCILER_NAME = "glue"; diff --git a/src/main/java/io/csviri/operator/glue/reconciler/glue/InformerProducer.java b/src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/InformerProducer.java similarity index 86% rename from src/main/java/io/csviri/operator/glue/reconciler/glue/InformerProducer.java rename to src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/InformerProducer.java index bece7e1..405db6e 100644 --- a/src/main/java/io/csviri/operator/glue/reconciler/glue/InformerProducer.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/InformerProducer.java @@ -1,10 +1,10 @@ -package io.csviri.operator.glue.reconciler.glue; +package io.javaoperatorsdk.operator.glue.reconciler.glue; -import io.csviri.operator.glue.customresource.glue.Glue; import io.fabric8.kubernetes.api.model.GenericKubernetesResource; import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration; import io.javaoperatorsdk.operator.api.reconciler.Context; +import io.javaoperatorsdk.operator.glue.customresource.glue.Glue; import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource; import jakarta.inject.Singleton; diff --git a/src/main/java/io/csviri/operator/glue/reconciler/glue/InformerRegister.java b/src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/InformerRegister.java similarity index 95% rename from src/main/java/io/csviri/operator/glue/reconciler/glue/InformerRegister.java rename to src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/InformerRegister.java index 628db2d..02a6fdf 100644 --- a/src/main/java/io/csviri/operator/glue/reconciler/glue/InformerRegister.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/InformerRegister.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue.reconciler.glue; +package io.javaoperatorsdk.operator.glue.reconciler.glue; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -7,13 +7,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.csviri.operator.glue.ControllerConfig; -import io.csviri.operator.glue.Utils; -import io.csviri.operator.glue.customresource.glue.Glue; -import io.csviri.operator.glue.customresource.glue.RelatedResourceSpec; import io.fabric8.kubernetes.api.model.GenericKubernetesResource; import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration; import io.javaoperatorsdk.operator.api.reconciler.Context; +import io.javaoperatorsdk.operator.glue.ControllerConfig; +import io.javaoperatorsdk.operator.glue.Utils; +import io.javaoperatorsdk.operator.glue.customresource.glue.Glue; +import io.javaoperatorsdk.operator.glue.customresource.glue.RelatedResourceSpec; import io.javaoperatorsdk.operator.processing.GroupVersionKind; import io.javaoperatorsdk.operator.processing.event.ResourceID; import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource; diff --git a/src/main/java/io/csviri/operator/glue/reconciler/glue/RelatedAndOwnedResourceSecondaryToPrimaryMapper.java b/src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/RelatedAndOwnedResourceSecondaryToPrimaryMapper.java similarity index 96% rename from src/main/java/io/csviri/operator/glue/reconciler/glue/RelatedAndOwnedResourceSecondaryToPrimaryMapper.java rename to src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/RelatedAndOwnedResourceSecondaryToPrimaryMapper.java index 097be15..5f722b5 100644 --- a/src/main/java/io/csviri/operator/glue/reconciler/glue/RelatedAndOwnedResourceSecondaryToPrimaryMapper.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/RelatedAndOwnedResourceSecondaryToPrimaryMapper.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue.reconciler.glue; +package io.javaoperatorsdk.operator.glue.reconciler.glue; import java.util.Collection; import java.util.HashSet; diff --git a/src/main/java/io/csviri/operator/glue/reconciler/operator/GlueOperatorReconciler.java b/src/main/java/io/javaoperatorsdk/operator/glue/reconciler/operator/GlueOperatorReconciler.java similarity index 91% rename from src/main/java/io/csviri/operator/glue/reconciler/operator/GlueOperatorReconciler.java rename to src/main/java/io/javaoperatorsdk/operator/glue/reconciler/operator/GlueOperatorReconciler.java index 63d2e89..965a91c 100644 --- a/src/main/java/io/csviri/operator/glue/reconciler/operator/GlueOperatorReconciler.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/reconciler/operator/GlueOperatorReconciler.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue.reconciler.operator; +package io.javaoperatorsdk.operator.glue.reconciler.operator; import java.util.*; @@ -6,22 +6,23 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.csviri.operator.glue.ControllerConfig; -import io.csviri.operator.glue.GlueException; -import io.csviri.operator.glue.customresource.glue.Glue; -import io.csviri.operator.glue.customresource.glue.GlueSpec; -import io.csviri.operator.glue.customresource.glue.RelatedResourceSpec; -import io.csviri.operator.glue.customresource.operator.GlueOperator; -import io.csviri.operator.glue.customresource.operator.GlueOperatorSpec; -import io.csviri.operator.glue.customresource.operator.ResourceFlowOperatorStatus; -import io.csviri.operator.glue.reconciler.ValidationAndErrorHandler; -import io.csviri.operator.glue.templating.GenericTemplateHandler; import io.fabric8.kubernetes.api.model.GenericKubernetesResource; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; import io.fabric8.kubernetes.client.utils.KubernetesResourceUtil; import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration; import io.javaoperatorsdk.operator.api.reconciler.*; +import io.javaoperatorsdk.operator.glue.ControllerConfig; +import io.javaoperatorsdk.operator.glue.GlueException; +import io.javaoperatorsdk.operator.glue.customresource.glue.Glue; +import io.javaoperatorsdk.operator.glue.customresource.glue.GlueSpec; +import io.javaoperatorsdk.operator.glue.customresource.glue.RelatedResourceSpec; +import io.javaoperatorsdk.operator.glue.customresource.operator.GlueOperator; +import io.javaoperatorsdk.operator.glue.customresource.operator.GlueOperatorSpec; +import io.javaoperatorsdk.operator.glue.customresource.operator.ResourceFlowOperatorStatus; +import io.javaoperatorsdk.operator.glue.reconciler.ValidationAndErrorHandler; +import io.javaoperatorsdk.operator.glue.reconciler.glue.GlueReconciler; +import io.javaoperatorsdk.operator.glue.templating.GenericTemplateHandler; import io.javaoperatorsdk.operator.processing.GroupVersionKind; import io.javaoperatorsdk.operator.processing.event.ResourceID; import io.javaoperatorsdk.operator.processing.event.source.EventSource; @@ -29,8 +30,6 @@ import jakarta.annotation.PostConstruct; -import static io.csviri.operator.glue.reconciler.glue.GlueReconciler.GLUE_RECONCILER_NAME; - @ControllerConfiguration(name = GlueOperatorReconciler.GLUE_OPERATOR_RECONCILER_NAME) public class GlueOperatorReconciler implements Reconciler, EventSourceInitializer, @@ -43,7 +42,8 @@ public class GlueOperatorReconciler public static final String PARENT_RELATED_RESOURCE_NAME = "parent"; public static final String GLUE_OPERATOR_RECONCILER_NAME = "glue-operator"; - @ConfigProperty(name = "quarkus.operator-sdk.controllers." + GLUE_RECONCILER_NAME + ".selector") + @ConfigProperty(name = "quarkus.operator-sdk.controllers." + GlueReconciler.GLUE_RECONCILER_NAME + + ".selector") Optional glueLabelSelector; private final ControllerConfig controllerConfig; diff --git a/src/main/java/io/csviri/operator/glue/templating/GenericTemplateHandler.java b/src/main/java/io/javaoperatorsdk/operator/glue/templating/GenericTemplateHandler.java similarity index 91% rename from src/main/java/io/csviri/operator/glue/templating/GenericTemplateHandler.java rename to src/main/java/io/javaoperatorsdk/operator/glue/templating/GenericTemplateHandler.java index b8860cc..b7c77cc 100644 --- a/src/main/java/io/csviri/operator/glue/templating/GenericTemplateHandler.java +++ b/src/main/java/io/javaoperatorsdk/operator/glue/templating/GenericTemplateHandler.java @@ -1,12 +1,12 @@ -package io.csviri.operator.glue.templating; +package io.javaoperatorsdk.operator.glue.templating; import java.util.HashMap; import java.util.Map; -import io.csviri.operator.glue.Utils; -import io.csviri.operator.glue.customresource.glue.Glue; import io.fabric8.kubernetes.api.model.GenericKubernetesResource; import io.javaoperatorsdk.operator.api.reconciler.Context; +import io.javaoperatorsdk.operator.glue.Utils; +import io.javaoperatorsdk.operator.glue.customresource.glue.Glue; import io.quarkus.qute.Engine; import io.quarkus.qute.Template; diff --git a/src/test/java/io/csviri/operator/glue/GlueLabelSelectorTest.java b/src/test/java/io/javaoperatorsdk/operator/glue/GlueLabelSelectorTest.java similarity index 76% rename from src/test/java/io/csviri/operator/glue/GlueLabelSelectorTest.java rename to src/test/java/io/javaoperatorsdk/operator/glue/GlueLabelSelectorTest.java index 2545111..5a435c0 100644 --- a/src/test/java/io/csviri/operator/glue/GlueLabelSelectorTest.java +++ b/src/test/java/io/javaoperatorsdk/operator/glue/GlueLabelSelectorTest.java @@ -1,18 +1,18 @@ -package io.csviri.operator.glue; +package io.javaoperatorsdk.operator.glue; import java.util.Map; import org.junit.jupiter.api.Test; -import io.csviri.operator.glue.customresource.glue.Glue; import io.fabric8.kubernetes.api.model.ConfigMap; +import io.javaoperatorsdk.operator.glue.customresource.glue.Glue; +import io.javaoperatorsdk.operator.glue.reconciler.glue.GlueReconciler; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTestProfile; import io.quarkus.test.junit.TestProfile; -import static io.csviri.operator.glue.TestUtils.INITIAL_RECONCILE_WAIT_TIMEOUT; -import static io.csviri.operator.glue.reconciler.glue.GlueReconciler.GLUE_RECONCILER_NAME; +import static io.javaoperatorsdk.operator.glue.TestUtils.INITIAL_RECONCILE_WAIT_TIMEOUT; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -46,7 +46,8 @@ public static class LabelSelectorTestProfile implements QuarkusTestProfile { @Override public Map getConfigOverrides() { - return Map.of("quarkus.operator-sdk.controllers." + GLUE_RECONCILER_NAME + ".selector", + return Map.of( + "quarkus.operator-sdk.controllers." + GlueReconciler.GLUE_RECONCILER_NAME + ".selector", LABEL_KEY + "=" + LABEL_VALUE); } } diff --git a/src/test/java/io/csviri/operator/glue/GlueOperatorComplexLabelSelectorTest.java b/src/test/java/io/javaoperatorsdk/operator/glue/GlueOperatorComplexLabelSelectorTest.java similarity index 81% rename from src/test/java/io/csviri/operator/glue/GlueOperatorComplexLabelSelectorTest.java rename to src/test/java/io/javaoperatorsdk/operator/glue/GlueOperatorComplexLabelSelectorTest.java index 267377a..cbe5cc9 100644 --- a/src/test/java/io/csviri/operator/glue/GlueOperatorComplexLabelSelectorTest.java +++ b/src/test/java/io/javaoperatorsdk/operator/glue/GlueOperatorComplexLabelSelectorTest.java @@ -1,20 +1,20 @@ -package io.csviri.operator.glue; +package io.javaoperatorsdk.operator.glue; import java.util.Map; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import io.csviri.operator.glue.customresource.TestCustomResource; -import io.csviri.operator.glue.customresource.TestCustomResource2; -import io.csviri.operator.glue.customresource.glue.Glue; -import io.csviri.operator.glue.reconciler.operator.GlueOperatorReconciler; import io.fabric8.kubernetes.api.model.ConfigMap; +import io.javaoperatorsdk.operator.glue.customresource.TestCustomResource; +import io.javaoperatorsdk.operator.glue.customresource.TestCustomResource2; +import io.javaoperatorsdk.operator.glue.customresource.glue.Glue; +import io.javaoperatorsdk.operator.glue.reconciler.glue.GlueReconciler; +import io.javaoperatorsdk.operator.glue.reconciler.operator.GlueOperatorReconciler; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTestProfile; import io.quarkus.test.junit.TestProfile; -import static io.csviri.operator.glue.reconciler.glue.GlueReconciler.GLUE_RECONCILER_NAME; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -60,7 +60,8 @@ public static class GlueOperatorComplexLabelSelectorTestProfile implements Quark @Override public Map getConfigOverrides() { - return Map.of("quarkus.operator-sdk.controllers." + GLUE_RECONCILER_NAME + ".selector", + return Map.of( + "quarkus.operator-sdk.controllers." + GlueReconciler.GLUE_RECONCILER_NAME + ".selector", // complex label selector with 2 values checked GLUE_LABEL_KEY1 + "=" + LABEL_VALUE + "," + GLUE_LABEL_KEY2 + "=" + LABEL_VALUE, // explicit labels added to glue diff --git a/src/test/java/io/csviri/operator/glue/GlueOperatorLabelSelectorTest.java b/src/test/java/io/javaoperatorsdk/operator/glue/GlueOperatorLabelSelectorTest.java similarity index 75% rename from src/test/java/io/csviri/operator/glue/GlueOperatorLabelSelectorTest.java rename to src/test/java/io/javaoperatorsdk/operator/glue/GlueOperatorLabelSelectorTest.java index 7b5ee22..650c46b 100644 --- a/src/test/java/io/csviri/operator/glue/GlueOperatorLabelSelectorTest.java +++ b/src/test/java/io/javaoperatorsdk/operator/glue/GlueOperatorLabelSelectorTest.java @@ -1,22 +1,21 @@ -package io.csviri.operator.glue; +package io.javaoperatorsdk.operator.glue; import java.util.Map; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import io.csviri.operator.glue.customresource.TestCustomResource; -import io.csviri.operator.glue.customresource.TestCustomResource2; -import io.csviri.operator.glue.customresource.glue.Glue; -import io.csviri.operator.glue.reconciler.operator.GlueOperatorReconciler; import io.fabric8.kubernetes.api.model.ConfigMap; +import io.javaoperatorsdk.operator.glue.customresource.TestCustomResource; +import io.javaoperatorsdk.operator.glue.customresource.TestCustomResource2; +import io.javaoperatorsdk.operator.glue.customresource.glue.Glue; +import io.javaoperatorsdk.operator.glue.reconciler.glue.GlueReconciler; +import io.javaoperatorsdk.operator.glue.reconciler.operator.GlueOperatorReconciler; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTestProfile; import io.quarkus.test.junit.TestProfile; -import static io.csviri.operator.glue.TestUtils.INITIAL_RECONCILE_WAIT_TIMEOUT; -import static io.csviri.operator.glue.reconciler.glue.GlueReconciler.GLUE_RECONCILER_NAME; -import static io.csviri.operator.glue.reconciler.operator.GlueOperatorReconciler.GLUE_OPERATOR_RECONCILER_NAME; +import static io.javaoperatorsdk.operator.glue.TestUtils.INITIAL_RECONCILE_WAIT_TIMEOUT; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -69,9 +68,11 @@ public static class GlueOperatorLabelSelectorTestProfile implements QuarkusTestP @Override public Map getConfigOverrides() { - return Map.of("quarkus.operator-sdk.controllers." + GLUE_RECONCILER_NAME + ".selector", + return Map.of( + "quarkus.operator-sdk.controllers." + GlueReconciler.GLUE_RECONCILER_NAME + ".selector", GLUE_LABEL_KEY + "=" + LABEL_VALUE, - "quarkus.operator-sdk.controllers." + GLUE_OPERATOR_RECONCILER_NAME + ".selector", + "quarkus.operator-sdk.controllers." + GlueOperatorReconciler.GLUE_OPERATOR_RECONCILER_NAME + + ".selector", GLUE_OPERATOR_LABEL_KEY + "=" + LABEL_VALUE); } } diff --git a/src/test/java/io/csviri/operator/glue/GlueOperatorTest.java b/src/test/java/io/javaoperatorsdk/operator/glue/GlueOperatorTest.java similarity index 89% rename from src/test/java/io/csviri/operator/glue/GlueOperatorTest.java rename to src/test/java/io/javaoperatorsdk/operator/glue/GlueOperatorTest.java index ac40c59..9ae7409 100644 --- a/src/test/java/io/csviri/operator/glue/GlueOperatorTest.java +++ b/src/test/java/io/javaoperatorsdk/operator/glue/GlueOperatorTest.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue; +package io.javaoperatorsdk.operator.glue; import java.time.Duration; import java.util.ArrayList; @@ -7,23 +7,23 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import io.csviri.operator.glue.customresource.TestCustomResource; -import io.csviri.operator.glue.customresource.TestCustomResource2; -import io.csviri.operator.glue.customresource.glue.DependentResourceSpec; -import io.csviri.operator.glue.customresource.glue.Glue; -import io.csviri.operator.glue.customresource.operator.GlueOperator; -import io.csviri.operator.glue.customresource.operator.GlueOperatorSpec; -import io.csviri.operator.glue.customresource.operator.Parent; -import io.csviri.operator.glue.reconciler.ValidationAndErrorHandler; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.client.dsl.NonDeletingOperation; +import io.javaoperatorsdk.operator.glue.customresource.TestCustomResource; +import io.javaoperatorsdk.operator.glue.customresource.TestCustomResource2; +import io.javaoperatorsdk.operator.glue.customresource.glue.DependentResourceSpec; +import io.javaoperatorsdk.operator.glue.customresource.glue.Glue; +import io.javaoperatorsdk.operator.glue.customresource.operator.GlueOperator; +import io.javaoperatorsdk.operator.glue.customresource.operator.GlueOperatorSpec; +import io.javaoperatorsdk.operator.glue.customresource.operator.Parent; +import io.javaoperatorsdk.operator.glue.reconciler.ValidationAndErrorHandler; import io.quarkus.test.junit.QuarkusTest; -import static io.csviri.operator.glue.TestData.*; -import static io.csviri.operator.glue.TestUtils.GC_WAIT_TIMEOUT; -import static io.csviri.operator.glue.customresource.TestCustomResource.CR_GROUP; +import static io.javaoperatorsdk.operator.glue.TestData.*; +import static io.javaoperatorsdk.operator.glue.TestUtils.GC_WAIT_TIMEOUT; +import static io.javaoperatorsdk.operator.glue.customresource.TestCustomResource.CR_GROUP; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; diff --git a/src/test/java/io/csviri/operator/glue/GlueRelatedResourcesTest.java b/src/test/java/io/javaoperatorsdk/operator/glue/GlueRelatedResourcesTest.java similarity index 95% rename from src/test/java/io/csviri/operator/glue/GlueRelatedResourcesTest.java rename to src/test/java/io/javaoperatorsdk/operator/glue/GlueRelatedResourcesTest.java index f7ee7de..6bc3c7f 100644 --- a/src/test/java/io/csviri/operator/glue/GlueRelatedResourcesTest.java +++ b/src/test/java/io/javaoperatorsdk/operator/glue/GlueRelatedResourcesTest.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue; +package io.javaoperatorsdk.operator.glue; import java.nio.charset.StandardCharsets; import java.util.Base64; @@ -7,9 +7,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import io.csviri.operator.glue.customresource.ClusterScopeTestCustomResource; -import io.csviri.operator.glue.customresource.glue.Glue; import io.fabric8.kubernetes.api.model.*; +import io.javaoperatorsdk.operator.glue.customresource.ClusterScopeTestCustomResource; +import io.javaoperatorsdk.operator.glue.customresource.glue.Glue; import io.quarkus.test.junit.QuarkusTest; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/io/csviri/operator/glue/GlueResourceLabelSelectorTest.java b/src/test/java/io/javaoperatorsdk/operator/glue/GlueResourceLabelSelectorTest.java similarity index 97% rename from src/test/java/io/csviri/operator/glue/GlueResourceLabelSelectorTest.java rename to src/test/java/io/javaoperatorsdk/operator/glue/GlueResourceLabelSelectorTest.java index 2fb79a8..48cace0 100644 --- a/src/test/java/io/csviri/operator/glue/GlueResourceLabelSelectorTest.java +++ b/src/test/java/io/javaoperatorsdk/operator/glue/GlueResourceLabelSelectorTest.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue; +package io.javaoperatorsdk.operator.glue; import java.util.Map; diff --git a/src/test/java/io/csviri/operator/glue/GlueTest.java b/src/test/java/io/javaoperatorsdk/operator/glue/GlueTest.java similarity index 96% rename from src/test/java/io/csviri/operator/glue/GlueTest.java rename to src/test/java/io/javaoperatorsdk/operator/glue/GlueTest.java index a5ef637..8c5e123 100644 --- a/src/test/java/io/csviri/operator/glue/GlueTest.java +++ b/src/test/java/io/javaoperatorsdk/operator/glue/GlueTest.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue; +package io.javaoperatorsdk.operator.glue; import java.time.Duration; import java.util.ArrayList; @@ -6,16 +6,17 @@ import java.util.Map; import java.util.stream.IntStream; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import io.csviri.operator.glue.customresource.glue.DependentResourceSpec; -import io.csviri.operator.glue.customresource.glue.Glue; -import io.csviri.operator.glue.reconciler.ValidationAndErrorHandler; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.client.dsl.NonDeletingOperation; +import io.javaoperatorsdk.operator.glue.customresource.glue.DependentResourceSpec; +import io.javaoperatorsdk.operator.glue.customresource.glue.Glue; +import io.javaoperatorsdk.operator.glue.reconciler.ValidationAndErrorHandler; import io.quarkus.test.junit.QuarkusTest; import static org.assertj.core.api.Assertions.assertThat; @@ -235,7 +236,7 @@ void nonUniqueNameResultsInErrorMessageOnStatus() { var actualGlue = get(Glue.class, glue.getMetadata().getName()); assertThat(actualGlue.getStatus()).isNotNull(); - assertThat(actualGlue.getStatus().getErrorMessage()) + Assertions.assertThat(actualGlue.getStatus().getErrorMessage()) .startsWith(ValidationAndErrorHandler.NON_UNIQUE_NAMES_FOUND_PREFIX); }); } diff --git a/src/test/java/io/csviri/operator/glue/JavaScripConditionTest.java b/src/test/java/io/javaoperatorsdk/operator/glue/JavaScripConditionTest.java similarity index 84% rename from src/test/java/io/csviri/operator/glue/JavaScripConditionTest.java rename to src/test/java/io/javaoperatorsdk/operator/glue/JavaScripConditionTest.java index 98f52c4..dcd1e15 100644 --- a/src/test/java/io/csviri/operator/glue/JavaScripConditionTest.java +++ b/src/test/java/io/javaoperatorsdk/operator/glue/JavaScripConditionTest.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue; +package io.javaoperatorsdk.operator.glue; import java.io.IOException; import java.io.InputStream; @@ -9,16 +9,16 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import io.csviri.operator.glue.conditions.JavaScripCondition; -import io.csviri.operator.glue.customresource.glue.DependentResourceSpec; -import io.csviri.operator.glue.customresource.glue.Glue; -import io.csviri.operator.glue.customresource.glue.GlueSpec; import io.fabric8.kubernetes.api.model.GenericKubernetesResource; import io.fabric8.kubernetes.client.utils.Serialization; import io.javaoperatorsdk.operator.api.reconciler.Context; import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource; +import io.javaoperatorsdk.operator.glue.conditions.JavaScripCondition; +import io.javaoperatorsdk.operator.glue.customresource.glue.DependentResourceSpec; +import io.javaoperatorsdk.operator.glue.customresource.glue.Glue; +import io.javaoperatorsdk.operator.glue.customresource.glue.GlueSpec; +import io.javaoperatorsdk.operator.glue.reconciler.glue.GlueReconciler; -import static io.csviri.operator.glue.reconciler.glue.GlueReconciler.DEPENDENT_NAME_ANNOTATION_KEY; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; @@ -67,7 +67,7 @@ void injectsTargetResourceResource() { @Test void injectsSecondaryResourcesResource() { var cm = configMap(); - cm.getMetadata().getAnnotations().put(DEPENDENT_NAME_ANNOTATION_KEY, DR_NAME); + cm.getMetadata().getAnnotations().put(GlueReconciler.DEPENDENT_NAME_ANNOTATION_KEY, DR_NAME); when(mockContext.getSecondaryResources(any())).thenReturn(Set.of(cm)); when(dr.getSecondaryResource(any(), any())).thenReturn(Optional.of(cm)); diff --git a/src/test/java/io/csviri/operator/glue/TestBase.java b/src/test/java/io/javaoperatorsdk/operator/glue/TestBase.java similarity index 98% rename from src/test/java/io/csviri/operator/glue/TestBase.java rename to src/test/java/io/javaoperatorsdk/operator/glue/TestBase.java index 5b1b67c..db9b10f 100644 --- a/src/test/java/io/csviri/operator/glue/TestBase.java +++ b/src/test/java/io/javaoperatorsdk/operator/glue/TestBase.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue; +package io.javaoperatorsdk.operator.glue; import java.time.Duration; diff --git a/src/test/java/io/csviri/operator/glue/TestData.java b/src/test/java/io/javaoperatorsdk/operator/glue/TestData.java similarity index 79% rename from src/test/java/io/csviri/operator/glue/TestData.java rename to src/test/java/io/javaoperatorsdk/operator/glue/TestData.java index 6396d71..a180a86 100644 --- a/src/test/java/io/csviri/operator/glue/TestData.java +++ b/src/test/java/io/javaoperatorsdk/operator/glue/TestData.java @@ -1,9 +1,9 @@ -package io.csviri.operator.glue; +package io.javaoperatorsdk.operator.glue; -import io.csviri.operator.glue.customresource.TestCustomResource; -import io.csviri.operator.glue.customresource.TestCustomResource2; -import io.csviri.operator.glue.customresource.TestCustomResourceSpec; import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; +import io.javaoperatorsdk.operator.glue.customresource.TestCustomResource; +import io.javaoperatorsdk.operator.glue.customresource.TestCustomResource2; +import io.javaoperatorsdk.operator.glue.customresource.TestCustomResourceSpec; public class TestData { diff --git a/src/test/java/io/csviri/operator/glue/TestUtils.java b/src/test/java/io/javaoperatorsdk/operator/glue/TestUtils.java similarity index 96% rename from src/test/java/io/csviri/operator/glue/TestUtils.java rename to src/test/java/io/javaoperatorsdk/operator/glue/TestUtils.java index ae3dcd7..e43d958 100644 --- a/src/test/java/io/csviri/operator/glue/TestUtils.java +++ b/src/test/java/io/javaoperatorsdk/operator/glue/TestUtils.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue; +package io.javaoperatorsdk.operator.glue; import java.io.*; import java.net.URL; @@ -13,14 +13,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.csviri.operator.glue.customresource.glue.Glue; -import io.csviri.operator.glue.customresource.operator.GlueOperator; import io.fabric8.kubernetes.api.model.GenericKubernetesResource; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.dsl.NonDeletingOperation; import io.fabric8.kubernetes.client.utils.Serialization; import io.javaoperatorsdk.operator.ReconcilerUtils; +import io.javaoperatorsdk.operator.glue.customresource.glue.Glue; +import io.javaoperatorsdk.operator.glue.customresource.operator.GlueOperator; public class TestUtils { diff --git a/src/test/java/io/csviri/operator/glue/customresource/ClusterScopeTestCustomResource.java b/src/test/java/io/javaoperatorsdk/operator/glue/customresource/ClusterScopeTestCustomResource.java similarity index 87% rename from src/test/java/io/csviri/operator/glue/customresource/ClusterScopeTestCustomResource.java rename to src/test/java/io/javaoperatorsdk/operator/glue/customresource/ClusterScopeTestCustomResource.java index c9c1739..170fc5a 100644 --- a/src/test/java/io/csviri/operator/glue/customresource/ClusterScopeTestCustomResource.java +++ b/src/test/java/io/javaoperatorsdk/operator/glue/customresource/ClusterScopeTestCustomResource.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue.customresource; +package io.javaoperatorsdk.operator.glue.customresource; import io.fabric8.kubernetes.client.CustomResource; import io.fabric8.kubernetes.model.annotation.Group; diff --git a/src/test/java/io/csviri/operator/glue/customresource/TestCustomResource.java b/src/test/java/io/javaoperatorsdk/operator/glue/customresource/TestCustomResource.java similarity index 77% rename from src/test/java/io/csviri/operator/glue/customresource/TestCustomResource.java rename to src/test/java/io/javaoperatorsdk/operator/glue/customresource/TestCustomResource.java index 2e7468f..bb661c2 100644 --- a/src/test/java/io/csviri/operator/glue/customresource/TestCustomResource.java +++ b/src/test/java/io/javaoperatorsdk/operator/glue/customresource/TestCustomResource.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue.customresource; +package io.javaoperatorsdk.operator.glue.customresource; import io.fabric8.kubernetes.api.model.Namespaced; import io.fabric8.kubernetes.client.CustomResource; @@ -12,7 +12,7 @@ public class TestCustomResource extends CustomResource implements Namespaced { - public static final String CR_GROUP = "io.csviri.operator.glue"; + public static final String CR_GROUP = "io.javaoperatorsdk.operator.glue"; } diff --git a/src/test/java/io/csviri/operator/glue/customresource/TestCustomResource2.java b/src/test/java/io/javaoperatorsdk/operator/glue/customresource/TestCustomResource2.java similarity index 88% rename from src/test/java/io/csviri/operator/glue/customresource/TestCustomResource2.java rename to src/test/java/io/javaoperatorsdk/operator/glue/customresource/TestCustomResource2.java index 7dced92..f11f5a1 100644 --- a/src/test/java/io/csviri/operator/glue/customresource/TestCustomResource2.java +++ b/src/test/java/io/javaoperatorsdk/operator/glue/customresource/TestCustomResource2.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue.customresource; +package io.javaoperatorsdk.operator.glue.customresource; import io.fabric8.kubernetes.api.model.Namespaced; import io.fabric8.kubernetes.client.CustomResource; diff --git a/src/test/java/io/csviri/operator/glue/customresource/TestCustomResourceSpec.java b/src/test/java/io/javaoperatorsdk/operator/glue/customresource/TestCustomResourceSpec.java similarity index 89% rename from src/test/java/io/csviri/operator/glue/customresource/TestCustomResourceSpec.java rename to src/test/java/io/javaoperatorsdk/operator/glue/customresource/TestCustomResourceSpec.java index 89f5a7a..40c8768 100644 --- a/src/test/java/io/csviri/operator/glue/customresource/TestCustomResourceSpec.java +++ b/src/test/java/io/javaoperatorsdk/operator/glue/customresource/TestCustomResourceSpec.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue.customresource; +package io.javaoperatorsdk.operator.glue.customresource; import java.util.List; diff --git a/src/test/java/io/csviri/operator/glue/reconciler/glue/InformerRegisterTest.java b/src/test/java/io/javaoperatorsdk/operator/glue/reconciler/glue/InformerRegisterTest.java similarity index 87% rename from src/test/java/io/csviri/operator/glue/reconciler/glue/InformerRegisterTest.java rename to src/test/java/io/javaoperatorsdk/operator/glue/reconciler/glue/InformerRegisterTest.java index f4f89be..009bd6d 100644 --- a/src/test/java/io/csviri/operator/glue/reconciler/glue/InformerRegisterTest.java +++ b/src/test/java/io/javaoperatorsdk/operator/glue/reconciler/glue/InformerRegisterTest.java @@ -1,14 +1,15 @@ -package io.csviri.operator.glue.reconciler.glue; +package io.javaoperatorsdk.operator.glue.reconciler.glue; import java.util.Map; import org.junit.jupiter.api.Test; +import org.mockito.Mockito; -import io.csviri.operator.glue.ControllerConfig; -import io.csviri.operator.glue.customresource.glue.Glue; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; import io.javaoperatorsdk.operator.api.reconciler.Context; +import io.javaoperatorsdk.operator.glue.ControllerConfig; +import io.javaoperatorsdk.operator.glue.customresource.glue.Glue; import io.javaoperatorsdk.operator.processing.GroupVersionKind; import io.javaoperatorsdk.operator.processing.event.EventSourceRetriever; @@ -26,7 +27,7 @@ void registersInformerWithLabelSelectorIfConfigured() { var gvk = GroupVersionKind.gvkFor(ConfigMap.class); var labelSelectors = Map.of(InformerRegister.toSimpleString(gvk), LABEL_SELECTOR); - var config = mock(ControllerConfig.class); + var config = Mockito.mock(ControllerConfig.class); when(config.resourceLabelSelector()).thenReturn(labelSelectors); var informerProducer = mock(InformerProducer.class); var register = new InformerRegister(informerProducer, config); diff --git a/src/test/java/io/csviri/operator/glue/sample/mutation/MutationWebhookDeploymentE2E.java b/src/test/java/io/javaoperatorsdk/operator/glue/sample/mutation/MutationWebhookDeploymentE2E.java similarity index 88% rename from src/test/java/io/csviri/operator/glue/sample/mutation/MutationWebhookDeploymentE2E.java rename to src/test/java/io/javaoperatorsdk/operator/glue/sample/mutation/MutationWebhookDeploymentE2E.java index d104509..0da22d3 100644 --- a/src/test/java/io/csviri/operator/glue/sample/mutation/MutationWebhookDeploymentE2E.java +++ b/src/test/java/io/javaoperatorsdk/operator/glue/sample/mutation/MutationWebhookDeploymentE2E.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue.sample.mutation; +package io.javaoperatorsdk.operator.glue.sample.mutation; import java.net.MalformedURLException; import java.net.URI; @@ -8,15 +8,14 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import io.csviri.operator.glue.TestUtils; -import io.csviri.operator.glue.customresource.glue.Glue; -import io.csviri.operator.glue.customresource.operator.GlueOperator; import io.fabric8.kubernetes.api.model.*; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientBuilder; import io.fabric8.kubernetes.client.dsl.NonDeletingOperation; +import io.javaoperatorsdk.operator.glue.TestUtils; +import io.javaoperatorsdk.operator.glue.customresource.glue.Glue; +import io.javaoperatorsdk.operator.glue.customresource.operator.GlueOperator; -import static io.csviri.operator.glue.TestUtils.GC_WAIT_TIMEOUT; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -55,7 +54,7 @@ void testMutationHookDeployment() { client.resource(glue).delete(); - await().timeout(GC_WAIT_TIMEOUT).untilAsserted(() -> { + await().timeout(TestUtils.GC_WAIT_TIMEOUT).untilAsserted(() -> { var deployment = client.apps().deployments().withName("pod-mutating-hook").get(); assertThat(deployment).isNull(); }); diff --git a/src/test/java/io/csviri/operator/glue/sample/webpage/WebPage.java b/src/test/java/io/javaoperatorsdk/operator/glue/sample/webpage/WebPage.java similarity index 90% rename from src/test/java/io/csviri/operator/glue/sample/webpage/WebPage.java rename to src/test/java/io/javaoperatorsdk/operator/glue/sample/webpage/WebPage.java index 2888aea..4ee6796 100644 --- a/src/test/java/io/csviri/operator/glue/sample/webpage/WebPage.java +++ b/src/test/java/io/javaoperatorsdk/operator/glue/sample/webpage/WebPage.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue.sample.webpage; +package io.javaoperatorsdk.operator.glue.sample.webpage; import io.fabric8.kubernetes.api.model.Namespaced; import io.fabric8.kubernetes.client.CustomResource; diff --git a/src/test/java/io/csviri/operator/glue/sample/webpage/WebPageE2E.java b/src/test/java/io/javaoperatorsdk/operator/glue/sample/webpage/WebPageE2E.java similarity index 89% rename from src/test/java/io/csviri/operator/glue/sample/webpage/WebPageE2E.java rename to src/test/java/io/javaoperatorsdk/operator/glue/sample/webpage/WebPageE2E.java index c042d26..479c7f0 100644 --- a/src/test/java/io/csviri/operator/glue/sample/webpage/WebPageE2E.java +++ b/src/test/java/io/javaoperatorsdk/operator/glue/sample/webpage/WebPageE2E.java @@ -1,12 +1,9 @@ -package io.csviri.operator.glue.sample.webpage; +package io.javaoperatorsdk.operator.glue.sample.webpage; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import io.csviri.operator.glue.TestUtils; -import io.csviri.operator.glue.customresource.glue.Glue; -import io.csviri.operator.glue.customresource.operator.GlueOperator; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.apps.Deployment; @@ -14,8 +11,10 @@ import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientBuilder; import io.fabric8.kubernetes.client.dsl.NonDeletingOperation; +import io.javaoperatorsdk.operator.glue.TestUtils; +import io.javaoperatorsdk.operator.glue.customresource.glue.Glue; +import io.javaoperatorsdk.operator.glue.customresource.operator.GlueOperator; -import static io.csviri.operator.glue.TestUtils.GC_WAIT_TIMEOUT; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -62,7 +61,7 @@ void testWebPageCRUDOperations() { client.resource(createdWebPage).delete(); - await().timeout(GC_WAIT_TIMEOUT).untilAsserted(() -> { + await().timeout(TestUtils.GC_WAIT_TIMEOUT).untilAsserted(() -> { var deployment = client.resources(Deployment.class).withName(webPage.getMetadata().getName()).get(); var configMap = diff --git a/src/test/java/io/csviri/operator/glue/sample/webpage/WebPageSampleTest.java b/src/test/java/io/javaoperatorsdk/operator/glue/sample/webpage/WebPageSampleTest.java similarity index 93% rename from src/test/java/io/csviri/operator/glue/sample/webpage/WebPageSampleTest.java rename to src/test/java/io/javaoperatorsdk/operator/glue/sample/webpage/WebPageSampleTest.java index 50f0365..9eee921 100644 --- a/src/test/java/io/csviri/operator/glue/sample/webpage/WebPageSampleTest.java +++ b/src/test/java/io/javaoperatorsdk/operator/glue/sample/webpage/WebPageSampleTest.java @@ -1,14 +1,14 @@ -package io.csviri.operator.glue.sample.webpage; +package io.javaoperatorsdk.operator.glue.sample.webpage; import org.junit.jupiter.api.Test; -import io.csviri.operator.glue.TestBase; -import io.csviri.operator.glue.TestUtils; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.apps.Deployment; import io.fabric8.kubernetes.api.model.networking.v1.Ingress; +import io.javaoperatorsdk.operator.glue.TestBase; +import io.javaoperatorsdk.operator.glue.TestUtils; import io.quarkus.test.junit.QuarkusTest; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/io/csviri/operator/glue/sample/webpage/WebPageSpec.java b/src/test/java/io/javaoperatorsdk/operator/glue/sample/webpage/WebPageSpec.java similarity index 90% rename from src/test/java/io/csviri/operator/glue/sample/webpage/WebPageSpec.java rename to src/test/java/io/javaoperatorsdk/operator/glue/sample/webpage/WebPageSpec.java index f00cd67..df11c8d 100644 --- a/src/test/java/io/csviri/operator/glue/sample/webpage/WebPageSpec.java +++ b/src/test/java/io/javaoperatorsdk/operator/glue/sample/webpage/WebPageSpec.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue.sample.webpage; +package io.javaoperatorsdk.operator.glue.sample.webpage; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/src/test/java/io/csviri/operator/glue/sample/webpage/WebPageStatus.java b/src/test/java/io/javaoperatorsdk/operator/glue/sample/webpage/WebPageStatus.java similarity index 87% rename from src/test/java/io/csviri/operator/glue/sample/webpage/WebPageStatus.java rename to src/test/java/io/javaoperatorsdk/operator/glue/sample/webpage/WebPageStatus.java index cc82116..dad7837 100644 --- a/src/test/java/io/csviri/operator/glue/sample/webpage/WebPageStatus.java +++ b/src/test/java/io/javaoperatorsdk/operator/glue/sample/webpage/WebPageStatus.java @@ -1,4 +1,4 @@ -package io.csviri.operator.glue.sample.webpage; +package io.javaoperatorsdk.operator.glue.sample.webpage; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonPropertyOrder; diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index 5bed900..f37c320 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -1,2 +1,2 @@ -quarkus.log.category."io.csviri.operator.glue".level=DEBUG +quarkus.log.category."io.javaoperatorsdk.operator.glue".level=DEBUG quarkus.kubernetes-client.devservices.flavor=kind diff --git a/src/test/resources/glue/ChanginResources.yaml b/src/test/resources/glue/ChanginResources.yaml index 009d47c..b289940 100644 --- a/src/test/resources/glue/ChanginResources.yaml +++ b/src/test/resources/glue/ChanginResources.yaml @@ -1,4 +1,4 @@ -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: Glue metadata: name: rf-to-change diff --git a/src/test/resources/glue/ClusterScopeResource.yaml b/src/test/resources/glue/ClusterScopeResource.yaml index 6d16d2f..7d8fe97 100644 --- a/src/test/resources/glue/ClusterScopeResource.yaml +++ b/src/test/resources/glue/ClusterScopeResource.yaml @@ -1,4 +1,4 @@ -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: Glue metadata: name: "glue1" @@ -6,7 +6,7 @@ spec: childResources: - name: cluster-scoped-resource resource: - apiVersion: io.csviri.operator.glue/v1 + apiVersion: io.javaoperatorsdk.operator.glue/v1 kind: ClusterScopeTestCustomResource metadata: name: "test-resource-1" diff --git a/src/test/resources/glue/ClusterScopedChild.yaml b/src/test/resources/glue/ClusterScopedChild.yaml index aa4a1e7..e58a179 100644 --- a/src/test/resources/glue/ClusterScopedChild.yaml +++ b/src/test/resources/glue/ClusterScopedChild.yaml @@ -1,4 +1,4 @@ -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: Glue metadata: name: "testglue" diff --git a/src/test/resources/glue/ClusterScopedRelatedResource.yaml b/src/test/resources/glue/ClusterScopedRelatedResource.yaml index e4eb109..89e3a59 100644 --- a/src/test/resources/glue/ClusterScopedRelatedResource.yaml +++ b/src/test/resources/glue/ClusterScopedRelatedResource.yaml @@ -1,4 +1,4 @@ -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: Glue metadata: name: "testglue" diff --git a/src/test/resources/glue/CrossReferenceResource.yaml b/src/test/resources/glue/CrossReferenceResource.yaml index a6e34ec..f04e7af 100644 --- a/src/test/resources/glue/CrossReferenceResource.yaml +++ b/src/test/resources/glue/CrossReferenceResource.yaml @@ -1,4 +1,4 @@ -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: Glue metadata: name: "crossreference" diff --git a/src/test/resources/glue/MultiNameRelatedResource.yaml b/src/test/resources/glue/MultiNameRelatedResource.yaml index 6d4ee77..5f63aea 100644 --- a/src/test/resources/glue/MultiNameRelatedResource.yaml +++ b/src/test/resources/glue/MultiNameRelatedResource.yaml @@ -1,4 +1,4 @@ -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: Glue metadata: name: related-resource-test1 diff --git a/src/test/resources/glue/NonUniqueName.yaml b/src/test/resources/glue/NonUniqueName.yaml index c76b37c..611113f 100644 --- a/src/test/resources/glue/NonUniqueName.yaml +++ b/src/test/resources/glue/NonUniqueName.yaml @@ -1,5 +1,5 @@ # Invalid GLUE, presents resources with non-unique name -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: Glue metadata: name: templating-sample diff --git a/src/test/resources/glue/RelatedResourceFromDifferentNamespace.yaml b/src/test/resources/glue/RelatedResourceFromDifferentNamespace.yaml index 78d4eb8..8da27b2 100644 --- a/src/test/resources/glue/RelatedResourceFromDifferentNamespace.yaml +++ b/src/test/resources/glue/RelatedResourceFromDifferentNamespace.yaml @@ -1,4 +1,4 @@ -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: Glue metadata: name: "testglue" diff --git a/src/test/resources/glue/RelatedResourceSimpleWithCondition.yaml b/src/test/resources/glue/RelatedResourceSimpleWithCondition.yaml index ee87dcc..0fcfd80 100644 --- a/src/test/resources/glue/RelatedResourceSimpleWithCondition.yaml +++ b/src/test/resources/glue/RelatedResourceSimpleWithCondition.yaml @@ -1,4 +1,4 @@ -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: Glue metadata: name: related-resource-test1 diff --git a/src/test/resources/glue/RelatesResourceSameType.yaml b/src/test/resources/glue/RelatesResourceSameType.yaml index c97c116..25afb70 100644 --- a/src/test/resources/glue/RelatesResourceSameType.yaml +++ b/src/test/resources/glue/RelatesResourceSameType.yaml @@ -1,4 +1,4 @@ -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: Glue metadata: name: related-resource-test1 diff --git a/src/test/resources/glue/ResourceInDifferentNamespace.yaml b/src/test/resources/glue/ResourceInDifferentNamespace.yaml index d6d0a84..58a739b 100644 --- a/src/test/resources/glue/ResourceInDifferentNamespace.yaml +++ b/src/test/resources/glue/ResourceInDifferentNamespace.yaml @@ -1,4 +1,4 @@ -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: Glue metadata: name: "testglue" diff --git a/src/test/resources/glue/ResourceTemplate.yaml b/src/test/resources/glue/ResourceTemplate.yaml index 69be71a..5a50870 100644 --- a/src/test/resources/glue/ResourceTemplate.yaml +++ b/src/test/resources/glue/ResourceTemplate.yaml @@ -1,4 +1,4 @@ -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: Glue metadata: name: resource-templating-sample diff --git a/src/test/resources/glue/SimpleGlue.yaml b/src/test/resources/glue/SimpleGlue.yaml index 24cc79a..aa3403f 100644 --- a/src/test/resources/glue/SimpleGlue.yaml +++ b/src/test/resources/glue/SimpleGlue.yaml @@ -1,5 +1,5 @@ # Invalid GLUE, presents resources with non-unique name -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: Glue metadata: name: simple-glue diff --git a/src/test/resources/glue/SimpleGlueWithLabeledResource.yaml b/src/test/resources/glue/SimpleGlueWithLabeledResource.yaml index 867fafa..9d11453 100644 --- a/src/test/resources/glue/SimpleGlueWithLabeledResource.yaml +++ b/src/test/resources/glue/SimpleGlueWithLabeledResource.yaml @@ -1,5 +1,5 @@ # Invalid GLUE, presents resources with non-unique name -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: Glue metadata: name: glue diff --git a/src/test/resources/glue/TemplateForConcurrency.yaml b/src/test/resources/glue/TemplateForConcurrency.yaml index 76ccb57..f2a1ce3 100644 --- a/src/test/resources/glue/TemplateForConcurrency.yaml +++ b/src/test/resources/glue/TemplateForConcurrency.yaml @@ -1,4 +1,4 @@ -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: Glue metadata: name: "concurrencysample" diff --git a/src/test/resources/glue/Templating.yaml b/src/test/resources/glue/Templating.yaml index 75e12ef..24eccf1 100644 --- a/src/test/resources/glue/Templating.yaml +++ b/src/test/resources/glue/Templating.yaml @@ -1,4 +1,4 @@ -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: Glue metadata: name: templating-sample diff --git a/src/test/resources/glue/TwoResourcesAndCondition.yaml b/src/test/resources/glue/TwoResourcesAndCondition.yaml index 6138f9a..f3d59e4 100644 --- a/src/test/resources/glue/TwoResourcesAndCondition.yaml +++ b/src/test/resources/glue/TwoResourcesAndCondition.yaml @@ -1,4 +1,4 @@ -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: Glue metadata: name: two-resource-cross-condition diff --git a/src/test/resources/glueoperator/Concurrency.yaml b/src/test/resources/glueoperator/Concurrency.yaml index 1b8a782..9c823cc 100644 --- a/src/test/resources/glueoperator/Concurrency.yaml +++ b/src/test/resources/glueoperator/Concurrency.yaml @@ -1,10 +1,10 @@ -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: GlueOperator metadata: name: rfo1 spec: parent: - apiVersion: io.csviri.operator.glue/v1 + apiVersion: io.javaoperatorsdk.operator.glue/v1 kind: TestCustomResource childResources: - name: configMap1 diff --git a/src/test/resources/glueoperator/Concurrency2.yaml b/src/test/resources/glueoperator/Concurrency2.yaml index 8b245cd..0c8e106 100644 --- a/src/test/resources/glueoperator/Concurrency2.yaml +++ b/src/test/resources/glueoperator/Concurrency2.yaml @@ -1,10 +1,10 @@ -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: GlueOperator metadata: name: rfo2 spec: parent: - apiVersion: io.csviri.operator.glue/v1 + apiVersion: io.javaoperatorsdk.operator.glue/v1 kind: TestCustomResource2 childResources: - name: configMap1 diff --git a/src/test/resources/glueoperator/NonUniqueName.yaml b/src/test/resources/glueoperator/NonUniqueName.yaml index 46eab9a..b66f57c 100644 --- a/src/test/resources/glueoperator/NonUniqueName.yaml +++ b/src/test/resources/glueoperator/NonUniqueName.yaml @@ -1,10 +1,10 @@ -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: GlueOperator metadata: name: non-unique-name spec: parent: - apiVersion: io.csviri.operator.glue/v1 + apiVersion: io.javaoperatorsdk.operator.glue/v1 kind: TestCustomResource childResources: - name: configMap1 diff --git a/src/test/resources/glueoperator/ParentLabelSelector.yaml b/src/test/resources/glueoperator/ParentLabelSelector.yaml index 325ade6..1ac68e6 100644 --- a/src/test/resources/glueoperator/ParentLabelSelector.yaml +++ b/src/test/resources/glueoperator/ParentLabelSelector.yaml @@ -1,10 +1,10 @@ -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: GlueOperator metadata: name: templating-sample spec: parent: - apiVersion: io.csviri.operator.glue/v1 + apiVersion: io.javaoperatorsdk.operator.glue/v1 kind: TestCustomResource labelSelector: "mylabel=value" childResources: diff --git a/src/test/resources/glueoperator/SimpleGlueOperator.yaml b/src/test/resources/glueoperator/SimpleGlueOperator.yaml index 7eb3852..aa04444 100644 --- a/src/test/resources/glueoperator/SimpleGlueOperator.yaml +++ b/src/test/resources/glueoperator/SimpleGlueOperator.yaml @@ -1,10 +1,10 @@ -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: GlueOperator metadata: name: templating-sample spec: parent: - apiVersion: io.csviri.operator.glue/v1 + apiVersion: io.javaoperatorsdk.operator.glue/v1 kind: TestCustomResource childResources: - name: configMap1 diff --git a/src/test/resources/sample/mutation/mutation.glue.yaml b/src/test/resources/sample/mutation/mutation.glue.yaml index 3df4319..a00a0b8 100644 --- a/src/test/resources/sample/mutation/mutation.glue.yaml +++ b/src/test/resources/sample/mutation/mutation.glue.yaml @@ -1,4 +1,4 @@ -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: Glue metadata: name: mutation-webhook-deployment @@ -56,7 +56,7 @@ spec: secretKeyRef: key: password name: pkcs12-pass - image: ghcr.io/csviri/sample-pod-mutating-webhook:0.1.0 + image: ghcr.io/java-operator-sdk/sample-pod-mutating-webhook:0.1.0 imagePullPolicy: IfNotPresent name: pod-mutating-hook ports: diff --git a/src/test/resources/sample/secretcopy/secret-copy.operator.yaml b/src/test/resources/sample/secretcopy/secret-copy.operator.yaml index 86ee9e5..b023b6a 100644 --- a/src/test/resources/sample/secretcopy/secret-copy.operator.yaml +++ b/src/test/resources/sample/secretcopy/secret-copy.operator.yaml @@ -1,4 +1,4 @@ -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: GlueOperator metadata: name: secret-copy-operator diff --git a/src/test/resources/sample/webpage/webpage.operator.yaml b/src/test/resources/sample/webpage/webpage.operator.yaml index 64cc25b..87ef529 100644 --- a/src/test/resources/sample/webpage/webpage.operator.yaml +++ b/src/test/resources/sample/webpage/webpage.operator.yaml @@ -1,4 +1,4 @@ -apiVersion: io.csviri.operator.glue/v1beta1 +apiVersion: io.javaoperatorsdk.operator.glue/v1beta1 kind: GlueOperator metadata: name: webpage-operator