Skip to content
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

Jump to bottom

Use new AMI which includes latest teleport binary v15.1.7 #567

Merged
merged 5 commits into from
Apr 2, 2024
Merged

Use new AMI which includes latest teleport binary v15.1.7 #567

merged 5 commits into from
Apr 2, 2024

Conversation

tuladhar
Copy link
Contributor

@tuladhar tuladhar commented Apr 1, 2024 •
edited
Loading

What this PR does / why we need it

Checklist

  • Update changelog in CHANGELOG.md.

Trigger e2e tests

/run cluster-test-suites

@tuladhar tuladhar requested a review from a team April 1, 2024 16:29
@tuladhar tuladhar self-assigned this Apr 1, 2024
@tuladhar tuladhar marked this pull request as ready for review April 1, 2024 16:30
@tuladhar tuladhar requested a review from a team as a code owner April 1, 2024 16:30
@tuladhar tuladhar requested a review from bdehri April 1, 2024 16:30
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Apr 1, 2024

There were differences in the rendered Helm template, please check! ⚠️

Output 
=== Differences when rendered with values file helm/cluster-aws/ci/test-mc-proxy-values.yaml ===

(file level)
  - one document removed:
    ---
    # Source: cluster-aws/templates/list.yaml
    apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
    kind: AWSMachineTemplate
    metadata:
      name: test-mc-proxy-control-plane-6e030827
      annotations:
      namespace: org-giantswarm
      labels:
        cluster.x-k8s.io/role: control-plane
        app: cluster-aws
        app.kubernetes.io/managed-by: Helm
        cluster.x-k8s.io/cluster-name: test-mc-proxy
        giantswarm.io/cluster: test-mc-proxy
        giantswarm.io/organization: test
        cluster.x-k8s.io/watch-filter: capi
        helm.sh/chart: cluster-aws-0.68.0
        application.giantswarm.io/team: phoenix
        app.kubernetes.io/version: 0.68.0
    spec:
      template:
        metadata:
          labels:
            cluster.x-k8s.io/role: control-plane
            app: cluster-aws
            app.kubernetes.io/managed-by: Helm
            cluster.x-k8s.io/cluster-name: test-mc-proxy
            giantswarm.io/cluster: test-mc-proxy
            giantswarm.io/organization: test
            cluster.x-k8s.io/watch-filter: capi
            helm.sh/chart: cluster-aws-0.68.0
            application.giantswarm.io/team: phoenix
        spec:
          ami: {}
          imageLookupBaseOS: flatcar-stable
          imageLookupFormat: capa-ami-{{.BaseOS}}-v{{.K8sVersion}}-2-gs
          imageLookupOrg: 706635527432
          cloudInit: {}
          instanceType: r6i.xlarge
          nonRootVolumes:
          - type: gp3
            deviceName: /dev/xvdc
            encrypted: true
            size: 100
          - type: gp3
            deviceName: /dev/xvdd
            encrypted: true
            size: 100
          - type: gp3
            deviceName: /dev/xvde
            encrypted: true
            size: 100
          rootVolume:
            type: gp3
            size: 120
          iamInstanceProfile: control-plane-test-mc-proxy
          sshKeyName:
          subnet:
            filters:
            - name: "tag:kubernetes.io/cluster/test-mc-proxy"
              values:
              - shared
              - owned
            - name: "tag:sigs.k8s.io/cluster-api-provider-aws/role"
              values:
              - private
  
    ---
    # Source: cluster-aws/templates/list.yaml
    apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
    kind: AWSMachineTemplate
    metadata:
      name: test-mc-proxy-control-plane-3aca4576
      annotations:
      namespace: org-giantswarm
      labels:
        cluster.x-k8s.io/role: control-plane
        app: cluster-aws
        app.kubernetes.io/managed-by: Helm
        cluster.x-k8s.io/cluster-name: test-mc-proxy
        giantswarm.io/cluster: test-mc-proxy
        giantswarm.io/organization: test
        cluster.x-k8s.io/watch-filter: capi
        helm.sh/chart: cluster-aws-0.68.0
        application.giantswarm.io/team: phoenix
        app.kubernetes.io/version: 0.68.0
    spec:
      template:
        metadata:
          labels:
            cluster.x-k8s.io/role: control-plane
            app: cluster-aws
            app.kubernetes.io/managed-by: Helm
            cluster.x-k8s.io/cluster-name: test-mc-proxy
            giantswarm.io/cluster: test-mc-proxy
            giantswarm.io/organization: test
            cluster.x-k8s.io/watch-filter: capi
            helm.sh/chart: cluster-aws-0.68.0
            application.giantswarm.io/team: phoenix
        spec:
          ami: {}
          imageLookupBaseOS: flatcar-stable
          imageLookupFormat: capa-ami-{{.BaseOS}}-v{{.K8sVersion}}-3-gs
          imageLookupOrg: 706635527432
          cloudInit: {}
          instanceType: r6i.xlarge
          nonRootVolumes:
          - type: gp3
            deviceName: /dev/xvdc
            encrypted: true
            size: 100
          - type: gp3
            deviceName: /dev/xvdd
            encrypted: true
            size: 100
          - type: gp3
            deviceName: /dev/xvde
            encrypted: true
            size: 100
          rootVolume:
            type: gp3
            size: 120
          iamInstanceProfile: control-plane-test-mc-proxy
          sshKeyName:
          subnet:
            filters:
            - name: "tag:kubernetes.io/cluster/test-mc-proxy"
              values:
              - shared
              - owned
            - name: "tag:sigs.k8s.io/cluster-api-provider-aws/role"
              values:
              - private
  

