Skip to content
This repository was archived by the owner on Sep 30, 2020. It is now read-only.

Commit 2c4c9d4

Browse files
Make cloud-controller-manager an experimental feature - disabled by default. (#1832)
Add Kubernetes CSI interface and AWS Ebs drivers as an experimental feature - also disabled by default. Migrate existing in-tree pv's to CSI provisioned. Make warnings more prominent. Turn up logging to CSI components for testing.
1 parent 8790aa5 commit 2c4c9d4

File tree

9 files changed

+534
-24
lines changed

9 files changed

+534
-24
lines changed

build

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ TAG=$(git describe --exact-match --abbrev=0 --tags "${COMMIT}" 2> /dev/null || t
66
BRANCH=$(git branch | grep \* | cut -d ' ' -f2 | sed -e 's/[^a-zA-Z0-9+=._:/-]*//g' || true)
77
OUTPUT_PATH=${OUTPUT_PATH:-"bin/kube-aws"}
88
VERSION=""
9-
ETCD_VERSION="v3.3.17"
10-
KUBERNETES_VERSION="v1.15.6"
9+
ETCD_VERSION="v3.3.18"
10+
KUBERNETES_VERSION="v1.15.9"
1111

1212
if [ -z "$TAG" ]; then
1313
[[ -n "$BRANCH" ]] && VERSION="${BRANCH}/"

builtin/files/cluster.yaml.tmpl

+28
Original file line numberDiff line numberDiff line change
@@ -1449,6 +1449,34 @@ experimental:
14491449
usernameClaim: "email"
14501450
groupsClaim: "groups"
14511451

1452+
# Enable cloudControllerManager to move AWS cloud-provider code out of the kube-controller-manager and into a separate cloud-controller-manager
1453+
# WARNING: enabling the cloud-controller-manager removes legacy PVC/Storage code - you will need to enable the alpha
1454+
# ContainerStorageInterface experimental feature to priovide EBS volume integtation and you risk losing any existing volumes.
1455+
cloudControllerManager:
1456+
enabled: false
1457+
1458+
# Enable experimental Container Storage Interface (CSI)
1459+
# This subsystem is designed to replace legacy in-tree storage code with a standard interface (CSI) and external compliant drivers
1460+
# WARNING: this is for testing purposes only - their is no guarantee that your existing in-tree provisioned volumes will continue to
1461+
# work once CSI has been enabled (and they didn't work during my testing, although new volumes appeared to work)
1462+
containerStorageInterface:
1463+
enabled: false
1464+
# csiProvisioner:
1465+
# repo: quay.io/k8scsi/csi-provisioner
1466+
# tag: v1.3.1
1467+
# csiAttacher:
1468+
# repo: quay.io/k8scsi/csi-attacher
1469+
# tag: v1.2.0
1470+
# csiLivenessProbe:
1471+
# repo: quay.io/k8scsi/livenessprobe
1472+
# tag: v1.1.0
1473+
# csiNodeDriverRegistrar:
1474+
# repo: quay.io/k8scsi/csi-node-driver-registrar
1475+
# tag: v1.1.0
1476+
# amazonEBSDriver:
1477+
# repo: amazon/aws-ebs-csi-driver
1478+
# tag: v0.4.0
1479+
14521480
# When set to true this configures the k8s aws provider so that it doesn't modify every node's security group
14531481
# to include an additional ingress rule per an ELB created for a k8s service whose type is "LoadBalancer".
14541482
# It requires that the user has setup a rule that allows inbound traffic on kubelet ports

0 commit comments

Comments
 (0)