diff --git a/nxrm-ha/README.md b/nxrm-ha/README.md index 6a5763f..4b48113 100644 --- a/nxrm-ha/README.md +++ b/nxrm-ha/README.md @@ -290,7 +290,7 @@ After removing the deployment, ensure that the namespace is deleted and that Nex The following table lists the configurable parameters of the Nexus chart and their default values. | Parameter | Description | Default | -|-------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------| +| ----------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | | `namespaces.nexusNs.enabled` | Whether a namespace should be created for the Kubernetes resources needed Nexus Repository pod(s) | `true` | | `namespaces.nexusNs.name` | The namespace into which Kubernetes resources for Nexus Repository are installed into, if set to `''` the release namespace is used | `nexusrepo` | | `namespaces.cloudwatchNs.enabled` | Whether a namespace should be created to install the Kubernetes resources needed by fluentbit | `false` | @@ -318,6 +318,7 @@ The following table lists the configurable parameters of the Nexus chart and the | `statefulset.annotations` | Annotations to enhance statefulset configuration | {} | | `statefulset.podAnnotations` | Pod annotations | {} | | `statefulset.nodeSelector` | Node selectors | {} | +| `statefulset.tolerations` | Tolerations | [] | | `statefulset.hostAliases` | Aliases for IPs in /etc/hosts | [] | | `statefulset.postStart.command` | Command to run after starting the container | `null` | | `statefulset.preStart.command` | Command to run before starting the container | `null` | @@ -335,7 +336,7 @@ The following table lists the configurable parameters of the Nexus chart and the | `statefulset.container.env.nexusDBPort` | The database port of the PostgreSQL database to use. | 5432 | | `statefulset.container.env.install4jAddVmParams` | Xmx and Xms settings for JVM | -Xms2703m -Xmx2703m | | `statefulset.container.env.jdbcUrlParams` | Additional parameters to append to the database url. Expected format is `"?foo=bar&baz=foo"` | null | -| `statefulset.container.additionalEnv` | Additional environment variables for the Nexus Repository container. You can also use this setting to override a default env variable by specifying the same key/name as the default env variable you wish override. Specify this as a block of name and value pairs (e.g., "
additionalEnv:
- name: foo
value: bar
- name: foo2
value: bar2") | null | +| `statefulset.container.additionalEnv` | Additional environment variables for the Nexus Repository container. You can also use this setting to override a default env variable by specifying the same key/name as the default env variable you wish override. Specify this as a block of name and value pairs (e.g., "
additionalEnv:
- name: foo
value: bar
- name: foo2
value: bar2") | null | | `statefulset.requestLogContainer.image.repository` | Image registry URL for a container which tails Nexus Repository's request log | busybox | | `statefulset.requestLogContainer.image.tag` | Image tag for a container which tails Nexus Repository's request log | 1.33.1 | | `statefulset.requestLogContainer.resources.requests.cpu` | The minimum cpu the request log container can request | 0.1 | @@ -369,7 +370,7 @@ The following table lists the configurable parameters of the Nexus chart and the | `statefulset.readinessProbe.failureThreshold` | Number of attempts before failure | 6 | | `statefulset.readinessProbe.timeoutSeconds` | Time in seconds after readiness probe times out | 1 | | `statefulset.readinessProbe.path` | Path for ReadinessProbe | / | -| `statefulset.imagePullSecrets` | The pull secret for private image registries | `{}` | +| `statefulset.imagePullSecrets` | The pull secret for private image registries | `[]` | | `ingress.enabled` | Whether or not to create the Ingress | false | | `ingress.host` | Ingress host | `null` | | `ingress.hostPath` | Path for ingress rules. | `/` | diff --git a/nxrm-ha/templates/image-pull-secret.yaml b/nxrm-ha/templates/image-pull-secret.yaml deleted file mode 100644 index 6f9bd89..0000000 --- a/nxrm-ha/templates/image-pull-secret.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{- if .Values.statefulset.imagePullSecrets }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "nexus.name" . }}-imagepullsecret - namespace: {{ default .Release.Namespace .Values.namespaces.nexusNs.name | quote }} - labels: - {{- include "nexus.labels" . | nindent 4 }} - {{- if .Values.nexus.extraLabels }} - {{- with .Values.nexus.extraLabels }} - {{ toYaml . | nindent 4 }} - {{- end }} - {{- end }} -data: - .dockerconfigjson: {{ .Values.statefulset.imagePullSecrets.secret }} - -type: kubernetes.io/dockerconfigjson -{{- end }} diff --git a/nxrm-ha/templates/statefulset.yaml b/nxrm-ha/templates/statefulset.yaml index 092dd7c..4421c42 100644 --- a/nxrm-ha/templates/statefulset.yaml +++ b/nxrm-ha/templates/statefulset.yaml @@ -64,7 +64,7 @@ spec: {{- end }} {{- if .Values.statefulset.imagePullSecrets }} imagePullSecrets: - - name: {{ template "nexus.name" . }}-imagepullsecret + {{ toYaml . | nindent 8 }} {{- end }} containers: - name: nxrm-app @@ -275,7 +275,7 @@ spec: persistentVolumeClaim: claimName: {{ .Values.pvc.existingClaim }} {{ end }} - {{- with .Values.tolerations }} + {{- with .Values.statefulset.tolerations }} tolerations: {{ toYaml . | nindent 8 }} {{- end }} diff --git a/nxrm-ha/values.yaml b/nxrm-ha/values.yaml index cb16791..332a4f9 100644 --- a/nxrm-ha/values.yaml +++ b/nxrm-ha/values.yaml @@ -16,7 +16,7 @@ serviceAccount: # If using externaldns, role with route53 permissions needed by external-dns # eks.amazonaws.com/role-arn: arn:aws:iam::000000000000:role/nxrm-nexus-role azure: - enabled: false #set to true to enable azure specific yamls/snippets + enabled: false #set to true to enable azure specific yamls/snippets keyvault: enabled: false # set to true to pull license, db and nexus admin password secrets from azure key vault aws: @@ -42,6 +42,7 @@ statefulset: annotations: {} podAnnotations: {} nodeSelector: {} + tolerations: [] # hostAliases allows the modification of the hosts file inside a container hostAliases: [] # - ip: "192.168.1.10" @@ -51,7 +52,7 @@ statefulset: # Uncomment and modify this to run a command after starting the nexus container. postStart: - command: null # '["/bin/sh", "-c", "ls"]' + command: null # '["/bin/sh", "-c", "ls"]' preStart: command: null @@ -157,7 +158,7 @@ statefulset: timeoutSeconds: 1 failureThreshold: 6 path: / - imagePullSecrets: {} + imagePullSecrets: [] ingress: name: "nexus-ingress" enabled: false @@ -167,22 +168,22 @@ ingress: defaultRule: false additionalRules: null ingressClassName: null # e.g. nginx, alb -# tls: -# - secretName: "tlsSecretName1" -# hosts: -# - repo.foo1 -# - repo.bar1 -# - secretName: "tlsSecretName2" -# hosts: -# - repo.foo2 -# - repo.bar2 + # tls: + # - secretName: "tlsSecretName1" + # hosts: + # - repo.foo1 + # - repo.bar1 + # - secretName: "tlsSecretName2" + # hosts: + # - repo.foo2 + # - repo.bar2 annotations: # Note: the annotations below are just a guide; delete or insert more as needed depending on your use case: aws, azure, on prem # nginx.ingress.kubernetes.io/ssl-redirect: "false" # alb.ingress.kubernetes.io/scheme: internal # scheme # alb.ingress.kubernetes.io/subnets: subnet-1,subnet-2 #comma separated list of subnet ids - # alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS":443}]' - # alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-1:0000000000000:certificate/00000000-1111-2222-3333-444444444444 # The AWS Certificate Manager ARN for your HTTPS certificate +# alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS":443}]' +# alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-1:0000000000000:certificate/00000000-1111-2222-3333-444444444444 # The AWS Certificate Manager ARN for your HTTPS certificate # alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-1:0000000000000:certificate/00000000-1111-2222-3333-444444444444 # Comment out if you don't use docker repositories - The AWS Certificate Manager ARN for your HTTPS certificate # external-dns.alpha.kubernetes.io/hostname: dockerrepo1.example.com, dockerrepo2.example.com, dockerrepo3.example.com logStorage: @@ -205,7 +206,7 @@ pvc: enabled: false existingClaim: null -service: #Nexus Repo NodePort Service +service: #Nexus Repo NodePort Service annotations: {} nexus: enabled: false @@ -270,7 +271,7 @@ nexus: enabled: false type: NodePort protocol: TCP - # registries: + registries: [] # - host: chart.local # port: 5000 # secretName: registry-secret