/spec/awsLaunchTemplate/imageLookupFormat  (infrastructure.cluster.x-k8s.io/v1beta2/AWSMachinePool/org-giantswarm/test-mc-proxy-pool0)
  ± value change
    - capa-ami-{{.BaseOS}}-v{{.K8sVersion}}-2-gs
    + capa-ami-{{.BaseOS}}-v{{.K8sVersion}}-3-gs

/spec/machineTemplate/infrastructureRef/name  (controlplane.cluster.x-k8s.io/v1beta1/KubeadmControlPlane/org-giantswarm/test-mc-proxy)
  ± value change
    - test-mc-proxy-control-plane-6e030827
    + test-mc-proxy-control-plane-3aca4576



=== Differences when rendered with values file helm/cluster-aws/ci/test-network-topology-values.yaml ===

(file level)
  - one document removed:
    ---
    # Source: cluster-aws/templates/list.yaml
    apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
    kind: AWSMachineTemplate
    metadata:
      name: test-wc-minimal-control-plane-2eceeab0
      annotations:
      namespace: org-giantswarm
      labels:
        cluster.x-k8s.io/role: control-plane
        app: cluster-aws
        app.kubernetes.io/managed-by: Helm
        cluster.x-k8s.io/cluster-name: test-wc-minimal
        giantswarm.io/cluster: test-wc-minimal
        giantswarm.io/organization: test
        cluster.x-k8s.io/watch-filter: capi
        helm.sh/chart: cluster-aws-0.68.0
        application.giantswarm.io/team: phoenix
        app.kubernetes.io/version: 0.68.0
    spec:
      template:
        metadata:
          labels:
            cluster.x-k8s.io/role: control-plane
            app: cluster-aws
            app.kubernetes.io/managed-by: Helm
            cluster.x-k8s.io/cluster-name: test-wc-minimal
            giantswarm.io/cluster: test-wc-minimal
            giantswarm.io/organization: test
            cluster.x-k8s.io/watch-filter: capi
            helm.sh/chart: cluster-aws-0.68.0
            application.giantswarm.io/team: phoenix
        spec:
          ami: {}
          imageLookupBaseOS: flatcar-stable
          imageLookupFormat: capa-ami-{{.BaseOS}}-v{{.K8sVersion}}-2-gs
          imageLookupOrg: 706635527432
          cloudInit: {}
          instanceType: r6i.xlarge
          nonRootVolumes:
          - type: gp3
            deviceName: /dev/xvdc
            encrypted: true
            size: 100
          - type: gp3
            deviceName: /dev/xvdd
            encrypted: true
            size: 100
          - type: gp3
            deviceName: /dev/xvde
            encrypted: true
            size: 100
          rootVolume:
            type: gp3
            size: 120
          iamInstanceProfile: control-plane-test-wc-minimal
          sshKeyName:
          subnet:
            filters:
            - name: "tag:kubernetes.io/cluster/test-wc-minimal"
              values:
              - shared
              - owned
  
    ---
    # Source: cluster-aws/templates/list.yaml
    apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
    kind: AWSMachineTemplate
    metadata:
      name: test-wc-minimal-control-plane-06fc0eb0
      annotations:
      namespace: org-giantswarm
      labels:
        cluster.x-k8s.io/role: control-plane
        app: cluster-aws
        app.kubernetes.io/managed-by: Helm
        cluster.x-k8s.io/cluster-name: test-wc-minimal
        giantswarm.io/cluster: test-wc-minimal
        giantswarm.io/organization: test
        cluster.x-k8s.io/watch-filter: capi
        helm.sh/chart: cluster-aws-0.68.0
        application.giantswarm.io/team: phoenix
        app.kubernetes.io/version: 0.68.0
    spec:
      template:
        metadata:
          labels:
            cluster.x-k8s.io/role: control-plane
            app: cluster-aws
            app.kubernetes.io/managed-by: Helm
            cluster.x-k8s.io/cluster-name: test-wc-minimal
            giantswarm.io/cluster: test-wc-minimal
            giantswarm.io/organization: test
            cluster.x-k8s.io/watch-filter: capi
            helm.sh/chart: cluster-aws-0.68.0
            application.giantswarm.io/team: phoenix
        spec:
          ami: {}
          imageLookupBaseOS: flatcar-stable
          imageLookupFormat: capa-ami-{{.BaseOS}}-v{{.K8sVersion}}-3-gs
          imageLookupOrg: 706635527432
          cloudInit: {}
          instanceType: r6i.xlarge
          nonRootVolumes:
          - type: gp3
            deviceName: /dev/xvdc
            encrypted: true
            size: 100
          - type: gp3
            deviceName: /dev/xvdd
            encrypted: true
            size: 100
          - type: gp3
            deviceName: /dev/xvde
            encrypted: true
            size: 100
          rootVolume:
            type: gp3
            size: 120
          iamInstanceProfile: control-plane-test-wc-minimal
          sshKeyName:
          subnet:
            filters:
            - name: "tag:kubernetes.io/cluster/test-wc-minimal"
              values:
              - shared
              - owned
  

