From e6ee00565d06099e570b938d29507ac7fa1a975b Mon Sep 17 00:00:00 2001 From: Tarun Menon Date: Fri, 2 Feb 2024 14:39:41 +1100 Subject: [PATCH 1/8] Bump component versions, gem to 0.8.8 --- .../templates/ciinabox.cfhighlander.rb.tt | 20 +++++++++---------- .../internalloadbalancer.cfhighlander.rb.tt | 4 ++-- lib/ciinabox/version.rb | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/ciinabox/templates/ciinabox.cfhighlander.rb.tt b/lib/ciinabox/templates/ciinabox.cfhighlander.rb.tt index eb27354..0b5714d 100644 --- a/lib/ciinabox/templates/ciinabox.cfhighlander.rb.tt +++ b/lib/ciinabox/templates/ciinabox.cfhighlander.rb.tt @@ -3,7 +3,7 @@ CfhighlanderTemplate do ComponentDistribution "s3://#{source_bucket}/cloudformation/ciinabox/#{ciinabox_name}" ComponentVersion "#{Ciinabox::VERSION}" - Component template: 'vpc-v2@0.9.0', name: 'vpc', config: vpc do + Component template: 'vpc-v2@0.10.2', name: 'vpc', config: vpc do parameter name: 'EnvironmentName', value: "#{ciinabox_name}" parameter name: 'EnvironmentType', value: 'development' parameter name: 'DnsDomain', value: "#{root_domain}" @@ -23,14 +23,14 @@ CfhighlanderTemplate do full_zone = vpc['create_hosted_zone'] ? "#{ciinabox_name}.#{root_domain}" : "#{root_domain}" - Component template: 'acm@1.4.0', name: 'acm' do + Component template: 'acm@1.4.4', name: 'acm' do parameter name: 'EnvironmentName', value: "#{ciinabox_name}" parameter name: 'EnvironmentType', value: 'development' parameter name: 'DomainName', value: "*.#{full_zone}" parameter name: 'CrossAccountDNSZoneIAMRole', value: '' end - Component template: 'application-loadbalancer@0.4.2', name: 'loadbalancer', config: loadbalancer do + Component template: 'application-loadbalancer@0.5.0', name: 'loadbalancer', config: loadbalancer do parameter name: 'EnvironmentName', value: "#{ciinabox_name}" parameter name: 'EnvironmentType', value: 'development' parameter name: 'DnsDomain', value: "#{root_domain}" @@ -50,17 +50,17 @@ CfhighlanderTemplate do end end - Component template: 'keypair@1.1.0', name: 'keypair' do + Component template: 'keypair@1.2.1', name: 'keypair' do parameter name: 'KeyPairName', value: "#{ciinabox_name}" parameter name: 'SSMParameterPath', value: "/ciinabox/keypair" end - Component template: 'service-discovery@0.1.0', name: 'servicediscovery', config: { namespace: "${EnvironmentName}.ciinabox" } do + Component template: 'service-discovery@0.1.1', name: 'servicediscovery', config: { namespace: "${EnvironmentName}.ciinabox" } do parameter name: 'EnvironmentName', value: "#{ciinabox_name}" parameter name: 'EnvironmentType', value: 'development' end - Component template: 'github:base2services/hl-component-jcasc-pipeline#1.0.0', name: 'jcasc', config: jcasc do + Component template: 'github:base2services/hl-component-jcasc-pipeline#1.1.0', name: 'jcasc', config: jcasc do parameter name: 'EnvironmentName', value: "#{ciinabox_name}" parameter name: 'EnvironmentType', value: 'development' parameter name: 'VPC', value: cfout('vpc.VPCId') @@ -76,7 +76,7 @@ CfhighlanderTemplate do parameter name: 'EnvironmentType', value: 'development' end - Component template: 'ecs-v2@0.1.1', name: 'ecs', config: ecs do + Component template: 'ecs-v2@0.2.3', name: 'ecs', config: ecs do parameter name: 'EnvironmentName', value: "#{ciinabox_name}" parameter name: 'EnvironmentType', value: 'development' parameter name: 'KeyName', value: cfout('keypair.KeyPair') @@ -95,7 +95,7 @@ CfhighlanderTemplate do parameter name: 'ContainerInsights', value: 'disabled' end - Component template: 'github:base2services/hl-component-ciinabox-efs#0.2.0', name: 'efs', config: efs do + Component template: 'github:base2services/hl-component-ciinabox-efs#0.2.1', name: 'efs', config: efs do parameter name: 'EnvironmentName', value: "#{ciinabox_name}" parameter name: 'EnvironmentType', value: 'development' parameter name: 'VolumeName', value: "/#{ciinabox_name}-ciinabox-jenkins-master" @@ -105,7 +105,7 @@ CfhighlanderTemplate do parameter name: 'VPCCidr', value: cfout('vpc.VPCCidr') end - Component template: 'fargate-v2@0.7.3', name: 'jenkins', config: jenkins do + Component template: 'fargate-v2@0.8.2', name: 'jenkins', config: jenkins do parameter name: 'EnvironmentName', value: "#{ciinabox_name}" parameter name: 'EnvironmentType', value: 'development' parameter name: 'VPCId', value: cfout('vpc.VPCId') @@ -146,7 +146,7 @@ CfhighlanderTemplate do versions = config.fetch('version', {}) - Component template: 'ecs-service@2.12.0', name: service, config: config['service'] do + Component template: 'ecs-service@2.17.0', name: service, config: config['service'] do parameter name: 'EnvironmentName', value: "#{ciinabox_name}" parameter name: 'EnvironmentType', value: 'development' parameter name: 'NetworkPrefix', value: '10' diff --git a/lib/ciinabox/templates/internalloadbalancer.cfhighlander.rb.tt b/lib/ciinabox/templates/internalloadbalancer.cfhighlander.rb.tt index b62d288..e288b63 100644 --- a/lib/ciinabox/templates/internalloadbalancer.cfhighlander.rb.tt +++ b/lib/ciinabox/templates/internalloadbalancer.cfhighlander.rb.tt @@ -7,7 +7,7 @@ CfhighlanderTemplate do ComponentParam 'VPCCidr' end - Component template: 'route53-zone@1.4.0', name: 'intzone', config: internal_zone, render: Inline do + Component template: 'route53-zone@1.5.0', name: 'intzone', config: internal_zone, render: Inline do parameter name: 'CreateZone', value: 'true' parameter name: 'RootDomainName', value: Ref('RootDomainName') parameter name: 'AddNSRecords', value: 'true' @@ -20,7 +20,7 @@ CfhighlanderTemplate do parameter name: 'AlternativeNames', value: '' end - Component template: 'application-loadbalancer@0.4.2', name: 'intalb', config: internal_loadbalancer, render: Inline do + Component template: 'application-loadbalancer@0.5.0', name: 'intalb', config: internal_loadbalancer, render: Inline do parameter name: 'SslCertId', value: cfout('intcert.CertificateArn') parameter name: 'SubnetIds', value: Ref('SubnetIds') parameter name: 'VPCId', value: Ref('VPCId') diff --git a/lib/ciinabox/version.rb b/lib/ciinabox/version.rb index 3fd7114..478b122 100644 --- a/lib/ciinabox/version.rb +++ b/lib/ciinabox/version.rb @@ -1,4 +1,4 @@ module Ciinabox - VERSION = "0.8.7".freeze + VERSION = "0.8.8".freeze CHANGE_SET_VERSION = VERSION.gsub('.', '-').freeze end From 21e3068a7a1173adea2649281fdd1b2a61811b80 Mon Sep 17 00:00:00 2001 From: Aaron Walker Date: Fri, 2 Feb 2024 10:23:49 +0100 Subject: [PATCH 2/8] switch to github token --- .github/workflows/push.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index d79788d..4e49074 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -24,8 +24,8 @@ jobs: uses: docker/login-action@v2 with: registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GHCR_PUSH_TOKEN }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push Container Image to GitHub Container Repository uses: docker/build-push-action@v3 From 545b472478bb445ccbe00ebb7575a2c5e122e860 Mon Sep 17 00:00:00 2001 From: Tarun Menon Date: Mon, 5 Feb 2024 11:20:22 +1100 Subject: [PATCH 3/8] Bump gem dependencies, bump docker ruby to 3.1.4 --- Dockerfile | 2 +- ciinabox.gemspec | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6be11ee..662df82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7-alpine +FROM ruby:3.1.4-alpine ARG CIINABOX_VERSION='*' diff --git a/ciinabox.gemspec b/ciinabox.gemspec index e412dc4..a9e81c1 100644 --- a/ciinabox.gemspec +++ b/ciinabox.gemspec @@ -30,10 +30,10 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.required_ruby_version = '>= 2.7.0' - spec.add_dependency "thor", "~> 0.19" + spec.required_ruby_version = '>= 3.1.0' + spec.add_dependency "thor", "~> 1.2", ">= 1.2", "< 2" spec.add_dependency "terminal-table", '~> 1', '<2' - spec.add_dependency 'cfhighlander', '~>0.12', '<1' + spec.add_dependency 'cfhighlander', '~>0.13.4', '<1' spec.add_runtime_dependency 'aws-sdk-core', '~> 3','<4' spec.add_runtime_dependency 'aws-sdk-s3', '~> 1', '<2' spec.add_runtime_dependency 'aws-sdk-ec2', '~> 1', '<2' From 994e11ac96c42f7ecaba27b9e73b55604b9eed85 Mon Sep 17 00:00:00 2001 From: Tarun Menon Date: Fri, 23 Feb 2024 11:26:42 +1100 Subject: [PATCH 4/8] Try GHCR Push token again --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 4e49074..3aa9506 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -25,7 +25,7 @@ jobs: with: registry: ghcr.io username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} + password: ${{ secrets.GHCR_PUSH_TOKEN }} - name: Build and push Container Image to GitHub Container Repository uses: docker/build-push-action@v3 From 0f190ae4750caf408f36886f09c9afd4d8ef31e4 Mon Sep 17 00:00:00 2001 From: Tarun Menon Date: Fri, 23 Feb 2024 11:29:00 +1100 Subject: [PATCH 5/8] Revert to github token --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 3aa9506..4e49074 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -25,7 +25,7 @@ jobs: with: registry: ghcr.io username: ${{ github.actor }} - password: ${{ secrets.GHCR_PUSH_TOKEN }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push Container Image to GitHub Container Repository uses: docker/build-push-action@v3 From d18aa1744d0bebda35bb6ecec8f7b68b5e7f60b8 Mon Sep 17 00:00:00 2001 From: Tarun Menon Date: Mon, 26 Feb 2024 10:51:21 +1100 Subject: [PATCH 6/8] Update release to github token --- .github/workflows/release-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-image.yml b/.github/workflows/release-image.yml index a6ec8ed..653d150 100644 --- a/.github/workflows/release-image.yml +++ b/.github/workflows/release-image.yml @@ -18,7 +18,7 @@ jobs: with: registry: ghcr.io username: ${{ github.repository_owner }} - password: ${{ secrets.GHCR_PUSH_TOKEN }} + password: ${{ secrets.GITHUB_TOKEN }} - uses: docker/build-push-action@v3 with: From f5f52ec2738d5b6d516a26b0ead5ad756b42a030 Mon Sep 17 00:00:00 2001 From: Tarun Menon Date: Mon, 26 Feb 2024 11:33:36 +1100 Subject: [PATCH 7/8] Bump vpc component version to 0.10.3 --- lib/ciinabox/templates/ciinabox.cfhighlander.rb.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ciinabox/templates/ciinabox.cfhighlander.rb.tt b/lib/ciinabox/templates/ciinabox.cfhighlander.rb.tt index 0b5714d..dd40d7e 100644 --- a/lib/ciinabox/templates/ciinabox.cfhighlander.rb.tt +++ b/lib/ciinabox/templates/ciinabox.cfhighlander.rb.tt @@ -3,7 +3,7 @@ CfhighlanderTemplate do ComponentDistribution "s3://#{source_bucket}/cloudformation/ciinabox/#{ciinabox_name}" ComponentVersion "#{Ciinabox::VERSION}" - Component template: 'vpc-v2@0.10.2', name: 'vpc', config: vpc do + Component template: 'vpc-v2@0.10.3', name: 'vpc', config: vpc do parameter name: 'EnvironmentName', value: "#{ciinabox_name}" parameter name: 'EnvironmentType', value: 'development' parameter name: 'DnsDomain', value: "#{root_domain}" From ecaabe6a1494791fbe650a317d98a876a79e5b7a Mon Sep 17 00:00:00 2001 From: Tarun Menon Date: Tue, 27 Feb 2024 09:46:36 +1100 Subject: [PATCH 8/8] Bump components with python 3.11 runtimes --- lib/ciinabox/templates/ciinabox.cfhighlander.rb.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ciinabox/templates/ciinabox.cfhighlander.rb.tt b/lib/ciinabox/templates/ciinabox.cfhighlander.rb.tt index dd40d7e..9039eb0 100644 --- a/lib/ciinabox/templates/ciinabox.cfhighlander.rb.tt +++ b/lib/ciinabox/templates/ciinabox.cfhighlander.rb.tt @@ -71,7 +71,7 @@ CfhighlanderTemplate do parameter name: 'JenkinsUser', value: 'ciinabox' end - Component template: 'github:base2services/hl-component-assume-role-mfa#0.2.0', name: 'mfa', config: mfa do + Component template: 'github:base2services/hl-component-assume-role-mfa#0.2.1', name: 'mfa', config: mfa do parameter name: 'EnvironmentName', value: "#{ciinabox_name}" parameter name: 'EnvironmentType', value: 'development' end @@ -129,7 +129,7 @@ CfhighlanderTemplate do end end - Component template: 'github:base2services/hl-component-jenkins-ec2-agents#0.3.1', name: 'ec2agents', config: ec2agents do + Component template: 'github:base2services/hl-component-jenkins-ec2-agents#0.3.2', name: 'ec2agents', config: ec2agents do parameter name: 'EnvironmentName', value: "#{ciinabox_name}" parameter name: 'EnvironmentType', value: 'development' parameter name: 'S3Bucket', value: "#{source_bucket}"