diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..c907224 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,15 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + - package-ecosystem: "" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "weekly" diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 47d03c0..c1bf672 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -5,12 +5,12 @@ on: jobs: lint: name: lint - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/setup-go@v2 - with: - go-version: 1.19 - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 + - uses: actions/setup-go@v5 + with: + go-version-file: "go.mod" - run: make lint diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml index ff748be..fe13597 100644 --- a/.github/workflows/test-unit.yml +++ b/.github/workflows/test-unit.yml @@ -5,14 +5,14 @@ on: jobs: unit: name: unit - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - - uses: actions/setup-go@v2 - with: - go-version: 1.19 - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 + - uses: actions/setup-go@v5 + with: + go-version-file: "go.mod" - run: make test - uses: shogo82148/actions-goveralls@v1 with: diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 0000000..0a84014 --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1,12 @@ + +############################################## +# +# List of approvers for this repository +# +############################################## +# +# Learn about membership in java-operator-plugins: +# https://github.com/operator-framework/java-operator-plugins/blob/main/CONTRIBUTING.md +# + +* @operator-framework/java-operator-plugins diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d212c27..6f28f50 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,6 +2,13 @@ Java Operator is Apache 2.0 licensed and accepts contributions via GitHub pull requests. This document outlines some of the conventions on commit message formatting, contact points for developers, and other resources to help get contributions into the Java Operator. +## Certificate of Origin + +By contributing to this project you agree to the Developer Certificate of +Origin (DCO). This document was created by the Linux Kernel community and is a +simple statement that you, as a contributor, have the legal right to make the +contribution. See the [DCO](DCO) file for details. + ## Email and Chat - Email: [operator-framework][operator_framework] diff --git a/DCO b/DCO new file mode 100644 index 0000000..8201f99 --- /dev/null +++ b/DCO @@ -0,0 +1,37 @@ +Developer Certificate of Origin +Version 1.1 + +Copyright (C) 2004, 2006 The Linux Foundation and its contributors. +1 Letterman Drive +Suite D4700 +San Francisco, CA, 94129 + +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed. + + +Developer's Certificate of Origin 1.1 + +By making a contribution to this project, I certify that: + +(a) The contribution was created in whole or in part by me and I + have the right to submit it under the open source license + indicated in the file; or + +(b) The contribution is based upon previous work that, to the best + of my knowledge, is covered under an appropriate open source + license and I have the right under that license to submit that + work with modifications, whether created in whole or in part + by me, under the same open source license (unless I am + permitted to submit under a different license), as indicated + in the file; or + +(c) The contribution was provided directly to me by some other + person who certified (a), (b) or (c) and I have not modified + it. + +(d) I understand and agree that this project and the contribution + are public and that a record of the contribution (including all + personal information I submit with it, including my sign-off) is + maintained indefinitely and may be redistributed consistent with + this project or the open source license(s) involved. diff --git a/OWNERS b/OWNERS deleted file mode 100644 index 4b2fca3..0000000 --- a/OWNERS +++ /dev/null @@ -1,10 +0,0 @@ -# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md - -approvers: - - java-sdk-admins - - java-sdk-maintainers - - java-sdk-approvers -reviewers: - - java-sdk-admins - - java-sdk-reviewers - - java-sdk-approvers diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES deleted file mode 100644 index a697044..0000000 --- a/OWNERS_ALIASES +++ /dev/null @@ -1,26 +0,0 @@ -# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md - -aliases: - # active folks who can be contacted to perform admin-related - # tasks on the repo, or otherwise approve any PRS. - # java-sdk-admins: - - # non-admin folks who have write-access and can approve any PRs in the repo - # java-sdk-maintainers: - - # non-admin folks who can approve any PRs in the repo - # java-sdk-approvers: - - # folks who can review and LGTM any PRs in the repo (doesn't - # include approvers & admins -- those count too via the OWNERS - # file) - # java-sdk-reviewers: - - # folks to can approve things in the directly-ported - # testing_frameworks portions of the codebase - # java-sdk-approvers: - - - # folks who may have context on ancient history, - # but are no longer directly involved - # java-sdk-emeritus-maintainers: \ No newline at end of file diff --git a/README.md b/README.md index a683dcd..441e736 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +## This repository is now deprecated and it is no longer actively maintained. Please use the provided Quarkus tools as described in the bootstraping instructions - https://github.com/quarkiverse/quarkus-operator-sdk?tab=readme-ov-file#bootstrapping-a-project. + # Java Operator Plugin diff --git a/docs/tutorial.md b/docs/tutorial.md index 738fdc9..a046b4a 100644 --- a/docs/tutorial.md +++ b/docs/tutorial.md @@ -43,7 +43,7 @@ An operator isn't much good without an API to work with. Create a new Custom Resource Definition (CRD) API with group `cache`, version `v1`, and Kind `Memcached`. -Use the `create api` command to scaffold the `MemcachedController`, +Use the `create api` command to scaffold the `MemcachedReconciler`, `MemcachedSpec`, `MemcachedStatus` and `Memcached`. These files represent the API. The plugin may show some debug statements which is normal as it is still in the alpha state. @@ -67,7 +67,7 @@ $ tree │ └── com │ └── example │ ├── Memcached.java - │ ├── MemcachedController.java + │ ├── MemcachedReconciler.java │ ├── MemcachedSpec.java │ └── MemcachedStatus.java └── resources @@ -87,7 +87,7 @@ The `java-operator-plugins` project uses the APIs from [java-operator-sdk](https #### `MemcachedSpec` -Initially, the scaffolded Spec file will be empty. The operator developer needs +Initially, the scaffolded Spec file, `MemcachedSpec`, will be empty. The operator developer needs to add attributes to this file according to their needs. For the `Memcached` example, we will add the size field as shown in the example below. @@ -251,11 +251,11 @@ By now we have the API defined in `Memcached.java`, `MemcachedSpec.java`, `MemcachedStatus.java`. We also have the CRD and the sample Custom Resource. This isn't enough, we still need a controller to reconcile these items. -The `create api` command will have scaffolded a skeleton `MemcachedController.java`. +The `create api` command will have scaffolded a skeleton `MemcachedReconciler.java`. This controller implements the `ResourceController` interface from the `java-operator-sdk`. This interface has some important and useful methods. -Initially the `MemcachedController.java` will contain the empty stubs for +Initially the `MemcachedReconciler.java` will contain the empty stubs for `reconcile`. In this section we will fill in the controller logic in these methods. We will also add a `createMemcachedDeployment` method that will create the Deployment for our @@ -268,7 +268,7 @@ changes to the Deployment. ### reconcile In this section we will focus on implementing the `reconcile` -method. In the `MemcachedController.java` you will see a `// TODO: fill in logic` +method. In the `MemcachedReconciler.java` you will see a `// TODO: fill in logic` comment. At this line we will first add code to get the Deployment. ``` @@ -303,7 +303,7 @@ else we need to return `UpdateControl.updateStatus(resource)` After getting the Deployment, we get the current and required replicas. Add the following lines below the `if (deployment == null)` block in your -`MemcachedController.java` file. +`MemcachedReconciler.java` file. ``` int currentReplicas = deployment.getSpec().getReplicas(); @@ -327,7 +327,7 @@ The above sections will cover reconciling any `size` changes to the Spec. In the next section, we will look at handling the changes to the `nodes` list from the Status. -Let's get the list of pods and their names. In the `MemcachedController.java`, +Let's get the list of pods and their names. In the `MemcachedReconciler.java`, add the following code below the `if (currentReplicas != requiredReplicas) {` block. @@ -443,7 +443,7 @@ In the next section, we will walk you through creating the Creating Kubernetes objects via APIs can be quite verbose which is why putting them in helper methods can make the code more readable. The -`MemcachedController.java` needs to create a Deployment if it does not exist. In +`MemcachedReconciler.java` needs to create a Deployment if it does not exist. In the `reconcile` we make a call to a helper, `createMemcachedDeployment`. @@ -452,7 +452,7 @@ the [`fabric8`](https://fabric8.io/) `DeploymentBuilder` class. Notice the Deployment specifies the `memcached` image for the pod. Below your `labelsForMemcached(Memcached m)` block in the -`MemcachedController.java`, add the following method. +`MemcachedReconciler.java`, add the following method. ``` private Deployment createMemcachedDeployment(Memcached m) { @@ -496,11 +496,11 @@ Below your `labelsForMemcached(Memcached m)` block in the Now we have a `reconcile` method. It calls `createMemcachedDeployment` which we have implemented above. -We have now implemented the `MemcachedController.java`. +We have now implemented the `MemcachedReconciler.java`. ## Include Dependencies -Please add below dependencies in `MemcachedController.java` file. +Please add below dependencies in `MemcachedReconciler.java` file. ``` import io.fabric8.kubernetes.api.model.ContainerBuilder; @@ -564,15 +564,20 @@ The following steps will show how to run your operator in the cluster. The `java-operator-plugins` project will scaffold out a Makefile to give Operator SDK users a familiar interface. Using the `docker-*` targets you can -conveniently build your and push your operator's image to registry. In our -example, we are using `quay.io`, but any docker registry should work. +conveniently build and push your operator's image to a registry. + +To build and push the docker image, you will need to specify the name of the image, `IMG`, +that will be built as well as the operating system, `OS`, and the architecture, +`ARCH`, that the image will be built for. In this example, we are using +`quay.io` as the registry the image will be pushed to, but any docker registry should work. ``` -make docker-build docker-push IMG=quay.io/YOURUSER/memcached-quarkus-operator:v0.0.1 +make docker-build docker-push IMG=quay.io/YOURUSER/memcached-quarkus-operator:v0.0.1 OS=linux ARCH=arm64 ``` -This will build the docker image -`quay.io/YOURUSER/memcached-quarkus-operator:v0.0.1` and push it to the registry. +This will build the docker image +`quay.io/YOURUSER/memcached-quarkus-operator:v0.0.1` for linux/arm64 and push it +to the `quay.io` registry. You can verify it is in your docker registry: diff --git a/go.mod b/go.mod index a4a33ba..3fd141e 100644 --- a/go.mod +++ b/go.mod @@ -1,29 +1,29 @@ module github.com/operator-framework/java-operator-plugins -go 1.19 - -require github.com/spf13/pflag v1.0.5 +go 1.21 require ( github.com/onsi/ginkgo v1.16.5 - github.com/onsi/gomega v1.19.0 - k8s.io/apimachinery v0.25.0 - sigs.k8s.io/kubebuilder/v3 v3.7.1-0.20220923133227-91a1afa8fe9e + github.com/onsi/gomega v1.33.0 + github.com/sirupsen/logrus v1.9.3 + github.com/spf13/afero v1.11.0 + github.com/spf13/pflag v1.0.5 + k8s.io/apimachinery v0.29.2 + sigs.k8s.io/kubebuilder/v3 v3.14.2 ) require ( - github.com/fsnotify/fsnotify v1.5.1 // indirect - github.com/gobuffalo/flect v0.2.5 // indirect + github.com/fsnotify/fsnotify v1.4.9 // indirect + github.com/gobuffalo/flect v1.0.2 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/nxadm/tail v1.4.8 // indirect - github.com/sirupsen/logrus v1.8.1 - github.com/spf13/afero v1.6.0 - golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect - golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect - golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect - golang.org/x/text v0.3.7 // indirect - golang.org/x/tools v0.1.12 // indirect + golang.org/x/mod v0.17.0 // indirect + golang.org/x/net v0.24.0 // indirect + golang.org/x/sys v0.19.0 // indirect + golang.org/x/text v0.14.0 // indirect + golang.org/x/tools v0.20.0 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect - sigs.k8s.io/yaml v1.3.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect + sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/go.sum b/go.sum index f32c87e..9a4d21f 100644 --- a/go.sum +++ b/go.sum @@ -2,13 +2,15 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= -github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= -github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= -github.com/gobuffalo/flect v0.2.5 h1:H6vvsv2an0lalEaCDRThvtBfmg44W/QHXBCYUXf/6S4= -github.com/gobuffalo/flect v0.2.5/go.mod h1:1ZyCLIbg0YD7sDkzvFdPoOydPtD8y9JQnrOROolUcM8= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/gobuffalo/flect v1.0.2 h1:eqjPGSo2WmjgY2XlpGwo2NXgL3RucAKo4k4qQMNA5sA= +github.com/gobuffalo/flect v1.0.2/go.mod h1:A5msMlrHtLqh9umBSnvabjsMrCcCpAyzglnDvkbYKHs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= @@ -16,14 +18,15 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/pprof v0.0.0-20230907193218-d3ddc7976beb h1:LCMfzVg3sflxTs4UvuP4D8CkoZnfHLe2qzqgDn/4OHs= +github.com/google/pprof v0.0.0-20230907193218-d3ddc7976beb/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -31,69 +34,70 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY= +github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8= +github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= -github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/onsi/gomega v1.33.0 h1:snPCflnZrpMsy94p4lXVEkHo12lmPnc3vY5XBbreexE= +github.com/onsi/gomega v1.33.0/go.mod h1:+925n5YtiFsLzzafLUHzVMBpvvRAzrydIBiSIxjX3wY= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= -github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= -github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= +github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc= -golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= +golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -104,25 +108,24 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -k8s.io/apimachinery v0.25.0 h1:MlP0r6+3XbkUG2itd6vp3oxbtdQLQI94fD5gCS+gnoU= -k8s.io/apimachinery v0.25.0/go.mod h1:qMx9eAk0sZQGsXGu86fab8tZdffHbwUfsvzqKn4mfB0= -k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= -k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= -k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -sigs.k8s.io/kubebuilder/v3 v3.7.1-0.20220923133227-91a1afa8fe9e h1:yiuCmGZ+EQckK6JoDWxaW8i6R85Jp4zha8BlgPvvaw4= -sigs.k8s.io/kubebuilder/v3 v3.7.1-0.20220923133227-91a1afa8fe9e/go.mod h1:vppEZrUUSbIED5LJ9Cn3rU6xptOZjL791q2uY9Nih/Q= -sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= -sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= +k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= +k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +sigs.k8s.io/kubebuilder/v3 v3.14.2 h1:LMZW8Y5eItnP4kh9tpp4Gs2Gd5V3DgLgzbNnXfMAShY= +sigs.k8s.io/kubebuilder/v3 v3.14.2/go.mod h1:gEZM8SUkewOQnpRDiewh4gmbQ1FMkT/CDlMddOg053M= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/pkg/quarkus/v1alpha/api.go b/pkg/quarkus/v1beta/api.go similarity index 96% rename from pkg/quarkus/v1alpha/api.go rename to pkg/quarkus/v1beta/api.go index 81271e8..6aa15c7 100644 --- a/pkg/quarkus/v1alpha/api.go +++ b/pkg/quarkus/v1beta/api.go @@ -22,7 +22,7 @@ import ( "path/filepath" "strings" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds" log "github.com/sirupsen/logrus" "github.com/spf13/afero" "github.com/spf13/pflag" @@ -91,7 +91,7 @@ func (p *createAPISubcommand) PostScaffold() error { func (p *createAPISubcommand) Scaffold(fs machinery.Filesystem) error { scaffolder := scaffolds.NewCreateAPIScaffolder(p.config, *p.resource) - var s = fmt.Sprintf(makefileBundleCRDFile, p.resource.Plural, p.resource.QualifiedGroup(), p.resource.Version) + var s = fmt.Sprintf(makefileBundleCRDFile, p.resource.Plural, p.resource.QualifiedGroup()) foundLine := findOldFilesForReplacement(filePath, s) if !foundLine { @@ -109,7 +109,7 @@ func (p *createAPISubcommand) Scaffold(fs machinery.Filesystem) error { projectName = strings.ToLower(filepath.Base(dir)) } - makefileBytes = append(makefileBytes, []byte(fmt.Sprintf(makefileBundleVarFragment, p.resource.Plural, p.resource.QualifiedGroup(), p.resource.Version))...) + makefileBytes = append(makefileBytes, []byte(fmt.Sprintf(makefileBundleVarFragment, p.resource.Plural, p.resource.QualifiedGroup()))...) makefileBytes = append([]byte(fmt.Sprintf(makefileBundleImageFragement, p.config.GetDomain(), projectName)), makefileBytes...) @@ -208,7 +208,7 @@ func findOldFilesForReplacement(path, newfile string) bool { } const ( - makefileBundleCRDFile = `target/kubernetes/%[1]s.%[2]s-%[3]s.yml` + makefileBundleCRDFile = `target/kubernetes/%[1]s.%[2]s-v1.yml` ) const ( @@ -217,7 +217,7 @@ const ( .PHONY: bundle bundle: ## Generate bundle manifests and metadata, then validate generated files. ## marker - cat target/kubernetes/%[1]s.%[2]s-%[3]s.yml target/kubernetes/kubernetes.yml | operator-sdk generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS) + cat target/kubernetes/%[1]s.%[2]s-v1.yml target/kubernetes/kubernetes.yml | operator-sdk generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS) operator-sdk bundle validate ./bundle .PHONY: bundle-build diff --git a/pkg/quarkus/v1alpha/api_test.go b/pkg/quarkus/v1beta/api_test.go similarity index 100% rename from pkg/quarkus/v1alpha/api_test.go rename to pkg/quarkus/v1beta/api_test.go diff --git a/pkg/quarkus/v1alpha/init.go b/pkg/quarkus/v1beta/init.go similarity index 99% rename from pkg/quarkus/v1alpha/init.go rename to pkg/quarkus/v1beta/init.go index de80641..fce19a8 100644 --- a/pkg/quarkus/v1alpha/init.go +++ b/pkg/quarkus/v1beta/init.go @@ -20,7 +20,7 @@ import ( "path/filepath" "strings" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds" "github.com/spf13/pflag" "k8s.io/apimachinery/pkg/util/validation" diff --git a/pkg/quarkus/v1alpha/init_test.go b/pkg/quarkus/v1beta/init_test.go similarity index 100% rename from pkg/quarkus/v1alpha/init_test.go rename to pkg/quarkus/v1beta/init_test.go diff --git a/pkg/quarkus/v1alpha/plugin.go b/pkg/quarkus/v1beta/plugin.go similarity index 86% rename from pkg/quarkus/v1alpha/plugin.go rename to pkg/quarkus/v1beta/plugin.go index fd1206c..178d4b7 100644 --- a/pkg/quarkus/v1alpha/plugin.go +++ b/pkg/quarkus/v1beta/plugin.go @@ -25,7 +25,7 @@ const pluginName = "quarkus.javaoperatorsdk.io" var ( supportedProjectVersions = []config.Version{v3.Version} - pluginVersion = plugin.Version{Number: 1, Stage: stage.Alpha} + pluginVersion = plugin.Version{Number: 1, Stage: stage.Beta} ) var ( @@ -66,3 +66,10 @@ func (p Plugin) GetCreateAPISubcommand() plugin.CreateAPISubcommand { return &p. // // GetEditSubcommand will return the subcommand which is responsible for editing the scaffold of the project // func (p Plugin) GetEditSubcommand() plugin.EditSubcommand { return &p.editSubcommand } + +func (p Plugin) DeprecationWarning() string { + return "This plugin is deprecated and will be eventually removed." + + " It is recommended that you bootstrap your Quarkus-based operator with" + + " the provided Quarkus tools as described in the bootstraping instructions -" + + " https://github.com/quarkiverse/quarkus-operator-sdk?tab=readme-ov-file#bootstrapping-a-project." +} diff --git a/pkg/quarkus/v1alpha/plugin_test.go b/pkg/quarkus/v1beta/plugin_test.go similarity index 99% rename from pkg/quarkus/v1alpha/plugin_test.go rename to pkg/quarkus/v1beta/plugin_test.go index 5d22fc0..a2cc909 100644 --- a/pkg/quarkus/v1alpha/plugin_test.go +++ b/pkg/quarkus/v1beta/plugin_test.go @@ -34,7 +34,7 @@ var _ = Describe("v1", func() { Describe("Version", func() { It("should return the plugin version", func() { - Expect(testPlugin.Version(), plugin.Version{Number: 1, Stage: stage.Alpha}) + Expect(testPlugin.Version(), plugin.Version{Number: 1, Stage: stage.Beta}) }) }) diff --git a/pkg/quarkus/v1alpha/scaffolds/api.go b/pkg/quarkus/v1beta/scaffolds/api.go similarity index 95% rename from pkg/quarkus/v1alpha/scaffolds/api.go rename to pkg/quarkus/v1beta/scaffolds/api.go index 402feeb..fec7eee 100644 --- a/pkg/quarkus/v1alpha/scaffolds/api.go +++ b/pkg/quarkus/v1beta/scaffolds/api.go @@ -20,9 +20,9 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" "sigs.k8s.io/kubebuilder/v3/pkg/plugins" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/controller" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/model" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/util" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds/internal/templates/controller" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds/internal/templates/model" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/util" ) type apiScaffolder struct { diff --git a/pkg/quarkus/v1alpha/scaffolds/doc.go b/pkg/quarkus/v1beta/scaffolds/doc.go similarity index 100% rename from pkg/quarkus/v1alpha/scaffolds/doc.go rename to pkg/quarkus/v1beta/scaffolds/doc.go diff --git a/pkg/quarkus/v1alpha/scaffolds/init.go b/pkg/quarkus/v1beta/scaffolds/init.go similarity index 97% rename from pkg/quarkus/v1alpha/scaffolds/init.go rename to pkg/quarkus/v1beta/scaffolds/init.go index 6f22ed1..08ce49a 100644 --- a/pkg/quarkus/v1alpha/scaffolds/init.go +++ b/pkg/quarkus/v1beta/scaffolds/init.go @@ -18,11 +18,11 @@ import ( "os" "path/filepath" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/util" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/util" "sigs.k8s.io/kubebuilder/v3/pkg/config" "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds/internal/templates" "sigs.k8s.io/kubebuilder/v3/pkg/plugins" ) diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/applicationproperties.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/applicationproperties.go similarity index 66% rename from pkg/quarkus/v1alpha/scaffolds/internal/templates/applicationproperties.go rename to pkg/quarkus/v1beta/scaffolds/internal/templates/applicationproperties.go index b7a76a7..15a3b0a 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/applicationproperties.go +++ b/pkg/quarkus/v1beta/scaffolds/internal/templates/applicationproperties.go @@ -19,7 +19,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/util" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds/internal/templates/util" ) var _ machinery.Template = &ApplicationPropertiesFile{} @@ -47,6 +47,12 @@ func (f *ApplicationPropertiesFile) SetTemplateDefaults() error { const ApplicationPropertiesTemplate = `quarkus.container-image.build=true #quarkus.container-image.group= quarkus.container-image.name={{ .ProjectName }}-operator -# set to true to automatically apply CRDs to the cluster when they get regenerated -quarkus.operator-sdk.crd.apply=false + +# Set to false to prevent CRDs from being applied to the cluster automatically (only applies to dev mode, CRD applying is disabled in prod) +# See https://docs.quarkiverse.io/quarkus-operator-sdk/dev/index.html#extension-configuration-reference for the complete list of available configuration options +# quarkus.operator-sdk.crd.apply=false + +# Uncomment this to prevent the client from trusting self-signed certificates (mostly useful when using a local cluster for testing) +# See https://quarkus.io/guides/kubernetes-client#configuration-reference for the complete list of Quarkus Kubernetes client configuration options +# quarkus.kubernetes-client.trust-certs=false ` diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/controller/controller.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/controller/controller.go similarity index 97% rename from pkg/quarkus/v1alpha/scaffolds/internal/templates/controller/controller.go rename to pkg/quarkus/v1beta/scaffolds/internal/templates/controller/controller.go index 1b58647..96a1ebb 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/controller/controller.go +++ b/pkg/quarkus/v1beta/scaffolds/internal/templates/controller/controller.go @@ -19,7 +19,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/util" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds/internal/templates/util" ) var _ machinery.Template = &Controller{} diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/doc.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/doc.go similarity index 100% rename from pkg/quarkus/v1alpha/scaffolds/internal/templates/doc.go rename to pkg/quarkus/v1beta/scaffolds/internal/templates/doc.go diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/gitignore.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/gitignore.go similarity index 100% rename from pkg/quarkus/v1alpha/scaffolds/internal/templates/gitignore.go rename to pkg/quarkus/v1beta/scaffolds/internal/templates/gitignore.go diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/makefile.go similarity index 83% rename from pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go rename to pkg/quarkus/v1beta/scaffolds/internal/templates/makefile.go index f6bca30..1770479 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go +++ b/pkg/quarkus/v1beta/scaffolds/internal/templates/makefile.go @@ -29,6 +29,12 @@ type Makefile struct { // Image is controller manager image name Image string + // OS is the operating system to use for building the image + OS string + + // Arch is the architecture to use for building the image + Arch string + // Kustomize version to use in the project KustomizeVersion string @@ -50,6 +56,15 @@ func (f *Makefile) SetTemplateDefaults() error { f.Image = "controller:latest" } + if f.OS == "" && f.Arch == "" { + // Default OS/Arch to linux/amd64 + f.OS = "linux" + f.Arch = "amd64" + } else if f.OS == "" || f.Arch == "" { + // Require both OS and Arch + return errors.New("Both OS and Arch are required to be set if not using default") + } + if f.KustomizeVersion == "" { return errors.New("kustomize version is required in scaffold") } @@ -62,8 +77,11 @@ func (f *Makefile) SetTemplateDefaults() error { } const makefileTemplate = ` -# Image URL to use all building/pushing image targets +# Image URL to use for all building/pushing image targets IMG ?= {{ .Image }} +# Operating system and architecture to use for building image +OS ?= {{ .OS }} +ARCH ?= {{ .Arch }} all: docker-build @@ -86,7 +104,7 @@ help: ## Display this help. ##@ Build docker-build: ## Build docker image with the manager. - mvn package -Dquarkus.container-image.build=true -Dquarkus.container-image.image=${IMG} + mvn package -Dquarkus.container-image.build=true -Dquarkus.container-image.builder=docker -Dquarkus.container-image.image=${IMG} -Dquarkus.docker.buildx.platform=${OS}/${ARCH} docker-push: ## Push docker image with the manager. mvn package -Dquarkus.container-image.push=true -Dquarkus.container-image.image=${IMG} diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/model/model.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/model/model.go similarity index 97% rename from pkg/quarkus/v1alpha/scaffolds/internal/templates/model/model.go rename to pkg/quarkus/v1beta/scaffolds/internal/templates/model/model.go index 251fac8..fcf3679 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/model/model.go +++ b/pkg/quarkus/v1beta/scaffolds/internal/templates/model/model.go @@ -19,7 +19,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/util" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds/internal/templates/util" ) var _ machinery.Template = &Model{} diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/model/modelspec.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/model/modelspec.go similarity index 96% rename from pkg/quarkus/v1alpha/scaffolds/internal/templates/model/modelspec.go rename to pkg/quarkus/v1beta/scaffolds/internal/templates/model/modelspec.go index bfb2cbe..fd6d82f 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/model/modelspec.go +++ b/pkg/quarkus/v1beta/scaffolds/internal/templates/model/modelspec.go @@ -19,7 +19,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/util" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds/internal/templates/util" ) var _ machinery.Template = &ModelSpec{} diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/model/modelstatus.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/model/modelstatus.go similarity index 96% rename from pkg/quarkus/v1alpha/scaffolds/internal/templates/model/modelstatus.go rename to pkg/quarkus/v1beta/scaffolds/internal/templates/model/modelstatus.go index f8cab5f..9fb5b80 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/model/modelstatus.go +++ b/pkg/quarkus/v1beta/scaffolds/internal/templates/model/modelstatus.go @@ -17,7 +17,7 @@ package model import ( "fmt" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/util" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds/internal/templates/util" "sigs.k8s.io/kubebuilder/v3/pkg/machinery" ) diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/operatorfile.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/operatorfile.go similarity index 97% rename from pkg/quarkus/v1alpha/scaffolds/internal/templates/operatorfile.go rename to pkg/quarkus/v1beta/scaffolds/internal/templates/operatorfile.go index c4c8431..1c5f028 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/operatorfile.go +++ b/pkg/quarkus/v1beta/scaffolds/internal/templates/operatorfile.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/util" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1beta/scaffolds/internal/templates/util" "sigs.k8s.io/kubebuilder/v3/pkg/machinery" ) diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/operatorfile_test.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/operatorfile_test.go similarity index 100% rename from pkg/quarkus/v1alpha/scaffolds/internal/templates/operatorfile_test.go rename to pkg/quarkus/v1beta/scaffolds/internal/templates/operatorfile_test.go diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/pomxml.go similarity index 94% rename from pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go rename to pkg/quarkus/v1beta/scaffolds/internal/templates/pomxml.go index 9774c9f..e82f943 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go +++ b/pkg/quarkus/v1beta/scaffolds/internal/templates/pomxml.go @@ -53,12 +53,12 @@ const pomxmlTemplate = ` 3.10.1 true - 11 - 11 + 17 + 17 UTF-8 UTF-8 - 4.0.1 - 2.12.3.Final + 6.7.3 + 3.13.2 diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/templates_suite_test.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/templates_suite_test.go similarity index 100% rename from pkg/quarkus/v1alpha/scaffolds/internal/templates/templates_suite_test.go rename to pkg/quarkus/v1beta/scaffolds/internal/templates/templates_suite_test.go diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/util/file.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/util/file.go similarity index 100% rename from pkg/quarkus/v1alpha/scaffolds/internal/templates/util/file.go rename to pkg/quarkus/v1beta/scaffolds/internal/templates/util/file.go diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/util/file_test.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/util/file_test.go similarity index 100% rename from pkg/quarkus/v1alpha/scaffolds/internal/templates/util/file_test.go rename to pkg/quarkus/v1beta/scaffolds/internal/templates/util/file_test.go diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/util/util_suite_test.go b/pkg/quarkus/v1beta/scaffolds/internal/templates/util/util_suite_test.go similarity index 100% rename from pkg/quarkus/v1alpha/scaffolds/internal/templates/util/util_suite_test.go rename to pkg/quarkus/v1beta/scaffolds/internal/templates/util/util_suite_test.go diff --git a/pkg/quarkus/v1alpha/util/util.go b/pkg/quarkus/v1beta/util/util.go similarity index 100% rename from pkg/quarkus/v1alpha/util/util.go rename to pkg/quarkus/v1beta/util/util.go diff --git a/pkg/quarkus/v1alpha/util/util_suite_test.go b/pkg/quarkus/v1beta/util/util_suite_test.go similarity index 100% rename from pkg/quarkus/v1alpha/util/util_suite_test.go rename to pkg/quarkus/v1beta/util/util_suite_test.go diff --git a/pkg/quarkus/v1alpha/util/util_test.go b/pkg/quarkus/v1beta/util/util_test.go similarity index 100% rename from pkg/quarkus/v1alpha/util/util_test.go rename to pkg/quarkus/v1beta/util/util_test.go diff --git a/pkg/quarkus/v1alpha/v1_suite_test.go b/pkg/quarkus/v1beta/v1_suite_test.go similarity index 100% rename from pkg/quarkus/v1alpha/v1_suite_test.go rename to pkg/quarkus/v1beta/v1_suite_test.go diff --git a/testdata/quarkus/memcached-quarkus-operator/pom.xml b/testdata/quarkus/memcached-quarkus-operator/pom.xml index 661ea7c..f7409b7 100644 --- a/testdata/quarkus/memcached-quarkus-operator/pom.xml +++ b/testdata/quarkus/memcached-quarkus-operator/pom.xml @@ -9,14 +9,14 @@ 0.0.1-SNAPSHOT jar - 3.8.1 + 3.10.1 true 11 11 UTF-8 UTF-8 - 4.0.1 - 2.12.2.Final + 6.7.3 + 3.13.2 diff --git a/testdata/quarkus/memcached-quarkus-operator/src/main/resources/application.properties b/testdata/quarkus/memcached-quarkus-operator/src/main/resources/application.properties index 49a7598..9877790 100644 --- a/testdata/quarkus/memcached-quarkus-operator/src/main/resources/application.properties +++ b/testdata/quarkus/memcached-quarkus-operator/src/main/resources/application.properties @@ -3,5 +3,5 @@ quarkus.container-image.build=true quarkus.container-image.name=memcached-quarkus-operator-operator # set to true to automatically apply CRDs to the cluster when they get regenerated quarkus.operator-sdk.crd.apply=false -# set to true to automatically generate CSV from your code -quarkus.operator-sdk.generate-csv=false +# set to true to automatically generate OLM bundle from your code +quarkus.operator-sdk.bundle.enabled=false