diff --git a/Jenkinsfile-Release b/Jenkinsfile-Release index a849d2d..bb7a8cc 100644 --- a/Jenkinsfile-Release +++ b/Jenkinsfile-Release @@ -18,22 +18,17 @@ final jira = [ ] final jiraVersionMappings = [ - 'nexus-repository-manager-single-instance': 'helm-nxrm', - 'nexus-repository-manager-aws-resilient-single-instance': 'helm-nxrm-aws-resiliency' + 'nexus-repository-manager': 'helm-nxrm', + 'nxrm-aws-resiliency': 'helm-nxrm-aws-resiliency' ] final chartLocation = [ - 'nexus-repository-manager-single-instance': 'single-inst-oss-pro-kubernetes', - 'nexus-repository-manager-aws-resilient-single-instance': 'aws-single-instance-resiliency' + 'nexus-repository-manager': 'nexus-repository-manager', + 'nxrm-aws-resiliency': 'nxrm-aws-resiliency' ] properties([ parameters([ - choice( - choices: ['', 'nexus-repository-manager-single-instance', 'nexus-repository-manager-aws-resilient-single-instance'], - name: 'chart', - description: 'Chart to deploy.', - ), string( name: 'appVersion', description: 'Version of the application image, like "3.41.0"', @@ -60,9 +55,10 @@ dockerizedBuildPipeline( buildAndTest: { sonatypeZionGitConfig() runSafely "git checkout ${gitBranch(env)}" - runSafely "./upgrade.sh ./${chartLocation[params.chart]} ${chartVersion} ${params.appVersion}" - runSafely './build.sh' - runSafely 'git add aws-single-instance-resiliency single-inst-oss-pro-kubernetes' + runSafely "./upgrade.sh ./nexus-repository-manager ${chartVersion} ${params.appVersion}" + runSafely "./upgrade.sh ./nxrm-aws-resiliency ${chartVersion} ${params.appVersion}" + runSafely './build.sh' + runSafely 'git add nxrm-aws-resiliency nexus-repository-manager' }, skipVulnerabilityScan: true, archiveArtifacts: 'docs/*', @@ -99,31 +95,6 @@ dockerizedBuildPipeline( } ) -String verifyIndexYamlAndTarFile(String chart) { - // Get current version - def indexFile = readYaml file: 'docs/index.yaml' - String version = indexFile.entries[chart][0].version - - // Check tar file - String repo_url = 'https://sonatype.github.io/helm3-charts/' - verifyDownloadLinks( - urlParts: [repo_url, chart, '-', version], - urlSuffixes: ['.tgz'], retryCount: 2, retryDelay: 60 - ) - - // Get repository version - def response = httpRequest "${repo_url}/index.yaml" - def repositoryIndexFile = readYaml text:response.content - String repositoryVersion = repositoryIndexFile.entries[chart][0].version - - if (!version.equals(repositoryVersion)) { - error "Released version: ${version} is different " + - "from helm repository version: ${repositoryVersion}" - } - - return repositoryVersion -} - String calculateChartVersion(final String chartVersion, final String appVersion) { if (chartVersion) { return chartVersion diff --git a/build.sh b/build.sh index 17380e2..ae3098b 100755 --- a/build.sh +++ b/build.sh @@ -17,17 +17,13 @@ helm plugin install https://github.com/quintush/helm-unittest set -e # lint yaml of charts -helm lint ./aws-single-instance-resiliency -helm lint ./single-inst-oss-pro-kubernetes +helm lint ./nxrm-aws-resiliency +helm lint ./nexus-repository-manager # unit test -(cd ./aws-single-instance-resiliency; helm unittest -3 -t junit -o test-output.xml .) -(cd ./single-inst-oss-pro-kubernetes; helm unittest -3 -t junit -o test-output.xml .) +(cd ./nxrm-aws-resiliency; helm unittest -3 -t junit -o test-output.xml .) +(cd ./nexus-repository-manager; helm unittest -3 -t junit -o test-output.xml .) # package the charts into tgz archives -helm package ./aws-single-instance-resiliency --destination docs -helm package ./single-inst-oss-pro-kubernetes --destination docs - -# index the existing tgz archives -cd docs -helm repo index . --url https://sonatype.github.io/helm3-charts +helm package ./nxrm-aws-resiliency --destination docs +helm package ./nexus-repository-manager --destination docs diff --git a/docs/index.md b/docs/index.md deleted file mode 100644 index 1fb1dca..0000000 --- a/docs/index.md +++ /dev/null @@ -1,34 +0,0 @@ -## Helm3 Charts for Sonatype Products -### AWS Single-Instance Resilient Nexus Repository Manager Chart -These charts will deploy a Nexus Repository Manager instance to an AWS EKS cluster. - -The current release has been tested on AWS EKS running Kubernetes version 1.21 - -### Single-Instance Nexus Repository Manager OSS/Pro Kubernetes Chart -These charts are designed to work out of the box with minikube using both Ingress -and Ingress DNS addons. - -The current releases have been tested on minikube v1.25.1 running Kubernetes v1.23.1. - -### Add the Sonatype Repo to Your Helm - -`helm repo add sonatype https://sonatype.github.io/helm3-charts/` - -### Install a Server - -- Single-Instance Nexus Repository Manager OSS/Pro: `helm install nexus-repo sonatype/nexus-repository-manager` -- AWS Single-Instance Resilient Nexus Repository Manager: `helm install nxrm sonatype/nxrm-aws-resiliency --values values.yaml` -- Nexus IQ: `helm install nexus-iq sonatype/nexus-iq-server` - -### Get the Values for Configuring a Chart - -- Single-Instance Nexus Repository Manager OSS/Pro: `helm show values sonatype/nexus-repository-manager` -- AWS Single-Instance Resilient Nexus Repository Manager: `helm show values sonatype/nxrm-aws-resiliency` -- Nexus IQ: `helm show values sonatype/nexus-iq-server` - -Capture that output as your own `values.yaml` file, and provide it to the `helm install` -command with the `-f` option. - -### Source - -Visit https://github.com/sonatype/helm3-charts. diff --git a/single-inst-oss-pro-kubernetes/.DS_Store b/nexus-repository-manager/.DS_Store similarity index 100% rename from single-inst-oss-pro-kubernetes/.DS_Store rename to nexus-repository-manager/.DS_Store diff --git a/single-inst-oss-pro-kubernetes/Chart.yaml b/nexus-repository-manager/Chart.yaml similarity index 100% rename from single-inst-oss-pro-kubernetes/Chart.yaml rename to nexus-repository-manager/Chart.yaml diff --git a/single-inst-oss-pro-kubernetes/LICENSE b/nexus-repository-manager/LICENSE similarity index 100% rename from single-inst-oss-pro-kubernetes/LICENSE rename to nexus-repository-manager/LICENSE diff --git a/single-inst-oss-pro-kubernetes/README.md b/nexus-repository-manager/README.md similarity index 100% rename from single-inst-oss-pro-kubernetes/README.md rename to nexus-repository-manager/README.md diff --git a/single-inst-oss-pro-kubernetes/templates/.DS_Store b/nexus-repository-manager/templates/.DS_Store similarity index 100% rename from single-inst-oss-pro-kubernetes/templates/.DS_Store rename to nexus-repository-manager/templates/.DS_Store diff --git a/single-inst-oss-pro-kubernetes/templates/NOTES.txt b/nexus-repository-manager/templates/NOTES.txt similarity index 100% rename from single-inst-oss-pro-kubernetes/templates/NOTES.txt rename to nexus-repository-manager/templates/NOTES.txt diff --git a/single-inst-oss-pro-kubernetes/templates/_helpers.tpl b/nexus-repository-manager/templates/_helpers.tpl similarity index 100% rename from single-inst-oss-pro-kubernetes/templates/_helpers.tpl rename to nexus-repository-manager/templates/_helpers.tpl diff --git a/single-inst-oss-pro-kubernetes/templates/configmap-properties.yaml b/nexus-repository-manager/templates/configmap-properties.yaml similarity index 100% rename from single-inst-oss-pro-kubernetes/templates/configmap-properties.yaml rename to nexus-repository-manager/templates/configmap-properties.yaml diff --git a/single-inst-oss-pro-kubernetes/templates/configmap.yaml b/nexus-repository-manager/templates/configmap.yaml similarity index 100% rename from single-inst-oss-pro-kubernetes/templates/configmap.yaml rename to nexus-repository-manager/templates/configmap.yaml diff --git a/single-inst-oss-pro-kubernetes/templates/deployment.yaml b/nexus-repository-manager/templates/deployment.yaml similarity index 100% rename from single-inst-oss-pro-kubernetes/templates/deployment.yaml rename to nexus-repository-manager/templates/deployment.yaml diff --git a/single-inst-oss-pro-kubernetes/templates/ingress.yaml b/nexus-repository-manager/templates/ingress.yaml similarity index 100% rename from single-inst-oss-pro-kubernetes/templates/ingress.yaml rename to nexus-repository-manager/templates/ingress.yaml diff --git a/single-inst-oss-pro-kubernetes/templates/proxy-route.yaml b/nexus-repository-manager/templates/proxy-route.yaml similarity index 100% rename from single-inst-oss-pro-kubernetes/templates/proxy-route.yaml rename to nexus-repository-manager/templates/proxy-route.yaml diff --git a/single-inst-oss-pro-kubernetes/templates/pv.yaml b/nexus-repository-manager/templates/pv.yaml similarity index 100% rename from single-inst-oss-pro-kubernetes/templates/pv.yaml rename to nexus-repository-manager/templates/pv.yaml diff --git a/single-inst-oss-pro-kubernetes/templates/pvc.yaml b/nexus-repository-manager/templates/pvc.yaml similarity index 100% rename from single-inst-oss-pro-kubernetes/templates/pvc.yaml rename to nexus-repository-manager/templates/pvc.yaml diff --git a/single-inst-oss-pro-kubernetes/templates/route.yaml b/nexus-repository-manager/templates/route.yaml similarity index 100% rename from single-inst-oss-pro-kubernetes/templates/route.yaml rename to nexus-repository-manager/templates/route.yaml diff --git a/single-inst-oss-pro-kubernetes/templates/secret.yaml b/nexus-repository-manager/templates/secret.yaml similarity index 100% rename from single-inst-oss-pro-kubernetes/templates/secret.yaml rename to nexus-repository-manager/templates/secret.yaml diff --git a/single-inst-oss-pro-kubernetes/templates/service.yaml b/nexus-repository-manager/templates/service.yaml similarity index 100% rename from single-inst-oss-pro-kubernetes/templates/service.yaml rename to nexus-repository-manager/templates/service.yaml diff --git a/single-inst-oss-pro-kubernetes/templates/serviceaccount.yaml b/nexus-repository-manager/templates/serviceaccount.yaml similarity index 100% rename from single-inst-oss-pro-kubernetes/templates/serviceaccount.yaml rename to nexus-repository-manager/templates/serviceaccount.yaml diff --git a/single-inst-oss-pro-kubernetes/templates/test/test-check-logs.yaml b/nexus-repository-manager/templates/test/test-check-logs.yaml similarity index 100% rename from single-inst-oss-pro-kubernetes/templates/test/test-check-logs.yaml rename to nexus-repository-manager/templates/test/test-check-logs.yaml diff --git a/single-inst-oss-pro-kubernetes/templates/test/test-connection.yaml b/nexus-repository-manager/templates/test/test-connection.yaml similarity index 100% rename from single-inst-oss-pro-kubernetes/templates/test/test-connection.yaml rename to nexus-repository-manager/templates/test/test-connection.yaml diff --git a/single-inst-oss-pro-kubernetes/tests/deployment_test.yaml b/nexus-repository-manager/tests/deployment_test.yaml similarity index 100% rename from single-inst-oss-pro-kubernetes/tests/deployment_test.yaml rename to nexus-repository-manager/tests/deployment_test.yaml diff --git a/single-inst-oss-pro-kubernetes/tests/ingress_test.yaml b/nexus-repository-manager/tests/ingress_test.yaml similarity index 100% rename from single-inst-oss-pro-kubernetes/tests/ingress_test.yaml rename to nexus-repository-manager/tests/ingress_test.yaml diff --git a/single-inst-oss-pro-kubernetes/values.yaml b/nexus-repository-manager/values.yaml similarity index 100% rename from single-inst-oss-pro-kubernetes/values.yaml rename to nexus-repository-manager/values.yaml diff --git a/aws-single-instance-resiliency/Chart.yaml b/nxrm-aws-resiliency/Chart.yaml similarity index 100% rename from aws-single-instance-resiliency/Chart.yaml rename to nxrm-aws-resiliency/Chart.yaml diff --git a/aws-single-instance-resiliency/LICENSE b/nxrm-aws-resiliency/LICENSE similarity index 100% rename from aws-single-instance-resiliency/LICENSE rename to nxrm-aws-resiliency/LICENSE diff --git a/aws-single-instance-resiliency/README.md b/nxrm-aws-resiliency/README.md similarity index 100% rename from aws-single-instance-resiliency/README.md rename to nxrm-aws-resiliency/README.md diff --git a/aws-single-instance-resiliency/templates/NOTES.txt b/nxrm-aws-resiliency/templates/NOTES.txt similarity index 100% rename from aws-single-instance-resiliency/templates/NOTES.txt rename to nxrm-aws-resiliency/templates/NOTES.txt diff --git a/aws-single-instance-resiliency/templates/deployment.yaml b/nxrm-aws-resiliency/templates/deployment.yaml similarity index 100% rename from aws-single-instance-resiliency/templates/deployment.yaml rename to nxrm-aws-resiliency/templates/deployment.yaml diff --git a/aws-single-instance-resiliency/templates/fluent-bit.yaml b/nxrm-aws-resiliency/templates/fluent-bit.yaml similarity index 100% rename from aws-single-instance-resiliency/templates/fluent-bit.yaml rename to nxrm-aws-resiliency/templates/fluent-bit.yaml diff --git a/aws-single-instance-resiliency/templates/ingress.yaml b/nxrm-aws-resiliency/templates/ingress.yaml similarity index 100% rename from aws-single-instance-resiliency/templates/ingress.yaml rename to nxrm-aws-resiliency/templates/ingress.yaml diff --git a/aws-single-instance-resiliency/templates/namespaces.yaml b/nxrm-aws-resiliency/templates/namespaces.yaml similarity index 100% rename from aws-single-instance-resiliency/templates/namespaces.yaml rename to nxrm-aws-resiliency/templates/namespaces.yaml diff --git a/aws-single-instance-resiliency/templates/nxrm-logback-tasklogfile-override.yaml b/nxrm-aws-resiliency/templates/nxrm-logback-tasklogfile-override.yaml similarity index 100% rename from aws-single-instance-resiliency/templates/nxrm-logback-tasklogfile-override.yaml rename to nxrm-aws-resiliency/templates/nxrm-logback-tasklogfile-override.yaml diff --git a/aws-single-instance-resiliency/templates/pv.yaml b/nxrm-aws-resiliency/templates/pv.yaml similarity index 100% rename from aws-single-instance-resiliency/templates/pv.yaml rename to nxrm-aws-resiliency/templates/pv.yaml diff --git a/aws-single-instance-resiliency/templates/pvc.yaml b/nxrm-aws-resiliency/templates/pvc.yaml similarity index 100% rename from aws-single-instance-resiliency/templates/pvc.yaml rename to nxrm-aws-resiliency/templates/pvc.yaml diff --git a/aws-single-instance-resiliency/templates/secret.yaml b/nxrm-aws-resiliency/templates/secret.yaml similarity index 100% rename from aws-single-instance-resiliency/templates/secret.yaml rename to nxrm-aws-resiliency/templates/secret.yaml diff --git a/aws-single-instance-resiliency/templates/serviceaccount.yaml b/nxrm-aws-resiliency/templates/serviceaccount.yaml similarity index 100% rename from aws-single-instance-resiliency/templates/serviceaccount.yaml rename to nxrm-aws-resiliency/templates/serviceaccount.yaml diff --git a/aws-single-instance-resiliency/templates/services.yaml b/nxrm-aws-resiliency/templates/services.yaml similarity index 100% rename from aws-single-instance-resiliency/templates/services.yaml rename to nxrm-aws-resiliency/templates/services.yaml diff --git a/aws-single-instance-resiliency/templates/storageclass.yaml b/nxrm-aws-resiliency/templates/storageclass.yaml similarity index 100% rename from aws-single-instance-resiliency/templates/storageclass.yaml rename to nxrm-aws-resiliency/templates/storageclass.yaml diff --git a/aws-single-instance-resiliency/values.yaml b/nxrm-aws-resiliency/values.yaml similarity index 100% rename from aws-single-instance-resiliency/values.yaml rename to nxrm-aws-resiliency/values.yaml