@pulumi/eks 2.3.0-alpha.1711572346 → 2.3.0-alpha.1711580974
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.
- package/cmd/provider/cni.d.ts +2 -1
- package/cmd/provider/cni.js +16 -2
- package/cmd/provider/cni.js.map +1 -1
- package/cmd/provider/schema.json +10 -2
- package/cni.d.ts +7 -1
- package/cni.js +1 -0
- package/cni.js.map +1 -1
- package/package.json +1 -1
- package/package.json.dev +1 -1
package/cmd/provider/cni.d.ts
CHANGED
|
@@ -1 +1,2 @@
|
|
|
1
|
-
export
|
|
1
|
+
export declare function updateImage(daemonSet: any, containerName: string, image: string): void;
|
|
2
|
+
export declare function getBaseVpcCniYaml(): string;
|
package/cmd/provider/cni.js
CHANGED
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
// See the License for the specific language governing permissions and
|
|
14
14
|
// limitations under the License.
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
-
exports.vpcCniProviderFactory = void 0;
|
|
16
|
+
exports.vpcCniProviderFactory = exports.getBaseVpcCniYaml = exports.updateImage = void 0;
|
|
17
17
|
const dependencies_1 = require("../../dependencies");
|
|
18
18
|
const childProcess = require("child_process");
|
|
19
19
|
const crypto = require("crypto");
|
|
@@ -22,6 +22,16 @@ const jsyaml = require("js-yaml");
|
|
|
22
22
|
const path = require("path");
|
|
23
23
|
const process = require("process");
|
|
24
24
|
const tmp = require("tmp");
|
|
25
|
+
function updateImage(daemonSet, containerName, image) {
|
|
26
|
+
for (const container of daemonSet.spec.template.spec.containers) {
|
|
27
|
+
if (container.name === containerName) {
|
|
28
|
+
container.image = image;
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
throw new Error(`Container ${containerName} not found in daemonset`);
|
|
33
|
+
}
|
|
34
|
+
exports.updateImage = updateImage;
|
|
25
35
|
function computeVpcCniYaml(cniYamlText, args) {
|
|
26
36
|
var _a;
|
|
27
37
|
const cniYaml = jsyaml.loadAll(cniYamlText);
|
|
@@ -114,7 +124,10 @@ function computeVpcCniYaml(cniYamlText, args) {
|
|
|
114
124
|
env.push({ name: "AWS_VPC_ENI_MTU", value: "9001" });
|
|
115
125
|
}
|
|
116
126
|
if (args.image) {
|
|
117
|
-
daemonSet
|
|
127
|
+
updateImage(daemonSet, "aws-node", args.image.toString());
|
|
128
|
+
}
|
|
129
|
+
if (args.nodeAgentImage) {
|
|
130
|
+
updateImage(daemonSet, "aws-eks-nodeagent", args.nodeAgentImage.toString());
|
|
118
131
|
}
|
|
119
132
|
if (args.initImage) {
|
|
120
133
|
daemonSet.spec.template.spec.initContainers[0].image = args.initImage.toString();
|
|
@@ -212,6 +225,7 @@ function getBaseVpcCniYaml() {
|
|
|
212
225
|
const cniYamlText = fs.readFileSync(yamlPath).toString();
|
|
213
226
|
return cniYamlText;
|
|
214
227
|
}
|
|
228
|
+
exports.getBaseVpcCniYaml = getBaseVpcCniYaml;
|
|
215
229
|
function applyVpcCniYaml(args) {
|
|
216
230
|
// Check to ensure that a compatible kubectl is installed, as we'll need it in order to deploy k8s resources below.
|
|
217
231
|
(0, dependencies_1.assertCompatibleKubectlVersionExists)();
|
package/cmd/provider/cni.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cni.js","sourceRoot":"","sources":["../../../cmd/provider/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,qDAA0E;AAG1E,8CAA8C;AAC9C,iCAAiC;AACjC,yBAAyB;AACzB,kCAAkC;AAClC,6BAA6B;AAC7B,mCAAmC;AACnC,2BAA2B;
|
|
1
|
+
{"version":3,"file":"cni.js","sourceRoot":"","sources":["../../../cmd/provider/cni.ts"],"names":[],"mappings":"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"}
|
package/cmd/provider/schema.json
CHANGED
|
@@ -555,7 +555,7 @@
|
|
|
555
555
|
},
|
|
556
556
|
"image": {
|
|
557
557
|
"type": "string",
|
|
558
|
-
"description": "Specifies the container image to use in the AWS CNI cluster DaemonSet.\n\nDefaults to the official AWS CNI image in ECR."
|
|
558
|
+
"description": "Specifies the aws-node container image to use in the AWS CNI cluster DaemonSet.\n\nDefaults to the official AWS CNI image in ECR."
|
|
559
559
|
},
|
|
560
560
|
"initImage": {
|
|
561
561
|
"type": "string",
|
|
@@ -569,6 +569,10 @@
|
|
|
569
569
|
"type": "string",
|
|
570
570
|
"description": "Specifies the log level used for logs.\n\nDefaults to \"DEBUG\"\nValid values: \"DEBUG\", \"INFO\", \"WARN\", \"ERROR\", or \"FATAL\"."
|
|
571
571
|
},
|
|
572
|
+
"nodeAgentImage": {
|
|
573
|
+
"type": "string",
|
|
574
|
+
"description": "Specifies the aws-eks-nodeagent container image to use in the AWS CNI cluster DaemonSet.\n\nDefaults to the official AWS CNI nodeagent image in ECR."
|
|
575
|
+
},
|
|
572
576
|
"nodePortSupport": {
|
|
573
577
|
"type": "boolean",
|
|
574
578
|
"description": "Specifies whether NodePort services are enabled on a worker node's primary network interface. This requires additional iptables rules and that the kernel's reverse path filter on the primary interface is set to loose.\n\nDefaults to true."
|
|
@@ -1522,7 +1526,7 @@
|
|
|
1522
1526
|
},
|
|
1523
1527
|
"image": {
|
|
1524
1528
|
"type": "string",
|
|
1525
|
-
"description": "Specifies the container image to use in the AWS CNI cluster DaemonSet.\n\nDefaults to the official AWS CNI image in ECR."
|
|
1529
|
+
"description": "Specifies the aws-node container image to use in the AWS CNI cluster DaemonSet.\n\nDefaults to the official AWS CNI image in ECR."
|
|
1526
1530
|
},
|
|
1527
1531
|
"initImage": {
|
|
1528
1532
|
"type": "string",
|
|
@@ -1540,6 +1544,10 @@
|
|
|
1540
1544
|
"type": "string",
|
|
1541
1545
|
"description": "Specifies the log level used for logs.\n\nDefaults to \"DEBUG\"\nValid values: \"DEBUG\", \"INFO\", \"WARN\", \"ERROR\", or \"FATAL\"."
|
|
1542
1546
|
},
|
|
1547
|
+
"nodeAgentImage": {
|
|
1548
|
+
"type": "string",
|
|
1549
|
+
"description": "Specifies the aws-eks-nodeagent container image to use in the AWS CNI cluster DaemonSet.\n\nDefaults to the official AWS CNI nodeagent image in ECR."
|
|
1550
|
+
},
|
|
1543
1551
|
"nodePortSupport": {
|
|
1544
1552
|
"type": "boolean",
|
|
1545
1553
|
"description": "Specifies whether NodePort services are enabled on a worker node's primary network interface. This requires additional iptables rules and that the kernel's reverse path filter on the primary interface is set to loose.\n\nDefaults to true."
|
package/cni.d.ts
CHANGED
|
@@ -68,11 +68,17 @@ export interface VpcCniOptions {
|
|
|
68
68
|
*/
|
|
69
69
|
logFile?: pulumi.Input<string>;
|
|
70
70
|
/**
|
|
71
|
-
* Specifies the container image to use in the AWS CNI cluster DaemonSet.
|
|
71
|
+
* Specifies the aws-node container image to use in the AWS CNI cluster DaemonSet.
|
|
72
72
|
*
|
|
73
73
|
* Defaults to the official AWS CNI image in ECR.
|
|
74
74
|
*/
|
|
75
75
|
image?: pulumi.Input<string>;
|
|
76
|
+
/**
|
|
77
|
+
* Specifies the aws-eks-nodeagent container image to use in the AWS CNI cluster DaemonSet.
|
|
78
|
+
*
|
|
79
|
+
* Defaults to the official AWS CNI image in ECR.
|
|
80
|
+
*/
|
|
81
|
+
nodeAgentImage?: pulumi.Input<string>;
|
|
76
82
|
/**
|
|
77
83
|
* Specifies the init container image to use in the AWS CNI cluster DaemonSet.
|
|
78
84
|
*
|
package/cni.js
CHANGED
|
@@ -44,6 +44,7 @@ class VpcCni extends pulumi.CustomResource {
|
|
|
44
44
|
logLevel: args === null || args === void 0 ? void 0 : args.logLevel,
|
|
45
45
|
logFile: args === null || args === void 0 ? void 0 : args.logFile,
|
|
46
46
|
image: args === null || args === void 0 ? void 0 : args.image,
|
|
47
|
+
nodeAgentImage: args === null || args === void 0 ? void 0 : args.nodeAgentImage,
|
|
47
48
|
initImage: args === null || args === void 0 ? void 0 : args.initImage,
|
|
48
49
|
eniConfigLabelDef: args === null || args === void 0 ? void 0 : args.eniConfigLabelDef,
|
|
49
50
|
pluginLogLevel: args === null || args === void 0 ? void 0 : args.pluginLogLevel,
|
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;
|
|
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;AAyMzC,0GAA0G;AAC1G,4GAA4G;AAC5G,0GAA0G;AAC1G,kFAAkF;AAClF,mDAAmD;AAEnD;;;GAGG;AACH,MAAa,MAAO,SAAQ,MAAM,CAAC,cAAc;IAC7C,YACI,IAAY,EACZ,UAA6B,EAC7B,IAAoB,EACpB,IAAmC;QAEnC,gFAAgF;QAChF,MAAM,SAAS,GAAG;YACd,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,gCAAgC,EAAE,CAAC;SACxD,CAAC;QACF,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC5C,KAAK,CACD,kBAAkB,EAClB,IAAI,EACJ;YACI,UAAU,EAAE,UAAU;YACtB,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,sBAAsB,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,sBAAsB;YACpD,UAAU,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU;YAC5B,gBAAgB,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,gBAAgB;YACxC,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,cAAc,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,cAAc;YACpC,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,EACD,IAAI,CACP,CAAC;IACN,CAAC;CACJ;AA3CD,wBA2CC"}
|
package/package.json
CHANGED
package/package.json.dev
CHANGED