remove faulty regex and remove labels from awsmachinetemplate specs #401
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
/run cluster-test-suites |
bdehri
changed the title
|
/run cluster-test-suites |
AndiDog
reviewed
Oct 23, 2023
cluster-test-suites
📋 View full results in Tekton Dashboard Rerun trigger: |
cluster-test-suites
📋 View full results in Tekton Dashboard Rerun trigger: |
(helm/cluster-aws/ci/test-wc-minimal-values.yaml) rendered manifest diff(file level)
- two documents removed:
---
# Source: cluster-aws/templates/list.yaml
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
kind: AWSMachineTemplate
metadata:
name: test-wc-minimal-control-plane-40875668
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.45.0
application.giantswarm.io/team: phoenix
app.kubernetes.io/version: 0.45.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.45.0
application.giantswarm.io/team: phoenix
spec:
ami: {}
imageLookupBaseOS: flatcar-stable
imageLookupFormat: capa-ami-{{.BaseOS}}-v{{.K8sVersion}}-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:
labels:
cluster.x-k8s.io/role: bastion
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.45.0
application.giantswarm.io/team: phoenix
app.kubernetes.io/version: 0.45.0
name: test-wc-minimal-bastion-40875668
namespace: org-giantswarm
spec:
template:
metadata:
labels:
cluster.x-k8s.io/role: bastion
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.45.0
application.giantswarm.io/team: phoenix
spec:
instanceType: t3.small
cloudInit: {}
imageLookupBaseOS: flatcar-stable
imageLookupFormat: capa-ami-{{.BaseOS}}-v{{.K8sVersion}}-gs
imageLookupOrg: 706635527432
iamInstanceProfile: test-wc-minimal-bastion
publicIP: true
sshKeyName:
subnet:
filters:
- name: "tag:sigs.k8s.io/cluster-api-provider-aws/role"
values:
- public
- name: "tag:sigs.k8s.io/cluster-api-provider-aws/cluster/test-wc-minimal"
values:
- owned
- shared
---
# Source: cluster-aws/templates/list.yaml
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
kind: AWSMachineTemplate
metadata:
name: test-wc-minimal-control-plane-779bfa58
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.45.0
application.giantswarm.io/team: phoenix
app.kubernetes.io/version: 0.45.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.45.0
application.giantswarm.io/team: phoenix
spec:
ami: {}
imageLookupBaseOS: flatcar-stable
imageLookupFormat: capa-ami-{{.BaseOS}}-v{{.K8sVersion}}-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:
labels:
cluster.x-k8s.io/role: bastion
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.45.0
application.giantswarm.io/team: phoenix
app.kubernetes.io/version: 0.45.0
name: test-wc-minimal-bastion-17f76896
namespace: org-giantswarm
spec:
template:
metadata:
labels:
cluster.x-k8s.io/role: bastion
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.45.0
application.giantswarm.io/team: phoenix
spec:
instanceType: t3.small
cloudInit: {}
imageLookupBaseOS: flatcar-stable
imageLookupFormat: capa-ami-{{.BaseOS}}-v{{.K8sVersion}}-gs
imageLookupOrg: 706635527432
iamInstanceProfile: test-wc-minimal-bastion
publicIP: true
sshKeyName:
subnet:
filters:
- name: "tag:sigs.k8s.io/cluster-api-provider-aws/role"
values:
- public
- name: "tag:sigs.k8s.io/cluster-api-provider-aws/cluster/test-wc-minimal"
values:
- owned
- shared
/spec/machineTemplate/infrastructureRef/name (KubeadmControlPlane/org-giantswarm/test-wc-minimal)
± value change
- test-wc-minimal-control-plane-40875668
+ test-wc-minimal-control-plane-779bfa58
/spec/template/spec/infrastructureRef/name (MachineDeployment/org-giantswarm/test-wc-minimal-bastion)
± value change
- test-wc-minimal-bastion-40875668
+ test-wc-minimal-bastion-17f76896
|
|
/run cluster-test-suites |
bdehri
changed the title
AndiDog
approved these changes
Oct 23, 2023
cluster-test-suites
📋 View full results in Tekton Dashboard Rerun trigger: |
|
/run cluster-test-suites |
cluster-test-suites
📋 View full results in Tekton Dashboard Rerun trigger: |
|
/run cluster-test-suites |
cluster-test-suites
📋 View full results in Tekton Dashboard Rerun trigger: |
|
/run cluster-test-suites |
cluster-test-suites
📋 View full results in Tekton Dashboard Rerun trigger: |
|
/run cluster-test-suites |
cluster-test-suites
📋 View full results in Tekton Dashboard Rerun trigger: |
|
/run cluster-test-suites |
cluster-test-suites
📋 View full results in Tekton Dashboard Rerun trigger: |
fiunchinho
approved these changes
Oct 24, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it
We introduced regexReplace with this commit to prevent unnecessary node rolling which caused no node rolling at all. Instead of removing respective label via regex, all label related sections were moved to AWSMachineTemplate manifests directly.
Checklist
Trigger e2e tests
/run cluster-test-suites