don't build orient chart

Jenkinsfile-Release

@@ -42,11 +42,9 @@ dockerizedBuildPipeline(
   buildAndTest: {
     sonatypeZionGitConfig()
     runSafely "git checkout ${gitBranch(env)}"
-    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'
-    runSafely 'git add nexus-repository-manager'
   },
   skipVulnerabilityScan: true,
   archiveArtifacts: 'docs/*',

build.sh

@@ -18,12 +18,9 @@ set -e
 
 # lint yaml of charts
 helm lint ./nxrm-aws-resiliency
-helm lint ./nexus-repository-manager
 
 # unit test
 (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 ./nxrm-aws-resiliency --destination docs
-helm package ./nexus-repository-manager --destination docs

nexus-repository-manager/Chart.yaml

@@ -3,10 +3,10 @@ name: nexus-repository-manager
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 54.1.0
+version: 62.0.0
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 3.54.1
+appVersion: 3.62.0
 
 description: Sonatype Nexus Repository Manager - Universal Binary repository
 

nexus-repository-manager/values.yaml

@@ -6,7 +6,7 @@ deploymentStrategy: Recreate
 image:
   # Sonatype Official Public Image
   repository: sonatype/nexus3
-  tag: 3.54.1
+  tag: 3.62.0
   pullPolicy: IfNotPresent
 imagePullSecrets:
 # for image registries that require login, specify the name of the existing

nxrm-aws-resiliency/Chart.yaml

@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 54.1.0
+version: 62.0.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: 3.54.1
+appVersion: 3.62.0
 
 keywords:
   - artifacts

nxrm-aws-resiliency/templates/external-dns-rbac.yml

@@ -1,4 +1,4 @@
-# comment out sa if it was previously created
+{{- if .Values.externaldns.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -64,3 +64,4 @@ spec:
           env:
             - name: AWS_DEFAULT_REGION
               value: {{ .Values.deployment.clusterRegion }}
+{{- end }}

nxrm-aws-resiliency/templates/fluent-bit.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.fluentbit.enabled -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -358,3 +359,4 @@ spec:
           effect: "NoExecute"
         - operator: "Exists"
           effect: "NoSchedule"
+{{- end }}

nxrm-aws-resiliency/templates/ingress.yaml

@@ -24,6 +24,7 @@ spec:
                 port:
                   number: {{ .Values.service.nexus.port }}
 ---
+{{- if .Values.ingress.dockerIngress.enabled -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -49,3 +50,4 @@ spec:
                 name: {{ .Chart.Name }}-docker-service
                 port:
                   number: {{ .Values.service.docker.port }}
+{{- end }}

nxrm-aws-resiliency/templates/namespaces.yaml

@@ -3,13 +3,16 @@ kind: Namespace
 metadata:
   name: {{ .Values.namespaces.nexusNs }}
 ---
+{{- if .Values.fluentbit.enabled }}
 apiVersion: v1
 kind: Namespace
 metadata:
   name: {{ .Values.namespaces.cloudwatchNs }}
+{{- end }}
 ---
+{{- if .Values.externaldns.enabled }}
 apiVersion: v1
 kind: Namespace
 metadata:
   name: {{ .Values.namespaces.externaldnsNs }}
----
+{{- end }}

nxrm-aws-resiliency/templates/serviceaccount.yaml

@@ -6,6 +6,7 @@ metadata:
   annotations:
     eks.amazonaws.com/role-arn: {{ .Values.serviceAccount.role }}
 ---
+{{- if .Values.externaldns.enabled }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -13,4 +14,4 @@ metadata:
   namespace: {{ .Values.namespaces.externaldnsNs }}
   annotations:
     eks.amazonaws.com/role-arn: {{ .Values.serviceAccount.externaldns.role }}
----
+{{- end }}

nxrm-aws-resiliency/templates/services.yaml

@@ -14,6 +14,7 @@ spec:
       port: {{ .Values.service.nexus.port }}
       targetPort: {{ .Values.service.nexus.targetPort }}
 ---
+{{- if .Values.service.docker.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -30,3 +31,4 @@ spec:
       protocol: {{ .Values.service.docker.protocol }}
       port: {{ .Values.service.docker.port }}
       targetPort: {{ .Values.service.docker.targetPort }}
+{{- end }}

nxrm-aws-resiliency/values.yaml

@@ -4,8 +4,11 @@ namespaces:
   cloudwatchNs: amazon-cloudwatch
   externaldnsNs: nexus-externaldns
 externaldns:
+  enabled: false
   domainFilter: example.com #your root domain e.g example.com
   awsZoneType: private # hosted zone to look at (valid values are public, private or no value for both)
+fluentbit:
+  enabled: false
 deployment:
   clusterRegion: us-east-1
   name: nxrm.deployment
@@ -54,7 +57,8 @@ ingress:
     alb.ingress.kubernetes.io/subnets: subnet-1,subnet-2 #comma separated list of subnet ids
     #alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS":443}]' uncomment for https
     #alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-1:0000000000000:certificate/00000000-1111-2222-3333-444444444444  # Uncomment for https. The AWS Certificate Manager ARN for your HTTPS certificate    
-  dockerIngress:  #Ingress for Docker Connector - comment out if you don't use docker repositories
+  dockerIngress: #Ingress for Docker Connector - comment out if you don't use docker repositories
+    enabled: false
     annotations:
       kubernetes.io/ingress.class: alb # comment out if you don't use docker repositories
       alb.ingress.kubernetes.io/scheme: internal # scheme comment out if you don't use docker repositories
@@ -76,27 +80,28 @@ pv:
   reclaimPolicy: Retain
   path: /nexus-repo-mgr-work-dir/work
   zones:
-    - us-east-1a
-    - us-east-1b
+    zone1: us-east-1a
+    zone2: us-east-1b
 pvc:
   accessModes: ReadWriteOnce
   storage: 100Gi
 
-service:  #Nexus Repo NodePort Service
+service: #Nexus Repo NodePort Service
   nexus:
-   type: NodePort
-   protocol: TCP
-   port: 80
-   targetPort: 8081
-  docker:  #Nodeport Service for Docker Service
-   type: NodePort
-   protocol: TCP
-   port: 9090
-   targetPort: 8081
+    type: NodePort
+    protocol: TCP
+    port: 80
+    targetPort: 8081
+  docker: #Nodeport Service for Docker Service
+    enabled: false
+    type: NodePort
+    protocol: TCP
+    port: 9090
+    targetPort: 8081
 secret:
   license:
-   arn: arn:aws:secretsmanager:us-east-1:000000000000:secret:nxrm-nexus-license
-   alias: nxrm-license.lic
+    arn: arn:aws:secretsmanager:us-east-1:000000000000:secret:nxrm-nexus-license
+    alias: nxrm-license.lic
   rds:
     arn: arn:aws:secretsmanager:us-east-1:000000000000:secret:nxrmrds-cred-nexus
   adminpassword: