From fc117afb6e7897d77c22babe0d70a773213e57a6 Mon Sep 17 00:00:00 2001 From: kang <69745623+loneizhao@users.noreply.github.com> Date: Thu, 2 Jun 2022 15:07:24 +0800 Subject: [PATCH 1/9] Add files via upload Update: Remove EKS 1.18 and add EKS 1.22 support Upgrade ingress controller to 2.4.1 version Upgrade nexus3ChartVersion to 5.4.0 Adjust Ingress rules format to meet requirement of new introduced networking.k8s.io/v1(replacement of v1beta1) --- src/lib/sonatype-nexus3-stack.ts | 46 +++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/src/lib/sonatype-nexus3-stack.ts b/src/lib/sonatype-nexus3-stack.ts index c7a8305..152803a 100644 --- a/src/lib/sonatype-nexus3-stack.ts +++ b/src/lib/sonatype-nexus3-stack.ts @@ -18,7 +18,6 @@ import { import { AwsCliLayer } from '@aws-cdk/lambda-layer-awscli'; import { KubectlLayer } from '@aws-cdk/lambda-layer-kubectl'; import * as pjson from '../../package.json'; - const assert = require('assert').strict; export class SonatypeNexus3Stack extends cdk.Stack { @@ -234,10 +233,10 @@ export class SonatypeNexus3Stack extends cdk.Stack { eksVersion = new cdk.CfnParameter(this, 'KubernetesVersion', { type: 'String', allowedValues: [ + '1.22', '1.21', '1.20', - '1.19', - '1.18', + '1.19' ], default: '1.20', description: 'The version of Kubernetes.', @@ -324,7 +323,7 @@ export class SonatypeNexus3Stack extends cdk.Stack { } // install AWS load balancer via Helm charts - const awsLoadBalancerControllerVersion = 'v2.2.1'; + const awsLoadBalancerControllerVersion = 'v2.4.1'; const awsControllerBaseResourceBaseUrl = `https://raw.githubusercontent.com/kubernetes-sigs/aws-load-balancer-controller/${awsLoadBalancerControllerVersion}/docs`; const awsControllerPolicyUrl = `${awsControllerBaseResourceBaseUrl}/install/iam_policy${targetRegion.startsWith('cn-') ? '_cn' : ''}.json`; const albNamespace = 'kube-system'; @@ -366,7 +365,7 @@ export class SonatypeNexus3Stack extends cdk.Stack { repository: partitionMapping.findInMap(cdk.Aws.PARTITION, 'albHelmChartRepo'), namespace: albNamespace, release: 'aws-load-balancer-controller', - version: '1.2.7', // mapping to v2.2.4 + version: '1.4.1', // mapping to v2.4.1 wait: true, timeout: cdk.Duration.minutes(15), values: { @@ -560,10 +559,15 @@ export class SonatypeNexus3Stack extends cdk.Stack { http: { paths: [ { - path: '/*', + path: '/', + pathType: 'Prefix', backend: { - serviceName: `${nexus3ChartName}-sonatype-nexus`, - servicePort: nexusPort, + service: { + name: `${nexus3ChartName}-sonatype-nexus`, + port: { + number: nexusPort, + }, + }, }, }, ], @@ -584,17 +588,27 @@ export class SonatypeNexus3Stack extends cdk.Stack { http: { paths: [ { - path: '/*', + path: '/', + pathType: 'Prefix', backend: { - serviceName: 'ssl-redirect', - servicePort: 'use-annotation', + service: { + name: 'ssl-redirect', + port: { + number: 'use-annotation', + }, }, }, + }, { - path: '/*', + path: '/', + pathType: 'Prefix', backend: { - serviceName: `${nexus3ChartName}-sonatype-nexus`, - servicePort: nexusPort, + service :{ + name: `${nexus3ChartName}-sonatype-nexus`, + port: { + number: nexusPort, + }, + }, }, }, ], @@ -650,7 +664,7 @@ export class SonatypeNexus3Stack extends cdk.Stack { } const enableAutoConfigured: boolean = this.node.tryGetContext('enableAutoConfigured') || false; - const nexus3ChartVersion = '5.2.1'; + const nexus3ChartVersion = '5.4.0'; const nexus3PurgeFunc = new lambda_python.PythonFunction(this, 'Nexus3Purge', { description: 'Func purges the resources(such as pvc) left after deleting Nexus3 helm chart', @@ -1009,4 +1023,4 @@ export class SonatypeNexus3Stack extends cdk.Stack { }, }); } -} \ No newline at end of file +} From dbe1d42b4fa2f2037920f62a7465953061b51ee0 Mon Sep 17 00:00:00 2001 From: kang <69745623+loneizhao@users.noreply.github.com> Date: Mon, 27 Jun 2022 14:24:17 +0800 Subject: [PATCH 2/9] change nexus version and ALB version change nexus version and ALB version --- test/sonatype-nexus3.test.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/sonatype-nexus3.test.ts b/test/sonatype-nexus3.test.ts index 33a643f..a3cd8cb 100644 --- a/test/sonatype-nexus3.test.ts +++ b/test/sonatype-nexus3.test.ts @@ -130,7 +130,7 @@ describe('Nexus OSS stack', () => { }, Release: 'nexus3', Chart: 'sonatype-nexus', - Version: '5.2.1', + Version: '5.4.0', Namespace: 'default', Repository: { 'Fn::FindInMap': [ @@ -371,7 +371,7 @@ describe('Nexus OSS stack', () => { expect(stack).toHaveResourceLike('Custom::AWSCDK-EKS-HelmChart', { Release: 'aws-load-balancer-controller', Chart: 'aws-load-balancer-controller', - Version: '1.2.7', + Version: '1.4.1', Repository: { 'Fn::FindInMap': [ 'PartitionMapping', @@ -719,4 +719,4 @@ function initializeStackWithContextsAndEnvs(app: cdk.App, stack: cdk.Stack, env: env, }); return { app, stack }; -} \ No newline at end of file +} From 41ff43523b5b9973c0ba827cc5154fc48a828b01 Mon Sep 17 00:00:00 2001 From: kang <69745623+loneizhao@users.noreply.github.com> Date: Wed, 20 Jul 2022 12:05:36 +0800 Subject: [PATCH 3/9] Update test script for new version Update test script for new version --- test/sonatype-nexus3.test.ts | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/test/sonatype-nexus3.test.ts b/test/sonatype-nexus3.test.ts index a3cd8cb..2abc6c4 100644 --- a/test/sonatype-nexus3.test.ts +++ b/test/sonatype-nexus3.test.ts @@ -104,7 +104,7 @@ describe('Nexus OSS stack', () => { 'nexus', ], }, - '","resources":{"requests":{"memory":"4800Mi"}},"livenessProbe":{"path":"/"}},"nexusProxy":{"enabled":false},"persistence":{"enabled":true,"storageClass":"efs-sc","accessMode":"ReadWriteMany"},"nexusBackup":{"enabled":false,"persistence":{"enabled":false}},"nexusCloudiam":{"enabled":false,"persistence":{"enabled":false}},"ingress":{"enabled":true,"path":"/*","annotations":{"alb.ingress.kubernetes.io/backend-protocol":"HTTP","alb.ingress.kubernetes.io/healthcheck-path":"/","alb.ingress.kubernetes.io/healthcheck-port":8081,"alb.ingress.kubernetes.io/listen-ports":"[{\\"HTTP\\": 80}, {\\"HTTPS\\": 443}]","alb.ingress.kubernetes.io/scheme":"internet-facing","alb.ingress.kubernetes.io/inbound-cidrs":"0.0.0.0/0","alb.ingress.kubernetes.io/auth-type":"none","alb.ingress.kubernetes.io/target-type":"ip","kubernetes.io/ingress.class":"alb","alb.ingress.kubernetes.io/tags":"app=nexus3","alb.ingress.kubernetes.io/subnets":"', + '","resources":{"requests":{"memory":"4800Mi"}},"livenessProbe":{"path":"/"}},"nexusProxy":{"enabled":false},"persistence":{"enabled":true,"storageClass":"efs-sc","accessMode":"ReadWriteMany"},"nexusBackup":{"enabled":false,"persistence":{"enabled":false}},"nexusCloudiam":{"enabled":false,"persistence":{"enabled":false}},"ingress":{"enabled":true,"path":"/*","annotations":{"alb.ingress.kubernetes.io/backend-protocol":"HTTP","alb.ingress.kubernetes.io/healthcheck-path":"/","alb.ingress.kubernetes.io/healthcheck-port":8081,"alb.ingress.kubernetes.io/listen-ports":"[{\"HTTP\": 80}]","alb.ingress.kubernetes.io/scheme":"internet-facing","alb.ingress.kubernetes.io/inbound-cidrs":"0.0.0.0/0","alb.ingress.kubernetes.io/auth-type":"none","alb.ingress.kubernetes.io/target-type":"ip","kubernetes.io/ingress.class":"alb","alb.ingress.kubernetes.io/tags":"app=nexus3","alb.ingress.kubernetes.io/subnets":"', { Ref: 'NexusOSSVpcPublicSubnet1SubnetE287B3FC', }, @@ -116,15 +116,8 @@ describe('Nexus OSS stack', () => { { Ref: 'LogBucketCC3B17E8', }, - ',access_logs.s3.prefix=albAccessLog","alb.ingress.kubernetes.io/certificate-arn":"', - { - Ref: 'SSLCertificate2E93C565', - }, - '","alb.ingress.kubernetes.io/ssl-policy":"ELBSecurityPolicy-TLS-1-2-Ext-2018-06","alb.ingress.kubernetes.io/actions.ssl-redirect":"{\\"Type\\": \\"redirect\\", \\"RedirectConfig\\": { \\"Protocol\\": \\"HTTPS\\", \\"Port\\": \\"443\\", \\"StatusCode\\": \\"HTTP_301\\"}}"},"tls":{"enabled":false},"rules":[{"host":"', - { - Ref: 'DomainName', - }, - '","http":{"paths":[{"path":"/*","backend":{"serviceName":"ssl-redirect","servicePort":"use-annotation"}},{"path":"/*","backend":{"serviceName":"nexus3-sonatype-nexus","servicePort":8081}}]}},{"http":{"paths":[{"path":"/*","backend":{"serviceName":"nexus3-sonatype-nexus","servicePort":8081}}]}}]},"serviceAccount":{"create":false}}', + ',access_logs.s3.prefix=albAccessLog"},"tls":{"enabled":false},"rules":[{"http":{"paths":[{"path":"/","pathType":"Prefix","backend":{"service":{"name":"nexus3-sonatype-nexus","port":{"number":8081}}}}]}}]},"serviceAccount":{"create":false}}' + ], ], }, @@ -279,7 +272,7 @@ describe('Nexus OSS stack', () => { 'nexus', ], }, - '","resources":{"requests":{"memory":"4800Mi"}},"livenessProbe":{"path":"/"}},"nexusProxy":{"enabled":false},"persistence":{"enabled":true,"storageClass":"efs-sc","accessMode":"ReadWriteMany"},"nexusBackup":{"enabled":false,"persistence":{"enabled":false}},"nexusCloudiam":{"enabled":false,"persistence":{"enabled":false}},"ingress":{"enabled":true,"path":"/*","annotations":{"alb.ingress.kubernetes.io/backend-protocol":"HTTP","alb.ingress.kubernetes.io/healthcheck-path":"/","alb.ingress.kubernetes.io/healthcheck-port":8081,"alb.ingress.kubernetes.io/listen-ports":"[{\\"HTTP\\": 80}, {\\"HTTPS\\": 443}]","alb.ingress.kubernetes.io/scheme":"internet-facing","alb.ingress.kubernetes.io/inbound-cidrs":"0.0.0.0/0","alb.ingress.kubernetes.io/auth-type":"none","alb.ingress.kubernetes.io/target-type":"ip","kubernetes.io/ingress.class":"alb","alb.ingress.kubernetes.io/tags":"app=nexus3","alb.ingress.kubernetes.io/subnets":"', + '","resources":{"requests":{"memory":"4800Mi"}},"livenessProbe":{"path":"/"}},"nexusProxy":{"enabled":false},"persistence":{"enabled":true,"storageClass":"efs-sc","accessMode":"ReadWriteMany"},"nexusBackup":{"enabled":false,"persistence":{"enabled":false}},"nexusCloudiam":{"enabled":false,"persistence":{"enabled":false}},"ingress":{"enabled":true,"path":"/*","annotations":{"alb.ingress.kubernetes.io/backend-protocol":"HTTP","alb.ingress.kubernetes.io/healthcheck-path":"/","alb.ingress.kubernetes.io/healthcheck-port":8081,"alb.ingress.kubernetes.io/listen-ports":"[{\"HTTP\": 80}]","alb.ingress.kubernetes.io/scheme":"internet-facing","alb.ingress.kubernetes.io/inbound-cidrs":"0.0.0.0/0","alb.ingress.kubernetes.io/auth-type":"none","alb.ingress.kubernetes.io/target-type":"ip","kubernetes.io/ingress.class":"alb","alb.ingress.kubernetes.io/tags":"app=nexus3","alb.ingress.kubernetes.io/subnets":"', { Ref: 'NexusOSSVpcPublicSubnet1SubnetE287B3FC', }, @@ -291,15 +284,7 @@ describe('Nexus OSS stack', () => { { Ref: 'LogBucketCC3B17E8', }, - ',access_logs.s3.prefix=albAccessLog","alb.ingress.kubernetes.io/certificate-arn":"', - { - Ref: 'SSLCertificate2E93C565', - }, - '","alb.ingress.kubernetes.io/ssl-policy":"ELBSecurityPolicy-TLS-1-2-Ext-2018-06","alb.ingress.kubernetes.io/actions.ssl-redirect":"{\\"Type\\": \\"redirect\\", \\"RedirectConfig\\": { \\"Protocol\\": \\"HTTPS\\", \\"Port\\": \\"443\\", \\"StatusCode\\": \\"HTTP_301\\"}}"},"tls":{"enabled":false},"rules":[{"host":"', - { - Ref: 'DomainName', - }, - '","http":{"paths":[{"path":"/*","backend":{"serviceName":"ssl-redirect","servicePort":"use-annotation"}},{"path":"/*","backend":{"serviceName":"nexus3-sonatype-nexus","servicePort":8081}}]}},{"http":{"paths":[{"path":"/*","backend":{"serviceName":"nexus3-sonatype-nexus","servicePort":8081}}]}}]},"serviceAccount":{"create":false},"config":{"enabled":true,"data":{"nexus.properties":"nexus.scripts.allowCreation=true"}},"deployment":{"additionalVolumeMounts":[{"mountPath":"/nexus-data/etc/nexus.properties","subPath":"nexus.properties","name":"sonatype-nexus-conf"}]}}', + ',access_logs.s3.prefix=albAccessLog"},"tls":{"enabled":false},"rules":[{"http":{"paths":[{"path":"/","pathType":"Prefix","backend":{"service":{"name":"nexus3-sonatype-nexus","port":{"number":8081}}}}]}}]},"serviceAccount":{"create":false}}' ], ], }, From fd43e5e9d17b66926423df2338cadeaf2055fade Mon Sep 17 00:00:00 2001 From: kang <69745623+loneizhao@users.noreply.github.com> Date: Fri, 22 Jul 2022 10:13:25 +0800 Subject: [PATCH 4/9] Update sonatype-nexus3-stack.ts --- src/lib/sonatype-nexus3-stack.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/sonatype-nexus3-stack.ts b/src/lib/sonatype-nexus3-stack.ts index 152803a..5860853 100644 --- a/src/lib/sonatype-nexus3-stack.ts +++ b/src/lib/sonatype-nexus3-stack.ts @@ -235,8 +235,7 @@ export class SonatypeNexus3Stack extends cdk.Stack { allowedValues: [ '1.22', '1.21', - '1.20', - '1.19' + '1.20' ], default: '1.20', description: 'The version of Kubernetes.', From 6bfdb13a2045a47de0952fcab6accbf2b1d838da Mon Sep 17 00:00:00 2001 From: kang <69745623+loneizhao@users.noreply.github.com> Date: Fri, 22 Jul 2022 10:21:10 +0800 Subject: [PATCH 5/9] Update test script for new version Update test script for new version --- test/sonatype-nexus3.test.ts | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/test/sonatype-nexus3.test.ts b/test/sonatype-nexus3.test.ts index 2abc6c4..961d7af 100644 --- a/test/sonatype-nexus3.test.ts +++ b/test/sonatype-nexus3.test.ts @@ -104,7 +104,7 @@ describe('Nexus OSS stack', () => { 'nexus', ], }, - '","resources":{"requests":{"memory":"4800Mi"}},"livenessProbe":{"path":"/"}},"nexusProxy":{"enabled":false},"persistence":{"enabled":true,"storageClass":"efs-sc","accessMode":"ReadWriteMany"},"nexusBackup":{"enabled":false,"persistence":{"enabled":false}},"nexusCloudiam":{"enabled":false,"persistence":{"enabled":false}},"ingress":{"enabled":true,"path":"/*","annotations":{"alb.ingress.kubernetes.io/backend-protocol":"HTTP","alb.ingress.kubernetes.io/healthcheck-path":"/","alb.ingress.kubernetes.io/healthcheck-port":8081,"alb.ingress.kubernetes.io/listen-ports":"[{\"HTTP\": 80}]","alb.ingress.kubernetes.io/scheme":"internet-facing","alb.ingress.kubernetes.io/inbound-cidrs":"0.0.0.0/0","alb.ingress.kubernetes.io/auth-type":"none","alb.ingress.kubernetes.io/target-type":"ip","kubernetes.io/ingress.class":"alb","alb.ingress.kubernetes.io/tags":"app=nexus3","alb.ingress.kubernetes.io/subnets":"', + '","resources":{"requests":{"memory":"4800Mi"}},"livenessProbe":{"path":"/"}},"nexusProxy":{"enabled":false},"persistence":{"enabled":true,"storageClass":"efs-sc","accessMode":"ReadWriteMany"},"nexusBackup":{"enabled":false,"persistence":{"enabled":false}},"nexusCloudiam":{"enabled":false,"persistence":{"enabled":false}},"ingress":{"enabled":true,"path":"/*","annotations":{"alb.ingress.kubernetes.io/backend-protocol":"HTTP","alb.ingress.kubernetes.io/healthcheck-path":"/","alb.ingress.kubernetes.io/healthcheck-port":8081,"alb.ingress.kubernetes.io/listen-ports":"[{\\"HTTP\\": 80}, {\\"HTTPS\\": 443}]","alb.ingress.kubernetes.io/scheme":"internet-facing","alb.ingress.kubernetes.io/inbound-cidrs":"0.0.0.0/0","alb.ingress.kubernetes.io/auth-type":"none","alb.ingress.kubernetes.io/target-type":"ip","kubernetes.io/ingress.class":"alb","alb.ingress.kubernetes.io/tags":"app=nexus3","alb.ingress.kubernetes.io/subnets":"', { Ref: 'NexusOSSVpcPublicSubnet1SubnetE287B3FC', }, @@ -116,8 +116,15 @@ describe('Nexus OSS stack', () => { { Ref: 'LogBucketCC3B17E8', }, - ',access_logs.s3.prefix=albAccessLog"},"tls":{"enabled":false},"rules":[{"http":{"paths":[{"path":"/","pathType":"Prefix","backend":{"service":{"name":"nexus3-sonatype-nexus","port":{"number":8081}}}}]}}]},"serviceAccount":{"create":false}}' - + ',access_logs.s3.prefix=albAccessLog","alb.ingress.kubernetes.io/certificate-arn":"', + { + Ref: 'SSLCertificate2E93C565', + }, + '","alb.ingress.kubernetes.io/ssl-policy":"ELBSecurityPolicy-TLS-1-2-Ext-2018-06","alb.ingress.kubernetes.io/actions.ssl-redirect":"{\\"Type\\": \\"redirect\\", \\"RedirectConfig\\": { \\"Protocol\\": \\"HTTPS\\", \\"Port\\": \\"443\\", \\"StatusCode\\": \\"HTTP_301\\"}}"},"tls":{"enabled":false},"rules":[{"host":"', + { + Ref: 'DomainName', + }, + '","http":{"paths":[{"path":"/","pathType":"Prefix","backend":{"service":{"name":"ssl-redirect","port":{"number":"use-annotation"}}}},{"path":"/","pathType":"Prefix","backend":{"service":{"name":"nexus3-sonatype-nexus","port":{"number":8081}}}}]}},{"http":{"paths":[{"path":"/","pathType":"Prefix","backend":{"service":{"name":"nexus3-sonatype-nexus","port":{"number":8081}}}}]}}]},"serviceAccount":{"create":false}}', ], ], }, @@ -272,7 +279,7 @@ describe('Nexus OSS stack', () => { 'nexus', ], }, - '","resources":{"requests":{"memory":"4800Mi"}},"livenessProbe":{"path":"/"}},"nexusProxy":{"enabled":false},"persistence":{"enabled":true,"storageClass":"efs-sc","accessMode":"ReadWriteMany"},"nexusBackup":{"enabled":false,"persistence":{"enabled":false}},"nexusCloudiam":{"enabled":false,"persistence":{"enabled":false}},"ingress":{"enabled":true,"path":"/*","annotations":{"alb.ingress.kubernetes.io/backend-protocol":"HTTP","alb.ingress.kubernetes.io/healthcheck-path":"/","alb.ingress.kubernetes.io/healthcheck-port":8081,"alb.ingress.kubernetes.io/listen-ports":"[{\"HTTP\": 80}]","alb.ingress.kubernetes.io/scheme":"internet-facing","alb.ingress.kubernetes.io/inbound-cidrs":"0.0.0.0/0","alb.ingress.kubernetes.io/auth-type":"none","alb.ingress.kubernetes.io/target-type":"ip","kubernetes.io/ingress.class":"alb","alb.ingress.kubernetes.io/tags":"app=nexus3","alb.ingress.kubernetes.io/subnets":"', + '","resources":{"requests":{"memory":"4800Mi"}},"livenessProbe":{"path":"/"}},"nexusProxy":{"enabled":false},"persistence":{"enabled":true,"storageClass":"efs-sc","accessMode":"ReadWriteMany"},"nexusBackup":{"enabled":false,"persistence":{"enabled":false}},"nexusCloudiam":{"enabled":false,"persistence":{"enabled":false}},"ingress":{"enabled":true,"path":"/*","annotations":{"alb.ingress.kubernetes.io/backend-protocol":"HTTP","alb.ingress.kubernetes.io/healthcheck-path":"/","alb.ingress.kubernetes.io/healthcheck-port":8081,"alb.ingress.kubernetes.io/listen-ports":"[{\\"HTTP\\": 80}, {\\"HTTPS\\": 443}]","alb.ingress.kubernetes.io/scheme":"internet-facing","alb.ingress.kubernetes.io/inbound-cidrs":"0.0.0.0/0","alb.ingress.kubernetes.io/auth-type":"none","alb.ingress.kubernetes.io/target-type":"ip","kubernetes.io/ingress.class":"alb","alb.ingress.kubernetes.io/tags":"app=nexus3","alb.ingress.kubernetes.io/subnets":"', { Ref: 'NexusOSSVpcPublicSubnet1SubnetE287B3FC', }, @@ -284,7 +291,15 @@ describe('Nexus OSS stack', () => { { Ref: 'LogBucketCC3B17E8', }, - ',access_logs.s3.prefix=albAccessLog"},"tls":{"enabled":false},"rules":[{"http":{"paths":[{"path":"/","pathType":"Prefix","backend":{"service":{"name":"nexus3-sonatype-nexus","port":{"number":8081}}}}]}}]},"serviceAccount":{"create":false}}' + ',access_logs.s3.prefix=albAccessLog","alb.ingress.kubernetes.io/certificate-arn":"', + { + Ref: 'SSLCertificate2E93C565', + }, + '","alb.ingress.kubernetes.io/ssl-policy":"ELBSecurityPolicy-TLS-1-2-Ext-2018-06","alb.ingress.kubernetes.io/actions.ssl-redirect":"{\\"Type\\": \\"redirect\\", \\"RedirectConfig\\": { \\"Protocol\\": \\"HTTPS\\", \\"Port\\": \\"443\\", \\"StatusCode\\": \\"HTTP_301\\"}}"},"tls":{"enabled":false},"rules":[{"host":"', + { + Ref: 'DomainName', + }, + '","http":{"paths":[{"path":"/","pathType":"Prefix","backend":{"service":{"name":"ssl-redirect","port":{"number":"use-annotation"}}}},{"path":"/","pathType":"Prefix","backend":{"service":{"name":"nexus3-sonatype-nexus","port":{"number":8081}}}}]}},{"http":{"paths":[{"path":"/","pathType":"Prefix","backend":{"service":{"name":"nexus3-sonatype-nexus","port":{"number":8081}}}}]}}]},"serviceAccount":{"create":false},"config":{"enabled":true,"data":{"nexus.properties":"nexus.scripts.allowCreation=true"}},"deployment":{"additionalVolumeMounts":[{"mountPath":"/nexus-data/etc/nexus.properties","subPath":"nexus.properties","name":"sonatype-nexus-conf"}]}}', ], ], }, @@ -666,7 +681,7 @@ describe('Nexus OSS stack', () => { { Ref: 'LogBucketCC3B17E8', }, - ',access_logs.s3.prefix=albAccessLog"},"tls":{"enabled":false},"rules":[{"http":{"paths":[{"path":"/*","backend":{"serviceName":"nexus3-sonatype-nexus","servicePort":8081}}]}}]},"serviceAccount":{"create":false}}', + ',access_logs.s3.prefix=albAccessLog"},"tls":{"enabled":false},"rules":[{"http":{"paths":[{"path":"/","pathType":"Prefix","backend":{"service":{"name":"nexus3-sonatype-nexus","port":{"number":8081}}}}]}}]},"serviceAccount":{"create":false}}', ], ], }, From 524b3120d9747521cbbacaa250c345a032c5ca02 Mon Sep 17 00:00:00 2001 From: kang <69745623+loneizhao@users.noreply.github.com> Date: Fri, 22 Jul 2022 11:50:17 +0800 Subject: [PATCH 6/9] update format --- src/lib/sonatype-nexus3-stack.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/sonatype-nexus3-stack.ts b/src/lib/sonatype-nexus3-stack.ts index 5860853..d69bae9 100644 --- a/src/lib/sonatype-nexus3-stack.ts +++ b/src/lib/sonatype-nexus3-stack.ts @@ -235,7 +235,7 @@ export class SonatypeNexus3Stack extends cdk.Stack { allowedValues: [ '1.22', '1.21', - '1.20' + '1.20', ], default: '1.20', description: 'The version of Kubernetes.', @@ -565,7 +565,7 @@ export class SonatypeNexus3Stack extends cdk.Stack { name: `${nexus3ChartName}-sonatype-nexus`, port: { number: nexusPort, - }, + }, }, }, }, @@ -590,10 +590,10 @@ export class SonatypeNexus3Stack extends cdk.Stack { path: '/', pathType: 'Prefix', backend: { - service: { + service :{ name: 'ssl-redirect', port: { - number: 'use-annotation', + number: 'use-annotation', }, }, }, From 23399276cbed3d8373a0f59f5242f6074b4f6c75 Mon Sep 17 00:00:00 2001 From: kang <69745623+loneizhao@users.noreply.github.com> Date: Fri, 22 Jul 2022 12:00:38 +0800 Subject: [PATCH 7/9] Update lambda-integration-test.yml --- .github/workflows/lambda-integration-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lambda-integration-test.yml b/.github/workflows/lambda-integration-test.yml index 82ac23d..d77da7a 100644 --- a/.github/workflows/lambda-integration-test.yml +++ b/.github/workflows/lambda-integration-test.yml @@ -55,7 +55,7 @@ jobs: pytest -m integration services: nexus: - image: 'quay.io/travelaudience/docker-nexus:3.27.0' + image: 'quay.io/travelaudience/docker-nexus:3.37.3-02' ports: - '8081:8081' options: >- From 16502f37b95bc64d2459d54726787691558e1908 Mon Sep 17 00:00:00 2001 From: kang <69745623+loneizhao@users.noreply.github.com> Date: Fri, 22 Jul 2022 12:18:26 +0800 Subject: [PATCH 8/9] format update --- src/lib/sonatype-nexus3-stack.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/sonatype-nexus3-stack.ts b/src/lib/sonatype-nexus3-stack.ts index d69bae9..de3fa08 100644 --- a/src/lib/sonatype-nexus3-stack.ts +++ b/src/lib/sonatype-nexus3-stack.ts @@ -590,24 +590,24 @@ export class SonatypeNexus3Stack extends cdk.Stack { path: '/', pathType: 'Prefix', backend: { - service :{ + service: { name: 'ssl-redirect', port: { number: 'use-annotation', - }, + }, + }, }, }, - }, { path: '/', pathType: 'Prefix', backend: { - service :{ + service: { name: `${nexus3ChartName}-sonatype-nexus`, port: { - number: nexusPort, + number: nexusPort, }, - }, + }, }, }, ], From 5adeab623ba2405babfc198256a37f3e7de31c4f Mon Sep 17 00:00:00 2001 From: kang <69745623+loneizhao@users.noreply.github.com> Date: Fri, 22 Jul 2022 14:02:31 +0800 Subject: [PATCH 9/9] format update --- src/lib/sonatype-nexus3-stack.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/sonatype-nexus3-stack.ts b/src/lib/sonatype-nexus3-stack.ts index de3fa08..f9cc5d3 100644 --- a/src/lib/sonatype-nexus3-stack.ts +++ b/src/lib/sonatype-nexus3-stack.ts @@ -566,7 +566,7 @@ export class SonatypeNexus3Stack extends cdk.Stack { port: { number: nexusPort, }, - }, + }, }, }, ],