@pulumi/eks 0.34.0 → 0.34.1-alpha.1636489796

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -27,6 +27,7 @@ function computeVpcCniYaml(cniYamlText, args) {
27
27
  // Rewrite the envvars for the CNI daemon set as per the inputs.
28
28
  const daemonSet = cniYaml.filter(o => o.kind === "DaemonSet")[0];
29
29
  const env = daemonSet.spec.template.spec.containers[0].env;
30
+ const initEnv = daemonSet.spec.template.spec.initContainers[0].env;
30
31
  const securityContext = daemonSet.spec.template.spec.containers[0].securityContext;
31
32
  if (args.nodePortSupport) {
32
33
  env.push({ name: "AWS_VPC_CNI_NODE_PORT_SUPPORT", value: args.nodePortSupport ? "true" : "false" });
@@ -73,6 +74,9 @@ function computeVpcCniYaml(cniYamlText, args) {
73
74
  if (args.image) {
74
75
  daemonSet.spec.template.spec.containers[0].image = args.image.toString();
75
76
  }
77
+ if (args.initImage) {
78
+ daemonSet.spec.template.spec.initContainers[0].image = args.initImage.toString();
79
+ }
76
80
  if (args.eniConfigLabelDef) {
77
81
  env.push({ name: "ENI_CONFIG_LABEL_DEF", value: args.eniConfigLabelDef.toString() });
78
82
  }
@@ -94,6 +98,12 @@ function computeVpcCniYaml(cniYamlText, args) {
94
98
  else {
95
99
  env.push({ name: "ENABLE_POD_ENI", value: "false" });
96
100
  }
101
+ if (args.disableTcpEarlyDemux) {
102
+ initEnv.push({ name: "DISABLE_TCP_EARLY_DEMUX", value: args.disableTcpEarlyDemux ? "true" : "false" });
103
+ }
104
+ else {
105
+ initEnv.push({ name: "DISABLE_TCP_EARLY_DEMUX", value: "false" });
106
+ }
97
107
  if (args.cniConfigureRpfilter) {
98
108
  env.push({ name: "AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER", value: args.cniConfigureRpfilter ? "true" : "false" });
99
109
  }
@@ -1 +1 @@
1
- {"version":3,"file":"cni.js","sourceRoot":"","sources":["../../../cmd/provider/cni.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cni.js","sourceRoot":"","sources":["../../../cmd/provider/cni.ts"],"names":[],"mappings":"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"}
@@ -148,9 +148,7 @@ spec:
148
148
  name: xtables-lock
149
149
  hostNetwork: true
150
150
  initContainers:
151
- - env:
152
- - name: DISABLE_TCP_EARLY_DEMUX
153
- value: "false"
151
+ - env: []
154
152
  image: 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.7.5
155
153
  imagePullPolicy: Always
156
154
  name: aws-vpc-cni-init
package/cni.d.ts CHANGED
@@ -56,6 +56,12 @@ export interface VpcCniOptions {
56
56
  * Defaults to the official AWS CNI image in ECR.
57
57
  */
58
58
  image?: pulumi.Input<string>;
59
+ /**
60
+ * Specifies the init container image to use in the AWS CNI cluster DaemonSet.
61
+ *
62
+ * Defaults to the official AWS CNI init container image in ECR.
63
+ */
64
+ initImage?: pulumi.Input<string>;
59
65
  /**
60
66
  * Specifies the veth prefix used to generate the host-side veth device
61
67
  * name for the CNI.
@@ -89,9 +95,18 @@ export interface VpcCniOptions {
89
95
  * Specifies whether to allow IPAMD to add the `vpc.amazonaws.com/has-trunk-attached` label to the node if the
90
96
  * instance has capacity to attach an additional ENI.
91
97
  *
98
+ * If using liveness and readiness probes, you will also need to disable TCP early demux.
99
+ *
92
100
  * Defaults to "false".
93
101
  */
94
102
  enablePodEni?: pulumi.Input<boolean>;
103
+ /**
104
+ * Allows the kubelet's liveness and readiness probes to connect via TCP when pod ENI is enabled.
105
+ * This will slightly increase local TCP connection latency.
106
+ *
107
+ * Defaults to "false".
108
+ */
109
+ disableTcpEarlyDemux?: pulumi.Input<boolean>;
95
110
  /**
96
111
  * Specifies whether ipamd should configure rp filter for primary interface.
97
112
  *
package/cni.js CHANGED
@@ -39,13 +39,15 @@ class VpcCni extends pulumi.CustomResource {
39
39
  logLevel: args === null || args === void 0 ? void 0 : args.logLevel,
40
40
  logFile: args === null || args === void 0 ? void 0 : args.logFile,
41
41
  image: args === null || args === void 0 ? void 0 : args.image,
42
+ initImage: args === null || args === void 0 ? void 0 : args.initImage,
42
43
  eniConfigLabelDef: args === null || args === void 0 ? void 0 : args.eniConfigLabelDef,
43
44
  pluginLogLevel: args === null || args === void 0 ? void 0 : args.pluginLogLevel,
44
45
  pluginLogFile: args === null || args === void 0 ? void 0 : args.pluginLogFile,
45
46
  enablePodEni: args === null || args === void 0 ? void 0 : args.enablePodEni,
47
+ disableTcpEarlyDemux: args === null || args === void 0 ? void 0 : args.disableTcpEarlyDemux,
46
48
  cniConfigureRpfilter: args === null || args === void 0 ? void 0 : args.cniConfigureRpfilter,
47
49
  cniCustomNetworkCfg: args === null || args === void 0 ? void 0 : args.cniCustomNetworkCfg,
48
- cniExternalSnat: args === null || args === void 0 ? void 0 : args.cniCustomNetworkCfg,
50
+ cniExternalSnat: args === null || args === void 0 ? void 0 : args.cniExternalSnat,
49
51
  securityContextPrivileged: args === null || args === void 0 ? void 0 : args.securityContextPrivileged,
50
52
  }, opts);
51
53
  }
package/cni.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cni.js","sourceRoot":"","sources":["../cni.ts"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;AAEjC,yCAAyC;AA6JzC,0GAA0G;AAC1G,4GAA4G;AAC5G,0GAA0G;AAC1G,kFAAkF;AAClF,mDAAmD;AAEnD;;;GAGG;AACH,MAAa,MAAO,SAAQ,MAAM,CAAC,cAAc;IAC7C,YAAY,IAAY,EAAE,UAA6B,EAAE,IAAoB,EAAE,IAAmC;QAC9G,gFAAgF;QAChF,MAAM,SAAS,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,gCAAgC,EAAE,CAAC,EAAE,CAAC;QAC5E,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC5C,KAAK,CAAC,kBAAkB,EAAE,IAAI,EAAE;YAC5B,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS;YACpF,eAAe,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,eAAe;YACtC,mBAAmB,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,mBAAmB;YAC9C,YAAY,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,YAAY;YAChC,aAAa,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,aAAa;YAClC,YAAY,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,YAAY;YAChC,QAAQ,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ;YACxB,OAAO,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO;YACtB,KAAK,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK;YAClB,iBAAiB,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,iBAAiB;YAC1C,cAAc,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,cAAc;YACpC,aAAa,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,aAAa;YAClC,YAAY,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,YAAY;YAChC,oBAAoB,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,oBAAoB;YAChD,mBAAmB,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,mBAAmB;YAC9C,eAAe,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,mBAAmB;YAC1C,yBAAyB,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,yBAAyB;SAC7D,EAAE,IAAI,CAAC,CAAC;IACb,CAAC;CACJ;AAzBD,wBAyBC"}
1
+ {"version":3,"file":"cni.js","sourceRoot":"","sources":["../cni.ts"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,iDAAiD;AACjD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;AAEjC,yCAAyC;AA8KzC,0GAA0G;AAC1G,4GAA4G;AAC5G,0GAA0G;AAC1G,kFAAkF;AAClF,mDAAmD;AAEnD;;;GAGG;AACH,MAAa,MAAO,SAAQ,MAAM,CAAC,cAAc;IAC7C,YAAY,IAAY,EAAE,UAA6B,EAAE,IAAoB,EAAE,IAAmC;QAC9G,gFAAgF;QAChF,MAAM,SAAS,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,gCAAgC,EAAE,CAAC,EAAE,CAAC;QAC5E,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC5C,KAAK,CAAC,kBAAkB,EAAE,IAAI,EAAE;YAC5B,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS;YACpF,eAAe,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,eAAe;YACtC,mBAAmB,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,mBAAmB;YAC9C,YAAY,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,YAAY;YAChC,aAAa,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,aAAa;YAClC,YAAY,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,YAAY;YAChC,QAAQ,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ;YACxB,OAAO,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO;YACtB,KAAK,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK;YAClB,SAAS,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS;YAC1B,iBAAiB,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,iBAAiB;YAC1C,cAAc,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,cAAc;YACpC,aAAa,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,aAAa;YAClC,YAAY,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,YAAY;YAChC,oBAAoB,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,oBAAoB;YAChD,oBAAoB,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,oBAAoB;YAChD,mBAAmB,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,mBAAmB;YAC9C,eAAe,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,eAAe;YACtC,yBAAyB,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,yBAAyB;SAC7D,EAAE,IAAI,CAAC,CAAC;IACb,CAAC;CACJ;AA3BD,wBA2BC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pulumi/eks",
3
- "version": "v0.34.0",
3
+ "version": "v0.34.1-alpha.1636489796+0ac1e0ce",
4
4
  "description": "Pulumi Amazon Web Services (AWS) EKS Components.",
5
5
  "license": "Apache-2.0",
6
6
  "keywords": [
package/package.json.dev CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pulumi/eks",
3
- "version": "v0.34.0",
3
+ "version": "v0.34.1-alpha.1636489796+0ac1e0ce",
4
4
  "description": "Pulumi Amazon Web Services (AWS) EKS Components.",
5
5
  "license": "Apache-2.0",
6
6
  "keywords": [