Skip to content

Commit 0990f1c

Browse files
authored
fix: auditpolicy handler causing unwanted rollout (#1391)
**What problem does this PR solve?**: The v3 handler already had just the single `auditpolicy` from before, this PR renames the handlers and then updates by copying from an [older version](https://github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/blob/v0.33.3/pkg/handlers/generic/mutation/auditpolicy/inject.go) before #1270 went in. **Which issue(s) this PR fixes**: Fixes # **How Has This Been Tested?**: <!-- Please describe the tests that you ran to verify your changes. Provide output from the tests and any manual steps needed to replicate the tests. --> **Special notes for your reviewer**: <!-- Use this to provide any additional information to the reviewers. This may include: - Best way to review the PR. - Where the author wants the most review attention on. - etc. -->
1 parent d3caab0 commit 0990f1c

File tree

26 files changed

+62
-58
lines changed

26 files changed

+62
-58
lines changed

charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/aws-cluster-class.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ spec:
2323
patches:
2424
- external:
2525
discoverVariablesExtension: awsclusterconfigvars-dv.cluster-api-runtime-extensions-nutanix
26-
generateExtension: awsclusterv4configpatch-gp.cluster-api-runtime-extensions-nutanix
26+
generateExtension: awsclusterv5configpatch-gp.cluster-api-runtime-extensions-nutanix
2727
name: cluster-config
2828
- external:
2929
discoverVariablesExtension: awsworkerconfigvars-dv.cluster-api-runtime-extensions-nutanix
30-
generateExtension: awsworkerv4configpatch-gp.cluster-api-runtime-extensions-nutanix
30+
generateExtension: awsworkerv5configpatch-gp.cluster-api-runtime-extensions-nutanix
3131
name: worker-config
3232
workers:
3333
machineDeployments:

charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/docker-cluster-class.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ spec:
3131
patches:
3232
- external:
3333
discoverVariablesExtension: dockerclusterconfigvars-dv.cluster-api-runtime-extensions-nutanix
34-
generateExtension: dockerclusterv4configpatch-gp.cluster-api-runtime-extensions-nutanix
34+
generateExtension: dockerclusterv5configpatch-gp.cluster-api-runtime-extensions-nutanix
3535
name: cluster-config
3636
- external:
3737
discoverVariablesExtension: dockerworkerconfigvars-dv.cluster-api-runtime-extensions-nutanix
38-
generateExtension: dockerworkerv4configpatch-gp.cluster-api-runtime-extensions-nutanix
38+
generateExtension: dockerworkerv5configpatch-gp.cluster-api-runtime-extensions-nutanix
3939
name: worker-config
4040
workers:
4141
machineDeployments:

charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/eks-cluster-class.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ spec:
1818
patches:
1919
- external:
2020
discoverVariablesExtension: eksclusterconfigvars-dv.cluster-api-runtime-extensions-nutanix
21-
generateExtension: eksclusterv4configpatch-gp.cluster-api-runtime-extensions-nutanix
21+
generateExtension: eksclusterv5configpatch-gp.cluster-api-runtime-extensions-nutanix
2222
name: cluster-config
2323
- external:
2424
discoverVariablesExtension: eksworkerconfigvars-dv.cluster-api-runtime-extensions-nutanix
25-
generateExtension: eksworkerv4configpatch-gp.cluster-api-runtime-extensions-nutanix
25+
generateExtension: eksworkerv5configpatch-gp.cluster-api-runtime-extensions-nutanix
2626
name: worker-config
2727
workers:
2828
machineDeployments:

charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/nutanix-cluster-class.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ spec:
9898
patches:
9999
- external:
100100
discoverVariablesExtension: nutanixclusterconfigvars-dv.cluster-api-runtime-extensions-nutanix
101-
generateExtension: nutanixclusterv4configpatch-gp.cluster-api-runtime-extensions-nutanix
101+
generateExtension: nutanixclusterv5configpatch-gp.cluster-api-runtime-extensions-nutanix
102102
name: cluster-config
103103
- external:
104104
discoverVariablesExtension: nutanixworkerconfigvars-dv.cluster-api-runtime-extensions-nutanix
105-
generateExtension: nutanixworkerv4configpatch-gp.cluster-api-runtime-extensions-nutanix
105+
generateExtension: nutanixworkerv5configpatch-gp.cluster-api-runtime-extensions-nutanix
106106
name: worker-config
107107
workers:
108108
machineDeployments:

docs/content/getting-started/integrating-with-your-clusterclass/_index.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ The required values are shown below per provider.
2121
patches:
2222
- external:
2323
discoverVariablesExtension: awsclusterconfigvars.cluster-api-runtime-extensions-nutanix
24-
generateExtension: awsclusterv4configpatch.cluster-api-runtime-extensions-nutanix
24+
generateExtension: awsclusterv5configpatch.cluster-api-runtime-extensions-nutanix
2525
name: cluster-config
2626
- external:
2727
discoverVariablesExtension: awsworkerconfigvars.cluster-api-runtime-extensions-nutanix
28-
generateExtension: awsworkerv4configpatch.cluster-api-runtime-extensions-nutanix
28+
generateExtension: awsworkerv5configpatch.cluster-api-runtime-extensions-nutanix
2929
name: worker-config
3030
```
3131
@@ -35,11 +35,11 @@ The required values are shown below per provider.
3535
patches:
3636
- external:
3737
discoverVariablesExtension: nutanixclusterconfigvars.cluster-api-runtime-extensions-nutanix
38-
generateExtension: nutanixclusterv4configpatch.cluster-api-runtime-extensions-nutanix
38+
generateExtension: nutanixclusterv5configpatch.cluster-api-runtime-extensions-nutanix
3939
name: cluster-config
4040
- external:
4141
discoverVariablesExtension: nutanixworkerconfigvars.cluster-api-runtime-extensions-nutanix
42-
generateExtension: nutanixworkerv4configpatch.cluster-api-runtime-extensions-nutanix
42+
generateExtension: nutanixworkerv5configpatch.cluster-api-runtime-extensions-nutanix
4343
name: worker-config
4444
```
4545
@@ -49,11 +49,11 @@ The required values are shown below per provider.
4949
patches:
5050
- external:
5151
discoverVariablesExtension: dockerclusterconfigvars.cluster-api-runtime-extensions-nutanix
52-
generateExtension: dockerclusterv4configpatch.cluster-api-runtime-extensions-nutanix
52+
generateExtension: dockerclusterv5configpatch.cluster-api-runtime-extensions-nutanix
5353
name: cluster-config
5454
- external:
5555
discoverVariablesExtension: dockerworkerconfigvars.cluster-api-runtime-extensions-nutanix
56-
generateExtension: dockerworkerv4configpatch.cluster-api-runtime-extensions-nutanix
56+
generateExtension: dockerworkerv5configpatch.cluster-api-runtime-extensions-nutanix
5757
name: worker-config
5858
```
5959
@@ -63,7 +63,7 @@ The required values are shown below per provider.
6363
patches:
6464
- external:
6565
discoverVariablesExtension: genericclusterconfigvars.cluster-api-runtime-extensions-nutanix
66-
generateExtension: genericclusterv4configpatch.cluster-api-runtime-extensions-nutanix
66+
generateExtension: genericclusterv5configpatch.cluster-api-runtime-extensions-nutanix
6767
name: cluster-config
6868
```
6969

hack/examples/overlays/clusterclasses/aws/kustomization.yaml.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ patches:
1919
value:
2020
- name: "cluster-config"
2121
external:
22-
generateExtension: "awsclusterv4configpatch-gp.cluster-api-runtime-extensions-nutanix"
22+
generateExtension: "awsclusterv5configpatch-gp.cluster-api-runtime-extensions-nutanix"
2323
discoverVariablesExtension: "awsclusterconfigvars-dv.cluster-api-runtime-extensions-nutanix"
2424
- name: "worker-config"
2525
external:
26-
generateExtension: "awsworkerv4configpatch-gp.cluster-api-runtime-extensions-nutanix"
26+
generateExtension: "awsworkerv5configpatch-gp.cluster-api-runtime-extensions-nutanix"
2727
discoverVariablesExtension: "awsworkerconfigvars-dv.cluster-api-runtime-extensions-nutanix"
2828
- target:
2929
kind: AWSMachineTemplate

hack/examples/overlays/clusterclasses/docker/kustomization.yaml.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ patches:
1919
value:
2020
- name: "cluster-config"
2121
external:
22-
generateExtension: "dockerclusterv4configpatch-gp.cluster-api-runtime-extensions-nutanix"
22+
generateExtension: "dockerclusterv5configpatch-gp.cluster-api-runtime-extensions-nutanix"
2323
discoverVariablesExtension: "dockerclusterconfigvars-dv.cluster-api-runtime-extensions-nutanix"
2424
- name: "worker-config"
2525
external:
26-
generateExtension: "dockerworkerv4configpatch-gp.cluster-api-runtime-extensions-nutanix"
26+
generateExtension: "dockerworkerv5configpatch-gp.cluster-api-runtime-extensions-nutanix"
2727
discoverVariablesExtension: "dockerworkerconfigvars-dv.cluster-api-runtime-extensions-nutanix"
2828

2929
# BEGIN Initialize lists and maps

hack/examples/overlays/clusterclasses/eks/kustomization.yaml.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ patches:
2424
value:
2525
- name: "cluster-config"
2626
external:
27-
generateExtension: "eksclusterv4configpatch-gp.cluster-api-runtime-extensions-nutanix"
27+
generateExtension: "eksclusterv5configpatch-gp.cluster-api-runtime-extensions-nutanix"
2828
discoverVariablesExtension: "eksclusterconfigvars-dv.cluster-api-runtime-extensions-nutanix"
2929
- name: "worker-config"
3030
external:
31-
generateExtension: "eksworkerv4configpatch-gp.cluster-api-runtime-extensions-nutanix"
31+
generateExtension: "eksworkerv5configpatch-gp.cluster-api-runtime-extensions-nutanix"
3232
discoverVariablesExtension: "eksworkerconfigvars-dv.cluster-api-runtime-extensions-nutanix"
3333
- target:
3434
kind: AWSMachineTemplate

hack/examples/overlays/clusterclasses/nutanix/kustomization.yaml.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ patches:
1919
value:
2020
- name: "cluster-config"
2121
external:
22-
generateExtension: "nutanixclusterv4configpatch-gp.cluster-api-runtime-extensions-nutanix"
22+
generateExtension: "nutanixclusterv5configpatch-gp.cluster-api-runtime-extensions-nutanix"
2323
discoverVariablesExtension: "nutanixclusterconfigvars-dv.cluster-api-runtime-extensions-nutanix"
2424
- name: "worker-config"
2525
external:
26-
generateExtension: "nutanixworkerv4configpatch-gp.cluster-api-runtime-extensions-nutanix"
26+
generateExtension: "nutanixworkerv5configpatch-gp.cluster-api-runtime-extensions-nutanix"
2727
discoverVariablesExtension: "nutanixworkerconfigvars-dv.cluster-api-runtime-extensions-nutanix"
2828

2929
# BEGIN Initialize lists and maps

pkg/handlers/aws/handlers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
awsmutation "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/mutation"
1313
awsworkerconfig "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/aws/workerconfig"
1414
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/options"
15-
awsmutationvprev "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/v3/aws/mutation"
15+
awsmutationvprev "github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/v4/aws/mutation"
1616
)
1717

1818
type Handlers struct{}

0 commit comments

Comments
 (0)