/spec/awsLaunchTemplate/imageLookupFormat  (infrastructure.cluster.x-k8s.io/v1beta2/AWSMachinePool/org-giantswarm/test-wc-minimal-pool0)
  ± value change
    - capa-ami-{{.BaseOS}}-v{{.K8sVersion}}-2-gs
    + capa-ami-{{.BaseOS}}-v{{.K8sVersion}}-3-gs

/spec/machineTemplate/infrastructureRef/name  (controlplane.cluster.x-k8s.io/v1beta1/KubeadmControlPlane/org-giantswarm/test-wc-minimal)
  ± value change
    - test-wc-minimal-control-plane-2eceeab0
    + test-wc-minimal-control-plane-06fc0eb0



=== Differences when rendered with values file helm/cluster-aws/ci/test-wc-minimal-values.yaml ===

(file level)
  - one document removed:
    ---
    # Source: cluster-aws/templates/list.yaml
    apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
    kind: AWSMachineTemplate
    metadata:
      name: test-wc-minimal-control-plane-83bc6d0b
      annotations:
      namespace: org-giantswarm
      labels:
        cluster.x-k8s.io/role: control-plane
        app: cluster-aws
        app.kubernetes.io/managed-by: Helm
        cluster.x-k8s.io/cluster-name: test-wc-minimal
        giantswarm.io/cluster: test-wc-minimal
        giantswarm.io/organization: test
        cluster.x-k8s.io/watch-filter: capi
        helm.sh/chart: cluster-aws-0.68.0
        application.giantswarm.io/team: phoenix
        app.kubernetes.io/version: 0.68.0
    spec:
      template:
        metadata:
          labels:
            cluster.x-k8s.io/role: control-plane
            app: cluster-aws
            app.kubernetes.io/managed-by: Helm
            cluster.x-k8s.io/cluster-name: test-wc-minimal
            giantswarm.io/cluster: test-wc-minimal
            giantswarm.io/organization: test
            cluster.x-k8s.io/watch-filter: capi
            helm.sh/chart: cluster-aws-0.68.0
            application.giantswarm.io/team: phoenix
        spec:
          ami: {}
          imageLookupBaseOS: flatcar-stable
          imageLookupFormat: capa-ami-{{.BaseOS}}-v{{.K8sVersion}}-2-gs
          imageLookupOrg: 706635527432
          cloudInit: {}
          instanceType: r6i.xlarge
          nonRootVolumes:
          - type: gp3
            deviceName: /dev/xvdc
            encrypted: true
            size: 100
          - type: gp3
            deviceName: /dev/xvdd
            encrypted: true
            size: 100
          - type: gp3
            deviceName: /dev/xvde
            encrypted: true
            size: 100
          rootVolume:
            type: gp3
            size: 120
          iamInstanceProfile: control-plane-test-wc-minimal
          sshKeyName:
          subnet:
            filters:
            - name: "tag:kubernetes.io/cluster/test-wc-minimal"
              values:
              - shared
              - owned
            - name: "tag:sigs.k8s.io/cluster-api-provider-aws/role"
              values:
              - private
  
    ---
    # Source: cluster-aws/templates/list.yaml
    apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
    kind: AWSMachineTemplate
    metadata:
      name: test-wc-minimal-control-plane-1eae182f
      annotations:
      namespace: org-giantswarm
      labels:
        cluster.x-k8s.io/role: control-plane
        app: cluster-aws
        app.kubernetes.io/managed-by: Helm
        cluster.x-k8s.io/cluster-name: test-wc-minimal
        giantswarm.io/cluster: test-wc-minimal
        giantswarm.io/organization: test
        cluster.x-k8s.io/watch-filter: capi
        helm.sh/chart: cluster-aws-0.68.0
        application.giantswarm.io/team: phoenix
        app.kubernetes.io/version: 0.68.0
    spec:
      template:
        metadata:
          labels:
            cluster.x-k8s.io/role: control-plane
            app: cluster-aws
            app.kubernetes.io/managed-by: Helm
            cluster.x-k8s.io/cluster-name: test-wc-minimal
            giantswarm.io/cluster: test-wc-minimal
            giantswarm.io/organization: test
            cluster.x-k8s.io/watch-filter: capi
            helm.sh/chart: cluster-aws-0.68.0
            application.giantswarm.io/team: phoenix
        spec:
          ami: {}
          imageLookupBaseOS: flatcar-stable
          imageLookupFormat: capa-ami-{{.BaseOS}}-v{{.K8sVersion}}-3-gs
          imageLookupOrg: 706635527432
          cloudInit: {}
          instanceType: r6i.xlarge
          nonRootVolumes:
          - type: gp3
            deviceName: /dev/xvdc
            encrypted: true
            size: 100
          - type: gp3
            deviceName: /dev/xvdd
            encrypted: true
            size: 100
          - type: gp3
            deviceName: /dev/xvde
            encrypted: true
            size: 100
          rootVolume:
            type: gp3
            size: 120
          iamInstanceProfile: control-plane-test-wc-minimal
          sshKeyName:
          subnet:
            filters:
            - name: "tag:kubernetes.io/cluster/test-wc-minimal"
              values:
              - shared
              - owned
            - name: "tag:sigs.k8s.io/cluster-api-provider-aws/role"
              values:
              - private
  

