diff --git a/deploy/olm-catalog/nexus-operator/0.3.0/nexus-operator.v0.3.0.clusterserviceversion.yaml b/deploy/olm-catalog/nexus-operator/0.3.0/nexus-operator.v0.3.0.clusterserviceversion.yaml index 7bf7b7e3..20d16dd9 100644 --- a/deploy/olm-catalog/nexus-operator/0.3.0/nexus-operator.v0.3.0.clusterserviceversion.yaml +++ b/deploy/olm-catalog/nexus-operator/0.3.0/nexus-operator.v0.3.0.clusterserviceversion.yaml @@ -292,7 +292,7 @@ spec: type: SingleNamespace - supported: false type: MultiNamespace - - supported: true + - supported: false type: AllNamespaces keywords: - nexus diff --git a/deploy/olm-catalog/nexus-operator/manifests/nexus-operator.clusterserviceversion.yaml b/deploy/olm-catalog/nexus-operator/manifests/nexus-operator.clusterserviceversion.yaml index 7bf7b7e3..20d16dd9 100644 --- a/deploy/olm-catalog/nexus-operator/manifests/nexus-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/nexus-operator/manifests/nexus-operator.clusterserviceversion.yaml @@ -292,7 +292,7 @@ spec: type: SingleNamespace - supported: false type: MultiNamespace - - supported: true + - supported: false type: AllNamespaces keywords: - nexus diff --git a/examples/nexus3-centos-no-volume-no-default-creds.yaml b/examples/nexus3-centos-no-volume-no-default-creds.yaml new file mode 100644 index 00000000..61c921c7 --- /dev/null +++ b/examples/nexus3-centos-no-volume-no-default-creds.yaml @@ -0,0 +1,33 @@ +apiVersion: apps.m88i.io/v1alpha1 +kind: Nexus +metadata: + name: nexus3 +spec: + # Number of Nexus pod replicas (can't be increased after creation) + replicas: 1 + # disable admin/admin123 default startup credentials, this will also disable server operations + generateRandomAdminPassword: true + # Here you can specify the image version to fulfill your needs. Defaults to docker.io/sonatype/nexus3:latest if useRedHatImage is set to false + #image: "docker.io/sonatype/nexus3:latest" + # let's use the centOS image since we do not have access to Red Hat Catalog + useRedHatImage: false + # Set the resources requests and limits for Nexus pods. See: https://help.sonatype.com/repomanager3/system-requirements + resources: + limits: + cpu: "2" + memory: "2Gi" + requests: + cpu: "1" + memory: "2Gi" + # Data persistence details + persistence: + # Should we persist Nexus data? (turn this to false only if you're evaluating this resource) + persistent: false + # details regarding networking + networking: + # expose please + expose: true + # How do you want to expose the Nexus server? In this case, NodePort is the way to go + exposeAs: "NodePort" + # The port that we will access the Nexus server. Make sure that this port is available in your node + nodePort: 31031 diff --git a/go.mod b/go.mod index 387cc52a..538349a0 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/googleapis/gnostic v0.3.1 github.com/heroku/docker-registry-client v0.0.0-20190909225348-afc9e1acc3d5 github.com/m88i/aicura v0.2.0 - github.com/openshift/api v3.9.0+incompatible + github.com/openshift/api v0.0.0-20200312145924-779a333deb13 // branch release-3.11 github.com/operator-framework/operator-sdk v0.18.1 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.6.1 @@ -27,7 +27,6 @@ require ( replace ( github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible // Required by OLM - github.com/openshift/api => github.com/openshift/api v3.9.1-0.20190814194116-a94e914914f4+incompatible k8s.io/client-go => k8s.io/client-go v0.18.3 // Required by prometheus-operator ) diff --git a/go.sum b/go.sum index 6d95b1c9..6af5dff8 100644 --- a/go.sum +++ b/go.sum @@ -777,8 +777,8 @@ github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59P github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700 h1:eNUVfm/RFLIi1G7flU5/ZRTHvd4kcVuzfRnL6OFlzCI= github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs= -github.com/openshift/api v3.9.1-0.20190814194116-a94e914914f4+incompatible h1:3n9aFEUt1YzNcWFJGvKiOeriyAsXeyDlpBPa3yenr6A= -github.com/openshift/api v3.9.1-0.20190814194116-a94e914914f4+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY= +github.com/openshift/api v0.0.0-20200312145924-779a333deb13 h1:8FyIpQ41MJUaLjWThSE/heRwocxRWxpxblLKu3zwqFA= +github.com/openshift/api v0.0.0-20200312145924-779a333deb13/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY= github.com/openshift/origin v0.0.0-20160503220234-8f127d736703/go.mod h1:0Rox5r9C8aQn6j1oAOQ0c1uC86mYbUFObzjBRvUKHII= github.com/openshift/prom-label-proxy v0.1.1-0.20191016113035-b8153a7f39f1/go.mod h1:p5MuxzsYP1JPsNGwtjtcgRHHlGziCJJfztff91nNixw= github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w= diff --git a/hack/go-test.sh b/hack/go-test.sh index df2ab2f1..c419fc2d 100755 --- a/hack/go-test.sh +++ b/hack/go-test.sh @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. - . ./hack/go-mod-env.sh ./hack/go-vet.sh diff --git a/hack/go-vet.sh b/hack/go-vet.sh index b3db7458..396a1a85 100755 --- a/hack/go-vet.sh +++ b/hack/go-vet.sh @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. - set -e GOPATH=$(go env GOPATH) ./hack/go-mod.sh