From b9076b22ede29061cfb5cd122f45ab56533270ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= Date: Mon, 28 Aug 2023 11:20:18 +0200 Subject: [PATCH 1/6] Remove unused rancherValues --- README.md | 3 --- charts/templates/cluster.yaml | 2 -- 2 files changed, 5 deletions(-) diff --git a/README.md b/README.md index 5098773..669dfa9 100644 --- a/README.md +++ b/README.md @@ -29,9 +29,6 @@ enableNetworkPolicy: false kubernetesVersion: "v1.21.0-alpha2+rke2r1" -# specify rancher helm chart values deployed into downstream cluster -rancherValues: {} - # specify extra env variables in cluster-agent deployment # agentEnvs: # - name: HTTP_PROXY diff --git a/charts/templates/cluster.yaml b/charts/templates/cluster.yaml index 55d069f..2baf09e 100644 --- a/charts/templates/cluster.yaml +++ b/charts/templates/cluster.yaml @@ -26,8 +26,6 @@ spec: {{- end }} # enable network policy enableNetworkPolicy: true - # specify rancher helm chart values deployed into downstream cluster - # rancherValues: {} rkeConfig: {{- if ne .Values.cloudprovider "custom" }} machinePools: From 998e437a76e5dd0cd8d26cfe8687e06572403b66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= Date: Mon, 28 Aug 2023 11:24:31 +0200 Subject: [PATCH 2/6] Remove unused chartValues --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 669dfa9..2c2bc45 100644 --- a/README.md +++ b/README.md @@ -36,9 +36,6 @@ kubernetesVersion: "v1.21.0-alpha2+rke2r1" # general RKE options rke: - # specify rancher helm chart values deployed into downstream cluster - chartValues: {} - # controlplane/etcd configuration settings controlPlaneConfig: # Path to the file that defines the audit policy configuration From 68f16ee512b485622b19375bd27db6a65f604f5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= Date: Mon, 28 Aug 2023 11:28:33 +0200 Subject: [PATCH 3/6] Remove unused `controlPlaneConfig` --- README.md | 43 ------------------------------------------- 1 file changed, 43 deletions(-) diff --git a/README.md b/README.md index 2c2bc45..a91314c 100644 --- a/README.md +++ b/README.md @@ -36,49 +36,6 @@ kubernetesVersion: "v1.21.0-alpha2+rke2r1" # general RKE options rke: - # controlplane/etcd configuration settings - controlPlaneConfig: - # Path to the file that defines the audit policy configuration - # audit-policy-file: "" - # IPv4/IPv6 network CIDRs to use for pod IPs (default: 10.42.0.0/16) - # cluster-cidr: "" - # IPv4 Cluster IP for coredns service. Should be in your service-cidr range (default: 10.43.0.10) - # cluster-dns: "" - # Cluster Domain (default: "cluster.local") - # cluster-domain: "" - # CNI Plugin to deploy, one of none, canal, cilium (default: "canal") - cni: calico - # Do not deploy packaged components and delete any deployed components (valid items: rke2-coredns, rke2-ingress-nginx, rke2-kube-proxy, rke2-metrics-server) - # disable: false - # Disable automatic etcd snapshots - # etcd-disable-snapshots: false - # Expose etcd metrics to client interface. (Default false) - # etcd-expose-metrics: false - # Directory to save db snapshots. (Default location: ${data-dir}/db/snapshots) - # etcd-snapshot-dir: "" - # Set the base name of etcd snapshots. Default: etcd-snapshot- (default: "etcd-snapshot") - # etcd-snapshot-name: "" - # Number of snapshots to retain (default: 5) - # etcd-snapshot-retention: 5 - # Snapshot interval time in cron spec. eg. every 5 hours '* */5 * * *' (default: "0 */12 * * *") - # etcd-snapshot-schedule-cron: "0 */12 * * *" - # Customized flag for kube-apiserver process - # kube-apiserver-arg: "" - # Customized flag for kube-scheduler process - # kube-scheduler-arg: "" - # Customized flag for kube-controller-manager process - # kube-controller-manager-arg: "" - # Validate system configuration against the selected benchmark (valid items: cis-1.5, cis-1.6 ) - # profile: "cis-1.6" - # Enable Secret encryption at rest - # secrets-encryption: false - # IPv4/IPv6 network CIDRs to use for service IPs (default: 10.43.0.0/16) - # service-cidr: "10.43.0.0/16" - # Port range to reserve for services with NodePort visibility (default: "30000-32767") - # service-node-port-range: "30000-32767" - # Add additional hostnames or IPv4/IPv6 addresses as Subject Alternative Names on the server TLS cert - # tls-san: [] - # worker configuration settings workerConfig: - config: From dcca6dc205fa5900607a738a22c7de7d93cb36db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= Date: Mon, 28 Aug 2023 11:29:35 +0200 Subject: [PATCH 4/6] Remove unused `workerConfig` --- README.md | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/README.md b/README.md index a91314c..fe63299 100644 --- a/README.md +++ b/README.md @@ -36,35 +36,6 @@ kubernetesVersion: "v1.21.0-alpha2+rke2r1" # general RKE options rke: - # worker configuration settings - workerConfig: - - config: - # Node name - # node-name: "" - # Disable embedded containerd and use alternative CRI implementation - # container-runtime-endpoint: "" - # Override default containerd snapshotter (default: "overlayfs") - # snapshotter: "" - # IP address to advertise for node - # node-ip: "1.1.1.1" - # Kubelet resolv.conf file - # resolv-conf: "" - # Customized flag for kubelet process - # kubelet-arg: "" - # Customized flag for kube-proxy process - # kube-proxy-arg: "" - # Kernel tuning behavior. If set, error if kernel tunables are different than kubelet defaults. (default: false) - # protect-kernel-defaults: false - # Enable SELinux in containerd (default: false) - # selinux: true - # Cloud provider name - # cloud-provider-name: "" - # Cloud provider configuration file path - # cloud-provider-config: "" - machineLabelSelector: - matchLabels: - foo: bar - # enable local auth endpoint localClusterAuthEndpoint: enabled: false From 1d1cb3355130163c633397e6bc08391a9d5fd8be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= Date: Mon, 28 Aug 2023 11:31:08 +0200 Subject: [PATCH 5/6] Remove unused `upgradeStrategy` --- README.md | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/README.md b/README.md index fe63299..788c3f7 100644 --- a/README.md +++ b/README.md @@ -43,26 +43,6 @@ rke: # fqdn: foo.bar.example # specify cacert of local access endpoint # caCerts: "" - - # Specify upgrade options - upgradeStrategy: - controlPlaneDrainOptions: - enabled: false - # deleteEmptyDirData: false - # disableEviction: false - # gracePeriod: 0 - # ignoreErrors: false - # skipWaitForDeleteTimeoutSeconds: 0 - # timeout: 0 - workerDrainOptions: - enabled: false - # deleteEmptyDirData: false - # disableEviction: false - # gracePeriod: 0 - # ignoreErrors: false - # skipWaitForDeleteTimeoutSeconds: 0 - # timeout: 0 - workerConcurrency: "1" ``` To provide your own configuration, modify the original values.yaml and create your own version, and pass it to helm. For example: From 476d5d036280505d93c06a4de7d2f2f606f29f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= Date: Mon, 28 Aug 2023 11:34:27 +0200 Subject: [PATCH 6/6] Remove unused `enableNetworkPolicy` Also: Remove trivial comment --- README.md | 3 --- charts/templates/cluster.yaml | 1 - 2 files changed, 4 deletions(-) diff --git a/README.md b/README.md index 788c3f7..a78d5c2 100644 --- a/README.md +++ b/README.md @@ -24,9 +24,6 @@ cloudCredentialSecretName: example # specify cloud provider, options are amazonec2, digitalocean, azure, vsphere or custom cloudprovider: "" -# enable network policy -enableNetworkPolicy: false - kubernetesVersion: "v1.21.0-alpha2+rke2r1" # specify extra env variables in cluster-agent deployment diff --git a/charts/templates/cluster.yaml b/charts/templates/cluster.yaml index 2baf09e..0e78cab 100644 --- a/charts/templates/cluster.yaml +++ b/charts/templates/cluster.yaml @@ -24,7 +24,6 @@ spec: fqdn: {{ .Values.rke.localClusterAuthEndpoint.fqdn }} caCerts: {{ .Values.rke.localClusterAuthEndpoint.caCerts }} {{- end }} - # enable network policy enableNetworkPolicy: true rkeConfig: {{- if ne .Values.cloudprovider "custom" }}