Skip to content

feat: Explicitly disable profiling for CP components #1109

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

Merged
jimmidyson merged 1 commit into from
May 1, 2025
Merged

feat: Explicitly disable profiling for CP components #1109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/aws-cluster-class.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,14 @@ spec:
apiServer:
extraArgs:
cloud-provider: external
profiling: "false"
controllerManager:
extraArgs:
cloud-provider: external
profiling: "false"
scheduler:
extraArgs:
profiling: "false"
initConfiguration:
nodeRegistration:
kubeletExtraArgs:
Expand Down
11 changes: 10 additions & 1 deletion ...ts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/docker-cluster-class.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,16 @@ spec:
template:
spec:
kubeadmConfigSpec:
clusterConfiguration: {}
clusterConfiguration:
apiServer:
extraArgs:
profiling: "false"
controllerManager:
extraArgs:
profiling: "false"
scheduler:
extraArgs:
profiling: "false"
initConfiguration:
nodeRegistration: {}
joinConfiguration:
Expand Down
3 changes: 3 additions & 0 deletions ...s/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/nutanix-cluster-class.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,16 @@ spec:
apiServer:
extraArgs:
cloud-provider: external
profiling: "false"
tls-cipher-suites: TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
controllerManager:
extraArgs:
cloud-provider: external
profiling: "false"
tls-cipher-suites: TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
scheduler:
extraArgs:
profiling: "false"
tls-cipher-suites: TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
files:
- content: |-
Expand Down
8 changes: 7 additions & 1 deletion hack/examples/overlays/clusterclasses/aws/kustomization.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,13 @@ patches:
path: "/spec/template/spec/instanceType"
value: "PLACEHOLDER"
- target:
kind: AWSMachineTemplate
kind: AWSMachineTemplate
patch: |-
- op: "remove"
path: "/spec/template/spec/iamInstanceProfile"

# BEGIN CIS patches
- target:
kind: KubeadmControlPlaneTemplate
path: ../../../patches/disable-kubeadmcontrolplane-profiling.yaml
# END CIS patches
6 changes: 6 additions & 0 deletions hack/examples/overlays/clusterclasses/docker/kustomization.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,9 @@ patches:
external:
generateExtension: "dockerworkerv3configpatch-gp.cluster-api-runtime-extensions-nutanix"
discoverVariablesExtension: "dockerworkerconfigvars-dv.cluster-api-runtime-extensions-nutanix"

# BEGIN CIS patches
- target:
kind: KubeadmControlPlaneTemplate
path: ../../../patches/disable-kubeadmcontrolplane-profiling.yaml
# END CIS patches
6 changes: 6 additions & 0 deletions hack/examples/overlays/clusterclasses/nutanix/kustomization.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,9 @@ patches:
external:
generateExtension: "nutanixworkerv3configpatch-gp.cluster-api-runtime-extensions-nutanix"
discoverVariablesExtension: "nutanixworkerconfigvars-dv.cluster-api-runtime-extensions-nutanix"

# BEGIN CIS patches
- target:
kind: KubeadmControlPlaneTemplate
path: ../../../patches/disable-kubeadmcontrolplane-profiling.yaml
# END CIS patches
21 changes: 21 additions & 0 deletions hack/examples/patches/disable-kubeadmcontrolplane-profiling.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Copyright 2025 Nutanix. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

apiVersion: controlplane.cluster.x-k8s.io/v1beta1
kind: KubeadmControlPlaneTemplate
metadata:
name: not-used
spec:
template:
spec:
kubeadmConfigSpec:
clusterConfiguration:
apiServer:
extraArgs:
profiling: "false"
controllerManager:
extraArgs:
profiling: "false"
scheduler:
extraArgs:
profiling: "false"
Loading