Skip to content

Bastion ami lookup fix #5940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
srihari-spectro wants to merge 13 commits into from
Closed

Bastion ami lookup fix #5940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
314626a
Spectro CICD
zulfilee Jun 4, 2023
97239bf
Spectro CICD
zulfilee Jun 4, 2023
8c2d0d0
Create spectro-release.yaml
zulfilee Jun 4, 2023
c67331d
Spectro CICD
zulfilee Jun 4, 2023
34548c5
Merge branch 'kubernetes-sigs:main' into main
snehala27 Nov 7, 2024
0234581
Merge branch 'kubernetes-sigs:main' into main
snehala27 Feb 4, 2025
5123fbc
Merge branch 'kubernetes-sigs:main' into main
snehala27 Feb 12, 2025
8b69ba1
added git leaks ignore
alekhyarani2812 Feb 13, 2025
4d449e3
fixed gitleaks
alekhyarani2812 Mar 3, 2025
198e810
fixed gitleaks
alekhyarani2812 Mar 3, 2025
bae3ac5
Merge branch 'kubernetes-sigs:main' into main
AmitSahastra Mar 10, 2025
6e6aeda
Merge pull request #945 from spectrocloud/git-gitleaks2
vishwanaths Mar 17, 2025
eea07ee
fix: default bastion ami lookup
srihari-spectro Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 68 additions & 0 deletions .github/workflows/spectro-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: Spectro Release
run-name: Release for Cluster API AWS ${{ github.event.inputs.release_version }}
on:
workflow_dispatch:
inputs:
release_version:
description: 'Cluster API Version to Build'
required: true
default: '0.0.0'
jobs:
builder:
# edge-runner machine group is a bunch of machines in US Datacenter
runs-on: ubuntu-latest
# Initialize all secrets required for the job
# Ensure that the credentials are provided as encrypted secrets
env:
SPECTRO_VERSION: ${{ github.event.inputs.release_version }}
steps:
-
uses: mukunku/tag-exists-action@v1.2.0
id: checkTag
with:
tag: spectro-v${{ github.event.inputs.release_version }}
-
if: ${{ steps.checkTag.outputs.exists == 'true' }}
run: |
echo "Tag already exists for spectro-v${{ github.event.inputs.release_version }}..."
exit 1
-
uses: actions/checkout@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
-
name: Login to private registry
uses: docker/login-action@v1
with:
registry: ${{ secrets.REGISTRY_URL }}
username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_PASSWORD }}
-
name: Build Image
env:
DEV_REGISTRY: gcr.io/spectro-images-public/release/cluster-api-aws
run: |
make docker-build-all
make docker-push-all
-
name: Build Image - FIPS Mode
env:
FIPS_ENABLE: yes
DEV_REGISTRY: gcr.io/spectro-images-public/release-fips/cluster-api-aws
run: |
make docker-build
make docker-push-gcr
-
name: Create Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: spectro-v${{ github.event.inputs.release_version }}
release_name: Release spectro-v${{ github.event.inputs.release_version }}
body: |
Release version ${{ github.event.inputs.release_version }}
draft: false
prerelease: false
121 changes: 121 additions & 0 deletions .gitleaksignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
b918c3636f5dcc030bbbc5191e757e37df87c682:config/crd/bases/controlplane.cluster.x-k8s.io_rosacontrolplanes.yaml:generic-api-key:104
b918c3636f5dcc030bbbc5191e757e37df87c682:config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusterstaticidentities.yaml:aws-access-token:115
d5f676271e87421c7d50e4024c37982e184523fb:controlplane/rosa/api/v1beta2/rosacontrolplane_types.go:generic-api-key:139
0dfa39ce3ff6861375c85b8a2e67808cc1b19aba:config/crd/bases/controlplane.cluster.x-k8s.io_rosacontrolplanes.yaml:generic-api-key:181
b9c39cb85e380da0410f1c19723d71482f42707d:docs/book/src/topics/rosa/creating-a-cluster.md:generic-api-key:32
b918c3636f5dcc030bbbc5191e757e37df87c682:config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusterstaticidentities.yaml:aws-access-token:115
d5f676271e87421c7d50e4024c37982e184523fb:controlplane/rosa/api/v1beta2/rosacontrolplane_types.go:generic-api-key:139
6f56ed2f9d8e4941fcb95d85c31e5b27157e0ae8:controllers/awsmachine_controller_unit_test.go:aws-access-token:1358
a9a6a68a538c900ebd053ffd4057dd3c12b824ca:spectro/generated/core-global.yaml:generic-api-key:15612
f819d64508e4bf2a111222a8cce10852da771f6d:test/e2e/data/infrastructure-aws/withclusterclass/e2e_test_templates/cluster-template-self-hosted-clusterclass.yaml:kubernetes-secret-yaml:275
f819d64508e4bf2a111222a8cce10852da771f6d:test/e2e/data/infrastructure-aws/withclusterclass/e2e_test_templates/cluster-template-nested-multitenancy-clusterclass.yaml:kubernetes-secret-yaml:300
f819d64508e4bf2a111222a8cce10852da771f6d:test/e2e/data/infrastructure-aws/withclusterclass/e2e_test_templates/cluster-template-topology.yaml:kubernetes-secret-yaml:271
f819d64508e4bf2a111222a8cce10852da771f6d:test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-ignition.yaml:kubernetes-secret-yaml:402
f819d64508e4bf2a111222a8cce10852da771f6d:test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-gpu.yaml:kubernetes-secret-yaml:360
f819d64508e4bf2a111222a8cce10852da771f6d:test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-peered-remote.yaml:kubernetes-secret-yaml:383
f819d64508e4bf2a111222a8cce10852da771f6d:test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-nested-multitenancy.yaml:kubernetes-secret-yaml:369
f819d64508e4bf2a111222a8cce10852da771f6d:test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-internal-elb.yaml:kubernetes-secret-yaml:370
f819d64508e4bf2a111222a8cce10852da771f6d:test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-limit-az.yaml:kubernetes-secret-yaml:356
f819d64508e4bf2a111222a8cce10852da771f6d:test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-kcp-scale-in.yaml:kubernetes-secret-yaml:359
f819d64508e4bf2a111222a8cce10852da771f6d:test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-multi-az.yaml:kubernetes-secret-yaml:365
f819d64508e4bf2a111222a8cce10852da771f6d:test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-md-remediation.yaml:kubernetes-secret-yaml:358
f819d64508e4bf2a111222a8cce10852da771f6d:test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-kcp-remediation.yaml:kubernetes-secret-yaml:356
f819d64508e4bf2a111222a8cce10852da771f6d:test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-upgrades.yaml:kubernetes-secret-yaml:353
f819d64508e4bf2a111222a8cce10852da771f6d:test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-remote-management-cluster.yaml:kubernetes-secret-yaml:363
f819d64508e4bf2a111222a8cce10852da771f6d:test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-machine-pool.yaml:kubernetes-secret-yaml:399
f819d64508e4bf2a111222a8cce10852da771f6d:test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-simple-multitenancy.yaml:kubernetes-secret-yaml:359
f819d64508e4bf2a111222a8cce10852da771f6d:test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-ssm.yaml:kubernetes-secret-yaml:359
f819d64508e4bf2a111222a8cce10852da771f6d:test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-upgrade-to-main.yaml:kubernetes-secret-yaml:353
f819d64508e4bf2a111222a8cce10852da771f6d:test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-upgrade-to-external-cloud-provider.yaml:kubernetes-secret-yaml:354
f819d64508e4bf2a111222a8cce10852da771f6d:test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-spot-instances.yaml:kubernetes-secret-yaml:355
f819d64508e4bf2a111222a8cce10852da771f6d:test/e2e/data/infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template.yaml:kubernetes-secret-yaml:353
e870085ca5da418917a14d076a9e550b75a560af:pkg/cloud/services/eks/oidc_test.go:private-key:219
4274a5ab5c9dc391045840d6e45e17fe0cbab3dc:api/v1beta1/awsidentity_types.go:aws-access-token:102
4274a5ab5c9dc391045840d6e45e17fe0cbab3dc:docs/book/src/crd/index.md:aws-access-token:6810
c09f55f8f2249d9fde6d7878a6595bf1c4672ff2:api/v1alpha4/awsidentity_types.go:aws-access-token:99
6de2f7f9a9ae4f8dd2209bf817b07d646541f769:docs/book/src/topics/multitenancy.md:aws-access-token:106
b2d95c7993f7ea675a1a922d6fd17887a6a1b40d:api/v1alpha3/awsidentity_types.go:aws-access-token:99
64cb6b39ffcd706b636c596e58501c73625504a2:spectro/global/generated/infra-global.yaml:aws-access-token:1634
2f7b382b70ccbf7c2b4b56f9a14227c5b422b698:docs/proposal/20200506-single-controller-multitenancy.md:aws-access-token:416
33dd129c4b4d3e9af7409718c217bfec2f43bc09:docs/prerequisites.md:private-key:52
d73e3c924eb5780993cc33f155e54b5565460df1:config/default/aws_credentials_patch.yaml:kubernetes-secret-yaml:2
d73e3c924eb5780993cc33f155e54b5565460df1:config/manager/credentials.yaml:kubernetes-secret-yaml:2
5f035ffcfd73bfbe46ef8e08e582fdc5f63d8e42:pkg/cloud/aws/services/ec2/instances_test.go:generic-api-key:691
e6362776ad2f685d8ae7106e14c66322a17b4e89:docs/getting-started.md:aws-access-token:219
b9c39cb85e380da0410f1c19723d71482f42707d:docs/book/src/topics/rosa/creating-a-cluster.md:generic-api-key:60
b9c39cb85e380da0410f1c19723d71482f42707d:docs/book/src/topics/rosa/creating-a-cluster.md:generic-api-key:62
b918c3636f5dcc030bbbc5191e757e37df87c682:config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusterstaticidentities.yaml:aws-access-token:219
b9c39cb85e380da0410f1c19723d71482f42707d:docs/book/src/topics/rosa/creating-a-cluster.md:generic-api-key:75
4b036342bf0a24960c8935dccbd3b568cca24d1e:controlplane/rosa/api/v1beta2/rosacontrolplane_types.go:generic-api-key:73
4b036342bf0a24960c8935dccbd3b568cca24d1e:config/crd/bases/controlplane.cluster.x-k8s.io_rosacontrolplanes.yaml:generic-api-key:78
a65f1f5d7875ec175e7746ff3e75b0786b061136:controllers/awsmachine_controller_unit_test.go:aws-access-token:1328
a9a6a68a538c900ebd053ffd4057dd3c12b824ca:spectro/generated/core-global.yaml:aws-access-token:3620
4023bd0728981b3b6325de970514de600e6fefa7:config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusterstaticidentities.yaml:aws-access-token:110
4274a5ab5c9dc391045840d6e45e17fe0cbab3dc:docs/book/src/index.md:aws-access-token:6861
69cf50ca1ce11e8a656f8f05dffe28594d1e3ac2:docs/book/src/topics/multitenancy.md:aws-access-token:106
c504ceea9408cff57bc2d6f2ae6ae0e220299ea2:docs/book/src/topics/cs/rosa/creating-a-cluster.md:generic-api-key:12
a9a6a68a538c900ebd053ffd4057dd3c12b824ca:spectro/generated/core-global.yaml:aws-access-token:3724
c504ceea9408cff57bc2d6f2ae6ae0e220299ea2:docs/book/src/topics/rosa/creating-a-cluster.md:generic-api-key:12
c504ceea9408cff57bc2d6f2ae6ae0e220299ea2:docs/book/src/tpoics/rosa/creating-a-cluster.md:generic-api-key:20
2ea1f0c049f2586a5fe9d5d76ff957c1768e1886:spectro/generated/core-global.yaml:aws-access-token:2416
4023bd0728981b3b6325de970514de600e6fefa7:config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusterstaticidentities.yaml:aws-access-token:217
4274a5ab5c9dc391045840d6e45e17fe0cbab3dc:docs/book/src/crd/index.md:aws-access-token:6861
2f7b382b70ccbf7c2b4b56f9a14227c5b422b698:docs/proposal/20200506-single-controller-multitenancy.md:aws-access-token:455
5f035ffcfd73bfbe46ef8e08e582fdc5f63d8e42:pkg/cloud/aws/services/ec2/instances_test.go:generic-api-key:697
6552b101d8818474937df95298ac731beb9b40e3:docs/getting-started.md:private-key:81
c504ceea9408cff57bc2d6f2ae6ae0e220299ea2:docs/book/src/topics/
2ea1f0c049f2586a5fe9d5d76ff957c1768e1886:spectro/generated/core-global.yaml:aws-access-token:2515
c504ceea9408cff57bc2d6f2ae6ae0e220299ea2:docs/book/src/topics/rosa/creating-a-cluster.md:generic-api-key:20
1f0edb43e6963cc0ffae1113f8a3732d2dc1e1fd:spectro/generated/core-global.yaml:aws-access-token:2412
4023bd0728981b3b6325de970514de600e6fefa7:config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusterstaticidentities.yaml:aws-access-token:315
38daadfa6b9b65ae367b5e7f1ba8a09021a0e3ac:docs/book/src/crd/index.md:aws-access-token:3929
5f035ffcfd73bfbe46ef8e08e582fdc5f63d8e42:pkg/cloud/aws/services/ec2/instances_test.go:generic-api-key:728
6552b101d8818474937df95298ac731beb9b40e3:docs/getting-started.md:private-key:94
c504ceea9408cff57bc2d6f2ae6ae0e220299ea2:docs/book/src/topics/rosa/creating-a-cluster.md:generic-api-key:33
1f0edb43e6963cc0ffae1113f8a3732d2dc1e1fd:spectro/generated/core-global.yaml:aws-access-token:2511
4274a5ab5c9dc391045840d6e45e17fe0cbab3dc:config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusterstaticidentities.yaml:aws-access-token:217
38daadfa6b9b65ae367b5e7f1ba8a09021a0e3ac:docs/book/src/crd/index.md:aws-access-token:3980
5f035ffcfd73bfbe46ef8e08e582fdc5f63d8e42:pkg/cloud/aws/services/ec2/instances_test.go:generic-api-key:734
6552b101d8818474937df95298ac731beb9b40e3:docs/getting-started.md:aws-access-token:186
c504ceea9408cff57bc2d6f2ae6ae0e220299ea2:docs/book/src/cs/rosa/creating-a-cluster.md:generic-api-key:62
5f4d93ed60ef93a6cae49d0eea651a19255c2acc:spectro/generated/core-global.yaml:aws-access-token:3287
c957d07c981dde0cff4dc7bd4e132fc943f040f6:config/crd/bases/nfrastructure.cluster.x-k8s.io_awsclusterstaticidentities.yaml:aws-access-token:113
5f035ffcfd73bfbe46ef8e08e582fdc5f63d8e42:pkg/cloud/aws/ices/ec2/instances_test.go:generic-api-key:769
6552b101d8818474937df95298ac731beb9b40e3:docs/getting-started.md:aws-access-token:196
c504ceea9408cff57bc2d6f2ae6ae0e220299ea2:docs/book/src/topics/rosa/creating-a-cluster.md:generic-api-key:62
5f4d93ed60ef93a6cae49d0eea651a19255c2acc:spectro/generated/core-global.yaml:aws-access-token:3394
c957d07c981dde0cff4dc7bd4e132fc943f040f6:config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusterstaticidentities.yaml:aws-access-token:113
5f035ffcfd73bfbe46ef8e08e582fdc5f63d8e42:pkg/cloud/aws/services/ec2/instances_test.go:generic-api-key:769
c504ceea9408cff57bc2d6f2ae6ae0e220299ea2:docs/book/src/topics/rosa/creating-a-cluster.md:generic-api-key:64
5f4d93ed60ef93a6cae49d0eea651a19255c2acc:spectro/generated/core-global.yaml:aws-access-token:3492
b2d95c7993f7ea675a1a922d6fd17887a6a1b40d:config/crd/bases/infrastructure.cluster.x-k8s.io_awsclusterstaticidentities.yaml:aws-access-token:113
5f035ffcfd73bfbe46ef8e08e582fdc5f63d8e42:pkg/cloud/aws/services/ec2/instances_test.go:generic-api-key:775
c504ceea9408cff57bc2d6f2ae6ae0e220299ea2:docs/book/src/topics/rosa/creating-a-cluster.md:generic-api-key:78
5aae9058f5f1c235fc7ebd4ac521a3ee4e7cfdfa:spectro/generated/core-global.yaml:aws-access-token:3287
5f035ffcfd73bfbe46ef8e08e582fdc5f63d8e42:pkg/cloud/aws/services/ec2/instances_test.go:generic-api-key:804
4b036342bf0a24960c8935dccbd3b568cca24d1e:docs/book/src/topics/rosa/creating-a-cluster.md:generic-api-key:11
5aae9058f5f1c235fc7ebd4ac521a3ee4e7cfdfa:spectro/generated/core-global.yaml:aws-access-token:3394
5f035ffcfd73bfbe46ef8e08e582fdc5f63d8e42:pkg/cloud/aws/services/ec2/instances_test.go:generic-api-key:810
5aae9058f5f1c235fc7ebd4ac521a3ee4e7cfdfa:spectro/generated/core-global.yaml:aws-access-token:3492
5f035ffcfd73bfbe46ef8e08e582fdc5f63d8e42:pkg/cloud/aws/services/ec2/instances_test.go:generic-api-key:859
1433e5c89a2db3d2352a3243fc8b415ac0711644:spectro/generated/core-global.yaml:aws-access-token:3287
5f035ffcfd73bfbe46ef8e08e582fdc5f63d8e42:pkg/cloud/aws/services/ec2/instances_test.go:generic-api-key:865
1433e5c89a2db3d2352a3243fc8b415ac0711644:spectro/generated/core-global.yaml:aws-access-token:3394
5f035ffcfd73bfbe46ef8e08e582fdc5f63d8e42:pkg/cloud/aws/services/ec2/instances_test.go:generic-api-key:901
1433e5c89a2db3d2352a3243fc8b415ac0711644:spectro/generated/core-global.yaml:aws-access-token:3492
5f035ffcfd73bfbe46ef8e08e582fdc5f63d8e42:pkg/cloud/aws/services/ec2/instances_test.go:generic-api-key:907
6222a549792b27f98bbf365b1f9f3b07022b2328:spectro/generated/core-global.yaml:aws-access-token:3287
5f035ffcfd73bfbe46ef8e08e582fdc5f63d8e42:pkg/cloud/aws/services/ec2/instances_test.go:generic-api-key:947
6222a549792b27f98bbf365b1f9f3b07022b2328:spectro/generated/core-global.yaml:aws-access-token:3394
5f035ffcfd73bfbe46ef8e08e582fdc5f63d8e42:pkg/cloud/aws/services/ec2/instances_test.go:generic-api-key:953
6222a549792b27f98bbf365b1f9f3b07022b2328:spectro/generated/core-global.yaml:aws-access-token:3492
5f035ffcfd73bfbe46ef8e08e582fdc5f63d8e42:pkg/cloud/aws/services/ec2/instances_test.go:generic-api-key:987
1e471ff39fffbedd35bc102289e8b63bf0da3c36:spectro/generated/core-global.yaml:aws-access-token:3287
5f035ffcfd73bfbe46ef8e08e582fdc5f63d8e42:pkg/cloud/aws/services/ec2/instances_test.go:generic-api-key:993
1e471ff39fffbedd35bc102289e8b63bf0da3c36:spectro/generated/core-global.yaml:aws-access-token:3394
1e471ff39fffbedd35bc102289e8b63bf0da3c36:spectro/generated/core-global.yaml:aws-access-token:3492
5bf74bd95d214963c4c9f39dadaae9bc65918dde:spectro/generated/core-global.yaml:aws-access-token:2235
5bf74bd95d214963c4c9f39dadaae9bc65918dde:spectro/generated/core-global.yaml:aws-access-token:2341
c804ad68962af6a7562dd72d77dd97d3f7cfb4ab:spectro/generated/core-global.yaml:aws-access-token:2235
c804ad68962af6a7562dd72d77dd97d3f7cfb4ab:spectro/generated/core-global.yaml:aws-access-token:2341
64cb6b39ffcd706b636c596e58501c73625504a2:spectro/generated/core-global.yaml:aws-access-token:1634
2 changes: 1 addition & 1 deletion pkg/cloud/services/ec2/ami.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const (
ubuntuOwnerIDUsGov = "513442679011"

// Description regex for fetching Ubuntu AMIs for bastion host.
ubuntuImageDescription = "Canonical??Ubuntu??24.04?LTS??amd64?noble?image*"
ubuntuImageDescription = "Canonical??Ubuntu??24.04??amd64?noble?image*"

// defaultMachineAMILookupBaseOS is the default base operating system to use
// when looking up machine AMIs.
Expand Down
Loading