/spec/awsLaunchTemplate/imageLookupFormat  (infrastructure.cluster.x-k8s.io/v1beta2/AWSMachinePool/org-giantswarm/test-wc-minimal-pool0)
  ± value change
    - capa-ami-{{.BaseOS}}-v{{.K8sVersion}}-2-gs
    + capa-ami-{{.BaseOS}}-v{{.K8sVersion}}-3-gs

/spec/machineTemplate/infrastructureRef/name  (controlplane.cluster.x-k8s.io/v1beta1/KubeadmControlPlane/org-giantswarm/test-wc-minimal)
  ± value change
    - test-wc-minimal-control-plane-83bc6d0b
    + test-wc-minimal-control-plane-1eae182f

@tuladhar
Copy link
Contributor Author

tuladhar commented Apr 1, 2024

/run cluster-test-suites

@tinkerers-ci
Copy link

tinkerers-ci bot commented Apr 1, 2024

cluster-test-suites

Run name pr-cluster-aws-567-cluster-test-suiteszw5xg
Commit SHA 4bd293e
Result Succeeded ✅

📋 View full results in Tekton Dashboard

Rerun trigger:
/run cluster-test-suites

@tuladhar tuladhar merged commit c2b5db5 into main Apr 2, 2024
14 checks passed
@tuladhar tuladhar deleted the bump-ami branch April 2, 2024 13:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AndiDog AndiDog AndiDog approved these changes

@whites11 whites11 whites11 approved these changes

@bdehri bdehri Awaiting requested review from bdehri

Assignees

@tuladhar tuladhar

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tuladhar @whites11 @AndiDog