From e76d97d6a6d631ad58b774cf8166c8cd70725dff Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Wed, 21 Apr 2021 13:44:04 -0400 Subject: [PATCH 01/22] bigbang compliant --- .gitlab-ci.yml | 4 +++ CHANGELOG.md | 2 ++ CONTRIBUTING.md | 22 ++++++++++++++++ chart/templates/bigbang/nexus-vs.yaml | 18 ++++++++++++++ chart/values.yaml | 9 +++++++ tests/README.md | 1 + tests/cypress.json | 10 ++++++++ tests/cypress/nexus-healthspec.js | 5 ++++ tests/main-test-gateway.yaml | 36 +++++++++++++++++++++++++++ tests/test-values.yml | 23 +++++++++++++++++ 10 files changed, 130 insertions(+) create mode 100644 .gitlab-ci.yml create mode 100644 CHANGELOG.md create mode 100644 CONTRIBUTING.md create mode 100644 chart/templates/bigbang/nexus-vs.yaml create mode 100644 tests/README.md create mode 100644 tests/cypress.json create mode 100644 tests/cypress/nexus-healthspec.js create mode 100644 tests/main-test-gateway.yaml create mode 100644 tests/test-values.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..6e9f482 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,4 @@ +include: + - project: 'platform-one/big-bang/pipeline-templates/pipeline-templates' + ref: master + file: '/templates/package-tests.yml' diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..4dc68c6 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,2 @@ +# Changelog + diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..dd0eeba --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,22 @@ +# Contributing + +Thanks for contributing to this repository! + +This repository follows the following conventions: + +* [Semantic Versioning](https://semver.org/) +* [Keep a Changelog](https://keepachangelog.com/) +* [Conventional Commits](https://www.conventionalcommits.org/) + +Development requires the Kubernetes CLI tool as well as a local Kubernetes cluster. [k3d](https://k3d.io) is recommended as a lightweight local option for standing up Kubernetes clusters. + +To contribute a change: + +1. Create a branch on the cloned repository +2. Make the changes in code. +3. Write tests using [cypress](https://www.cypress.io) and [Conftest](https://conftest.dev) +4. Make commits using the [Conventional Commits](https://www.conventionalcommits.org/) format. This helps with automation for changelog. Update `CHANGELOG.md` in the same commit using the [Keep a Changelog](https://keepachangelog.com). Depending on tooling maturity, this step may be automated. +5. Open a merge request using one of the provided templates. If this merge request is solving a preexisting issue, add the issue reference into the description of the MR. +6. During this time, ensure that all new commits are rebased into your branch so that it remains up to date with the `main` branch. +7. Wait for a maintainer of the repository (see CODEOWNERS) to approve. +8. If you have permissions to merge, you are responsible for merging. Otherwise, a CODEOWNER will merge the commit. diff --git a/chart/templates/bigbang/nexus-vs.yaml b/chart/templates/bigbang/nexus-vs.yaml new file mode 100644 index 0000000..0cb2738 --- /dev/null +++ b/chart/templates/bigbang/nexus-vs.yaml @@ -0,0 +1,18 @@ +{{- if .Values.istio.enabled -}} +apiVersion: networking.istio.io/v1alpha3 +kind: VirtualService +metadata: + name: coder + namespace: {{ .Release.Namespace }} +spec: + hosts: + - "coder.{{ .Values.hostname }}" + gateways: + - istio-system/main + http: + route: + - destination: + port: + number: 8080 + host: nexus-sonatype-nexus +{{- end }} diff --git a/chart/values.yaml b/chart/values.yaml index c6da164..2da3636 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -333,3 +333,12 @@ additionalConfigMaps: [] # strictContentTypeValidation: 'true' # versionPolicy: 'RELEASE' # layoutPolicy: 'STRICT' + +hostname: bigbang.dev +istio: + # Toggle istio interaction + # TODO: Toggling does nothing yet, this is always on + enabled: false +monitoring: + enabled: false + diff --git a/tests/README.md b/tests/README.md new file mode 100644 index 0000000..d735775 --- /dev/null +++ b/tests/README.md @@ -0,0 +1 @@ +Cypress tests run headless calling the script cy-run.sh \ No newline at end of file diff --git a/tests/cypress.json b/tests/cypress.json new file mode 100644 index 0000000..43b18da --- /dev/null +++ b/tests/cypress.json @@ -0,0 +1,10 @@ +{ + + "pluginsFile": false, + "supportFile": false, + "fixturesFolder": false, + "env": { + "nexus_url": "nexus.bigbang.dev" + + } +} diff --git a/tests/cypress/nexus-healthspec.js b/tests/cypress/nexus-healthspec.js new file mode 100644 index 0000000..dbaa644 --- /dev/null +++ b/tests/cypress/nexus-healthspec.js @@ -0,0 +1,5 @@ +describe('Basic prometheus', function() { + it('Visits the prometheus sign in page', function() { + cy.visit(Cypress.env('nexus_url')) + }) +}) diff --git a/tests/main-test-gateway.yaml b/tests/main-test-gateway.yaml new file mode 100644 index 0000000..298b582 --- /dev/null +++ b/tests/main-test-gateway.yaml @@ -0,0 +1,36 @@ +apiVersion: networking.istio.io/v1beta1 +kind: Gateway +metadata: + annotations: + meta.helm.sh/release-name: istio-system-istio + meta.helm.sh/release-namespace: istio-system + creationTimestamp: "2020-12-08T01:19:38Z" + generation: 1 + labels: + app.kubernetes.io/managed-by: Helm + name: main + namespace: istio-system + resourceVersion: "1661" + selfLink: /apis/networking.istio.io/v1beta1/namespaces/istio-system/gateways/main + uid: 9cfaa8c6-744a-49b3-abc0-b3960153c9b2 +spec: + selector: + istio: ingressgateway + servers: + - hosts: + - '*' + port: + name: http + number: 80 + protocol: HTTP + tls: + httpsRedirect: true + - hosts: + - '*.bigbang.dev' + port: + name: https + number: 443 + protocol: HTTPS + tls: + credentialName: wildcard-cert + mode: SIMPLE diff --git a/tests/test-values.yml b/tests/test-values.yml new file mode 100644 index 0000000..6009403 --- /dev/null +++ b/tests/test-values.yml @@ -0,0 +1,23 @@ +flux: + enabled: true + +istio: + enabled: true + +global: + imagePullSecrets: + - name: private-registry-mil + +grafana: + image: + pullSecrets: + - private-registry-mil + +kube-state-metrics: + imagePullSecrets: + - name: private-registry-mil + +prometheus-node-exporter: + serviceAccount: + imagePullSecrets: + - name: private-registry-mil -- GitLab From a4d7f57f7daaa7065257d5e950647e98f97f50fc Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Wed, 21 Apr 2021 14:19:39 -0400 Subject: [PATCH 02/22] bigbang compliant --- chart/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chart/values.yaml b/chart/values.yaml index 2da3636..672b94b 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -19,8 +19,8 @@ initAdminPassword: password: "admin321" nexus: - imageName: quay.io/travelaudience/docker-nexus - imageTag: 3.27.0 + imageName: registry1.dso.mil/ironbank/sonatype/nexus/nexus + imageTag: 3.29.0-02 imagePullPolicy: IfNotPresent # Uncomment this to scheduler pods on priority # priorityClassName: "high-priority" @@ -101,7 +101,7 @@ route: nexusProxy: enabled: true # svcName: proxy-svc - imageName: quay.io/travelaudience/docker-nexus-proxy + imageName: registry.dso.mil/platform-one/big-bang/apps/sandbox/nexus/nexus-proxy imageTag: 2.6.0 imagePullPolicy: IfNotPresent port: 8080 -- GitLab From 8052551d7bead723290ee68c06fd2d70fbce9a59 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Wed, 21 Apr 2021 14:25:25 -0400 Subject: [PATCH 03/22] bigbang compliant --- tests/test-values.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/tests/test-values.yml b/tests/test-values.yml index 6009403..e8f0caf 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -1,23 +1,4 @@ -flux: - enabled: true istio: enabled: true -global: - imagePullSecrets: - - name: private-registry-mil - -grafana: - image: - pullSecrets: - - private-registry-mil - -kube-state-metrics: - imagePullSecrets: - - name: private-registry-mil - -prometheus-node-exporter: - serviceAccount: - imagePullSecrets: - - name: private-registry-mil -- GitLab From be1bb42240cf6293c5d0ecb972a68bdbabf15891 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Wed, 21 Apr 2021 14:56:30 -0400 Subject: [PATCH 04/22] bigbang compliant --- tests/main-test-gateway.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tests/main-test-gateway.yaml b/tests/main-test-gateway.yaml index 298b582..1c7d7d1 100644 --- a/tests/main-test-gateway.yaml +++ b/tests/main-test-gateway.yaml @@ -1,18 +1,8 @@ apiVersion: networking.istio.io/v1beta1 kind: Gateway metadata: - annotations: - meta.helm.sh/release-name: istio-system-istio - meta.helm.sh/release-namespace: istio-system - creationTimestamp: "2020-12-08T01:19:38Z" - generation: 1 - labels: - app.kubernetes.io/managed-by: Helm name: main namespace: istio-system - resourceVersion: "1661" - selfLink: /apis/networking.istio.io/v1beta1/namespaces/istio-system/gateways/main - uid: 9cfaa8c6-744a-49b3-abc0-b3960153c9b2 spec: selector: istio: ingressgateway -- GitLab From ce65664b1bfae304236a1069631a951bbbe840a8 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Wed, 21 Apr 2021 15:02:39 -0400 Subject: [PATCH 05/22] bigbang compliant --- chart/templates/bigbang/nexus-vs.yaml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 chart/templates/bigbang/nexus-vs.yaml diff --git a/chart/templates/bigbang/nexus-vs.yaml b/chart/templates/bigbang/nexus-vs.yaml deleted file mode 100644 index 0cb2738..0000000 --- a/chart/templates/bigbang/nexus-vs.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{- if .Values.istio.enabled -}} -apiVersion: networking.istio.io/v1alpha3 -kind: VirtualService -metadata: - name: coder - namespace: {{ .Release.Namespace }} -spec: - hosts: - - "coder.{{ .Values.hostname }}" - gateways: - - istio-system/main - http: - route: - - destination: - port: - number: 8080 - host: nexus-sonatype-nexus -{{- end }} -- GitLab From f98dcd2035c6da3ffd3ce15d3ebead46015daa72 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Wed, 21 Apr 2021 15:23:00 -0400 Subject: [PATCH 06/22] bigbang compliant --- chart/templates/bigbang/nexus-vs.yaml | 21 +++++++++++++++++++++ tests/test-values.yml | 4 +++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 chart/templates/bigbang/nexus-vs.yaml diff --git a/chart/templates/bigbang/nexus-vs.yaml b/chart/templates/bigbang/nexus-vs.yaml new file mode 100644 index 0000000..6a0aa75 --- /dev/null +++ b/chart/templates/bigbang/nexus-vs.yaml @@ -0,0 +1,21 @@ +{{- if .Values.istio.enabled -}} +apiVersion: networking.istio.io/v1alpha3 +kind: VirtualService +metadata: + name: coder + namespace: {{ .Release.Namespace }} +spec: + hosts: + - "nexus.{{ .Values.hostname }}" + gateways: + - istio-system/main + http: + - match: + + route: + - destination: + port: + number: 8080 + host: nexus-sonatype-nexus + {{- end -}} + diff --git a/tests/test-values.yml b/tests/test-values.yml index e8f0caf..f75383e 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -1,4 +1,6 @@ - +nexus: + imagePullSecret: + - name: private-registry-mil istio: enabled: true -- GitLab From 29ff9c04d7cdbb7b7b3998240bf719dfce419bc3 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Wed, 21 Apr 2021 15:33:31 -0400 Subject: [PATCH 07/22] bigbang compliant --- chart/templates/deployment-statefulset.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/chart/templates/deployment-statefulset.yaml b/chart/templates/deployment-statefulset.yaml index 28e7c71..fe758ed 100644 --- a/chart/templates/deployment-statefulset.yaml +++ b/chart/templates/deployment-statefulset.yaml @@ -18,6 +18,10 @@ metadata: {{ toYaml .Values.deployment.annotations | indent 4 }} {{- end }} spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} replicas: {{ .Values.replicaCount }} {{- if .Values.statefulset.enabled }} {{- if .Values.nexusProxy.svcName }} @@ -56,10 +60,7 @@ spec: hostAliases: {{ toYaml .Values.nexus.hostAliases | indent 8 }} {{- end }} - {{- if .Values.nexus.imagePullSecret }} - imagePullSecrets: - - name: {{ .Values.nexus.imagePullSecret }} - {{- end }} + {{- if .Values.serviceAccount.name }} serviceAccountName: {{ .Values.serviceAccount.name | quote }} {{- else if .Values.serviceAccount.create }} -- GitLab From 6789f8ad34158d7512b8bd03fb671b9517c4ba46 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Wed, 21 Apr 2021 15:51:26 -0400 Subject: [PATCH 08/22] bigbang compliant --- chart/templates/deployment-statefulset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/templates/deployment-statefulset.yaml b/chart/templates/deployment-statefulset.yaml index fe758ed..e4956b5 100644 --- a/chart/templates/deployment-statefulset.yaml +++ b/chart/templates/deployment-statefulset.yaml @@ -18,7 +18,7 @@ metadata: {{ toYaml .Values.deployment.annotations | indent 4 }} {{- end }} spec: - {{- with .Values.imagePullSecrets }} + {{- with .Values.nexus.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} -- GitLab From d7a64ccd8abc9e34fdf71fa738a9646c07793c1b Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Wed, 21 Apr 2021 16:15:05 -0400 Subject: [PATCH 09/22] bigbang compliant --- chart/templates/deployment-statefulset.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/chart/templates/deployment-statefulset.yaml b/chart/templates/deployment-statefulset.yaml index e4956b5..ea28a44 100644 --- a/chart/templates/deployment-statefulset.yaml +++ b/chart/templates/deployment-statefulset.yaml @@ -18,10 +18,7 @@ metadata: {{ toYaml .Values.deployment.annotations | indent 4 }} {{- end }} spec: - {{- with .Values.nexus.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} + replicas: {{ .Values.replicaCount }} {{- if .Values.statefulset.enabled }} {{- if .Values.nexusProxy.svcName }} @@ -73,6 +70,10 @@ spec: - name: nexus image: {{ .Values.nexus.imageName }}:{{ .Values.nexus.imageTag }} imagePullPolicy: {{ .Values.nexus.imagePullPolicy }} + {{- with .Values.nexus.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 4 }} + {{- end }} {{- if .Values.deployment.postStart.command }} lifecycle: postStart: -- GitLab From 1c61d1a23af3b2da2dcf70032391c97035564ae6 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Wed, 21 Apr 2021 16:28:13 -0400 Subject: [PATCH 10/22] bigbang compliant --- tests/test-values.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/test-values.yml b/tests/test-values.yml index f75383e..b18eb74 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -1,6 +1,8 @@ -nexus: - imagePullSecret: - - name: private-registry-mil -istio: + +istio: enabled: true +nexus: + imagePullSecrets: + - name: private-registry-mil + -- GitLab From 6b38e002e14da882b730002508f0ca66bd9727ba Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Wed, 21 Apr 2021 16:38:16 -0400 Subject: [PATCH 11/22] bigbang compliant --- chart/templates/deployment-statefulset.yaml | 10 ++++------ tests/test-values.yml | 7 +++---- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/chart/templates/deployment-statefulset.yaml b/chart/templates/deployment-statefulset.yaml index ea28a44..28e7c71 100644 --- a/chart/templates/deployment-statefulset.yaml +++ b/chart/templates/deployment-statefulset.yaml @@ -18,7 +18,6 @@ metadata: {{ toYaml .Values.deployment.annotations | indent 4 }} {{- end }} spec: - replicas: {{ .Values.replicaCount }} {{- if .Values.statefulset.enabled }} {{- if .Values.nexusProxy.svcName }} @@ -57,7 +56,10 @@ spec: hostAliases: {{ toYaml .Values.nexus.hostAliases | indent 8 }} {{- end }} - + {{- if .Values.nexus.imagePullSecret }} + imagePullSecrets: + - name: {{ .Values.nexus.imagePullSecret }} + {{- end }} {{- if .Values.serviceAccount.name }} serviceAccountName: {{ .Values.serviceAccount.name | quote }} {{- else if .Values.serviceAccount.create }} @@ -70,10 +72,6 @@ spec: - name: nexus image: {{ .Values.nexus.imageName }}:{{ .Values.nexus.imageTag }} imagePullPolicy: {{ .Values.nexus.imagePullPolicy }} - {{- with .Values.nexus.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 4 }} - {{- end }} {{- if .Values.deployment.postStart.command }} lifecycle: postStart: diff --git a/tests/test-values.yml b/tests/test-values.yml index b18eb74..585849e 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -1,8 +1,7 @@ istio: - enabled: true + enabled: false nexus: - imagePullSecrets: - - name: private-registry-mil - + imagePullSecrets: private-registry-mil + -- GitLab From d08003ff70599649c00641041153ce48cdbbe57c Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Wed, 21 Apr 2021 17:14:44 -0400 Subject: [PATCH 12/22] add image pull secret --- tests/test-values.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-values.yml b/tests/test-values.yml index 585849e..fcb863c 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -2,6 +2,6 @@ istio: enabled: false nexus: - imagePullSecrets: private-registry-mil + imagePullSecret: private-registry-mil -- GitLab From cdf0871f851f24094a21c3951e2da17fb5334902 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Wed, 21 Apr 2021 17:44:14 -0400 Subject: [PATCH 13/22] add image pull secret --- chart/templates/bigbang/nexus-vs.yaml | 10 ++++------ tests/test-values.yml | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/chart/templates/bigbang/nexus-vs.yaml b/chart/templates/bigbang/nexus-vs.yaml index 6a0aa75..30a97b2 100644 --- a/chart/templates/bigbang/nexus-vs.yaml +++ b/chart/templates/bigbang/nexus-vs.yaml @@ -2,20 +2,18 @@ apiVersion: networking.istio.io/v1alpha3 kind: VirtualService metadata: - name: coder + name: nexus namespace: {{ .Release.Namespace }} spec: hosts: - "nexus.{{ .Values.hostname }}" gateways: - istio-system/main - http: - - match: - + http: route: - destination: port: number: 8080 - host: nexus-sonatype-nexus - {{- end -}} + host: nexus-sonatype-nexus.nexus.svc.cluster.local +{{- end }} diff --git a/tests/test-values.yml b/tests/test-values.yml index fcb863c..8dcbe33 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -2,6 +2,6 @@ istio: enabled: false nexus: - imagePullSecret: private-registry-mil + imagePullSecret: private-registry -- GitLab From 7fb611cd42433da8f5cde5d49c52ddc8301417d4 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Wed, 21 Apr 2021 17:58:10 -0400 Subject: [PATCH 14/22] add image pull secret --- tests/test-values.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-values.yml b/tests/test-values.yml index 8dcbe33..fcb863c 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -2,6 +2,6 @@ istio: enabled: false nexus: - imagePullSecret: private-registry + imagePullSecret: private-registry-mil -- GitLab From 02c51c644cf72af109d8d3fca6263fad5f226c9d Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Wed, 21 Apr 2021 18:07:57 -0400 Subject: [PATCH 15/22] add image pull secret --- chart/templates/bigbang/nexus-vs.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/chart/templates/bigbang/nexus-vs.yaml b/chart/templates/bigbang/nexus-vs.yaml index 30a97b2..fbe153c 100644 --- a/chart/templates/bigbang/nexus-vs.yaml +++ b/chart/templates/bigbang/nexus-vs.yaml @@ -10,6 +10,9 @@ spec: gateways: - istio-system/main http: + - match: + - uri: + prefix: / route: - destination: port: -- GitLab From 3e4233784ecc99ec87dd103f93a2d0f2225d7c9f Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Wed, 21 Apr 2021 18:15:03 -0400 Subject: [PATCH 16/22] add image pull secret --- tests/test-values.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-values.yml b/tests/test-values.yml index fcb863c..26cf47a 100644 --- a/tests/test-values.yml +++ b/tests/test-values.yml @@ -1,6 +1,6 @@ istio: - enabled: false + enabled: true nexus: imagePullSecret: private-registry-mil -- GitLab From 4ae836baa8a34e2980dc287797271fc8873978e9 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Wed, 21 Apr 2021 18:20:48 -0400 Subject: [PATCH 17/22] add image pull secret --- chart/templates/bigbang/nexus-vs.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/chart/templates/bigbang/nexus-vs.yaml b/chart/templates/bigbang/nexus-vs.yaml index fbe153c..001b80a 100644 --- a/chart/templates/bigbang/nexus-vs.yaml +++ b/chart/templates/bigbang/nexus-vs.yaml @@ -9,14 +9,15 @@ spec: - "nexus.{{ .Values.hostname }}" gateways: - istio-system/main - http: - - match: - - uri: - prefix: / + http: + - match: + - uri: + prefix: / route: - destination: + host: nexus-sonatype-nexus.nexus.svc.cluster.local port: number: 8080 - host: nexus-sonatype-nexus.nexus.svc.cluster.local + {{- end }} -- GitLab From b11ba96f99fefcb66dc13d5fd70aa99bcfea96ee Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Wed, 21 Apr 2021 18:24:56 -0400 Subject: [PATCH 18/22] add image pull secret --- tests/cypress/{ => integration}/nexus-healthspec.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/cypress/{ => integration}/nexus-healthspec.js (100%) diff --git a/tests/cypress/nexus-healthspec.js b/tests/cypress/integration/nexus-healthspec.js similarity index 100% rename from tests/cypress/nexus-healthspec.js rename to tests/cypress/integration/nexus-healthspec.js -- GitLab From 01a5bb2032a9771d88f51e5e2c43468a031eba20 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Wed, 21 Apr 2021 18:28:56 -0400 Subject: [PATCH 19/22] add image pull secret --- tests/cypress/look_other_packages_for_example | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 tests/cypress/look_other_packages_for_example diff --git a/tests/cypress/look_other_packages_for_example b/tests/cypress/look_other_packages_for_example deleted file mode 100644 index e69de29..0000000 -- GitLab From 6c904b0d9e8f1bcee88963fd40d789f3bcde27c9 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Thu, 22 Apr 2021 15:33:16 -0400 Subject: [PATCH 20/22] additional service for ingress --- chart/templates/bigbang/nexus-service.yaml | 17 +++++++++++++++++ chart/templates/bigbang/nexus-vs.yaml | 12 ++++++++++-- chart/values.yaml | 2 +- 3 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 chart/templates/bigbang/nexus-service.yaml diff --git a/chart/templates/bigbang/nexus-service.yaml b/chart/templates/bigbang/nexus-service.yaml new file mode 100644 index 0000000..ac2fedb --- /dev/null +++ b/chart/templates/bigbang/nexus-service.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + name: nexus-service-bigbang + namespace: { template "nexus.namespace" . }} +spec: + ports: + - port: 80 + targetPort: 8081 + protocol: TCP + name: http + - port: 5000 + targetPort: 5000 + protocol: TCP + name: docker + selector: + app: sonatype-nexus \ No newline at end of file diff --git a/chart/templates/bigbang/nexus-vs.yaml b/chart/templates/bigbang/nexus-vs.yaml index 001b80a..020f585 100644 --- a/chart/templates/bigbang/nexus-vs.yaml +++ b/chart/templates/bigbang/nexus-vs.yaml @@ -15,9 +15,17 @@ spec: prefix: / route: - destination: - host: nexus-sonatype-nexus.nexus.svc.cluster.local + host: nexus-service-bigbang port: - number: 8080 + number: 80 + - match: + - uri: + prefix: / + route: + - destination: + host: nexus-service-bigbang + port: + number: 5000 {{- end }} diff --git a/chart/values.yaml b/chart/values.yaml index 672b94b..d7b90a3 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -312,7 +312,7 @@ secret: service: type: ClusterIP # name: additional-svc - enabled: false + enabled: true labels: {} annotations: {} ports: -- GitLab From 037d2cbd37904aff8d5dfbac2e6e031345438a51 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Thu, 22 Apr 2021 15:36:42 -0400 Subject: [PATCH 21/22] additional service for ingress --- chart/templates/bigbang/nexus-service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/templates/bigbang/nexus-service.yaml b/chart/templates/bigbang/nexus-service.yaml index ac2fedb..ee22b04 100644 --- a/chart/templates/bigbang/nexus-service.yaml +++ b/chart/templates/bigbang/nexus-service.yaml @@ -14,4 +14,4 @@ spec: protocol: TCP name: docker selector: - app: sonatype-nexus \ No newline at end of file + app: {{ template "nexus.name" . }} \ No newline at end of file -- GitLab From 4debc0b283e9dcfe865c33d5c0849c8ab5b1d222 Mon Sep 17 00:00:00 2001 From: Kavitha Thulasiraman Date: Thu, 22 Apr 2021 15:40:24 -0400 Subject: [PATCH 22/22] additional service for ingress --- chart/templates/bigbang/nexus-service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/templates/bigbang/nexus-service.yaml b/chart/templates/bigbang/nexus-service.yaml index ee22b04..7e9818b 100644 --- a/chart/templates/bigbang/nexus-service.yaml +++ b/chart/templates/bigbang/nexus-service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: nexus-service-bigbang - namespace: { template "nexus.namespace" . }} + namespace: {{ template "nexus.namespace" . }} spec: ports: - port: 80 -- GitLab