@ydkn/pulumi-components 0.7.6 → 0.7.7

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.
@@ -5,8 +5,8 @@ import { Node } from "../node/index.js";
5
5
  export interface ClusterArgs {
6
6
  name?: pulumi.Input<string>;
7
7
  nodes: pulumi.Input<pulumi.Input<Node>[]>;
8
- k0s?: pulumi.Input<k0s.types.input.K0sArgs>;
9
- hooks?: pulumi.Input<k0s.types.input.HooksArgs>;
8
+ k0s?: pulumi.Input<k0s.types.input.ClusterK0sArgs>;
9
+ hooks?: pulumi.Input<k0s.types.input.ClusterHooksArgs>;
10
10
  cloudProvider?: pulumi.Input<boolean>;
11
11
  protect?: boolean;
12
12
  }
@@ -15,7 +15,7 @@ export declare class Cluster extends ComponentResource {
15
15
  private readonly cluster;
16
16
  readonly name: pulumi.Output<string>;
17
17
  readonly nodes: pulumi.Output<pulumi.Output<Node>[]>;
18
- readonly spec: pulumi.Output<k0s.types.output.Spec>;
18
+ readonly spec: pulumi.Output<k0s.types.output.ClusterSpec>;
19
19
  readonly kubeconfig: pulumi.Output<string>;
20
20
  readonly kubeletDirPath: pulumi.Output<string>;
21
21
  /**
@@ -26,7 +26,7 @@ export declare class Cluster extends ComponentResource {
26
26
  */
27
27
  constructor(name: string, args: ClusterArgs, opts?: pulumi.ComponentResourceOptions);
28
28
  static k0sRole(roles?: pulumi.Input<pulumi.Input<string>[]>): pulumi.Output<string>;
29
- static k0sNode(node: Node, installFlags: string[], keyPath: string, hooks?: pulumi.UnwrappedObject<k0s.types.input.HooksArgs>, noTaints?: boolean): k0s.types.input.HostArgs;
29
+ static k0sNode(node: Node, installFlags: string[], key?: string, hooks?: pulumi.UnwrappedObject<k0s.types.input.ClusterHooksArgs>, noTaints?: boolean): k0s.types.input.ClusterHostArgs;
30
30
  static rolesHostname(roles?: pulumi.Input<pulumi.Input<string>[]>): pulumi.Output<string>;
31
31
  private static transformKubeconfig;
32
32
  }
@@ -1,10 +1,6 @@
1
1
  import * as pulumi from "@pulumi/pulumi";
2
2
  import * as random from "@pulumi/random";
3
3
  import * as k0s from "@ydkn/pulumi-k0s";
4
- import * as os from "os";
5
- import * as fs from "fs";
6
- import * as path from "path";
7
- import * as crypto from "crypto";
8
4
  import * as yaml from "js-yaml";
9
5
  import { ComponentResource } from "../common/index.js";
10
6
  export class Cluster extends ComponentResource {
@@ -37,7 +33,7 @@ export class Cluster extends ComponentResource {
37
33
  }
38
34
  return outputNodes;
39
35
  });
40
- this.clusterProvider = new k0s.Provider(name, { noDrain: true }, emptyOpts);
36
+ this.clusterProvider = new k0s.Provider(name, { noDrain: "true", concurrency: "2" }, emptyOpts);
41
37
  this.cluster = new k0s.Cluster(name, {
42
38
  metadata: { name: this.name },
43
39
  spec: pulumi
@@ -45,15 +41,6 @@ export class Cluster extends ComponentResource {
45
41
  .apply(([nodes, k0s, hooks, cloudProvider]) => {
46
42
  return {
47
43
  hosts: nodes.map((node) => {
48
- let keyPath = "";
49
- if (node.privateKey !== undefined) {
50
- const keyHash = crypto.createHash("sha1").update(node.privateKey, "utf8").digest("hex");
51
- keyPath = path.join(os.tmpdir(), `pulumi-components-k0s-${node.hostname}-${keyHash}.pem`);
52
- // eslint-disable-next-line security/detect-non-literal-fs-filename
53
- fs.writeFileSync(keyPath, node.privateKey);
54
- // eslint-disable-next-line security/detect-non-literal-fs-filename
55
- fs.chmodSync(keyPath, 0o600);
56
- }
57
44
  const installFlags = [];
58
45
  let isController = false;
59
46
  let isWorker = false;
@@ -74,7 +61,6 @@ export class Cluster extends ComponentResource {
74
61
  if (node.labels === undefined) {
75
62
  node.labels = {};
76
63
  }
77
- node.labels["node.kubernetes.io/role"] = isController ? "control-plane" : "worker";
78
64
  const labels = [];
79
65
  for (const key in node.labels) {
80
66
  // eslint-disable-next-line security/detect-object-injection
@@ -83,7 +69,7 @@ export class Cluster extends ComponentResource {
83
69
  if (labels.length > 0) {
84
70
  installFlags.push(`--labels=${labels.join(",")}`);
85
71
  }
86
- let noTaints = false;
72
+ let noTaints = undefined;
87
73
  if (node.taints !== undefined) {
88
74
  const taints = [];
89
75
  for (const taint of node.taints) {
@@ -92,17 +78,17 @@ export class Cluster extends ComponentResource {
92
78
  if (taints.length > 0) {
93
79
  installFlags.push(`--taints=${taints.join(",")}`);
94
80
  }
95
- else {
81
+ else if (isController) {
96
82
  noTaints = true;
97
83
  }
98
84
  }
99
- return Cluster.k0sNode(node, installFlags, keyPath, hooks, noTaints);
85
+ return Cluster.k0sNode(node, installFlags, node.privateKey, hooks, noTaints);
100
86
  }),
101
87
  k0s,
102
88
  };
103
89
  }),
104
90
  }, { ...emptyOpts, provider: this.clusterProvider });
105
- this.spec = this.cluster.spec;
91
+ this.spec = this.cluster.spec.apply((spec) => spec);
106
92
  this.kubeconfig = pulumi.secret(Cluster.transformKubeconfig(this.cluster.kubeconfig, this.cluster.spec.apply((spec) => spec.k0s?.config?.spec?.api?.sans)));
107
93
  this.kubeletDirPath = pulumi.output("/var/lib/k0s/kubelet");
108
94
  this.registerOutputs();
@@ -129,12 +115,12 @@ export class Cluster extends ComponentResource {
129
115
  return role;
130
116
  });
131
117
  }
132
- static k0sNode(node, installFlags, keyPath, hooks, noTaints) {
118
+ static k0sNode(node, installFlags, key, hooks, noTaints) {
133
119
  return {
134
120
  hostname: node.hostname,
135
121
  privateAddress: node.privateIpv4Address,
136
122
  role: Cluster.k0sRole(node.roles),
137
- ssh: { address: node.ipv4Address, user: node.username, port: 22, keyPath },
123
+ ssh: { address: node.ipv4Address, user: node.username, port: 22, key },
138
124
  installFlags,
139
125
  hooks: {
140
126
  apply: {
@@ -1 +1 @@
1
- {"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../../lib/k0s/cluster.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../../lib/k0s/cluster.ts"],"names":[],"mappings":"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"}
@@ -21,8 +21,8 @@ export interface ClusterArgs extends fcos.IgnitionArgs {
21
21
  [key: string]: pulumi.Input<InputNode>;
22
22
  }>;
23
23
  sshAuthorizedKeys?: pulumi.Input<pulumi.Input<string>[]>;
24
- k0s?: pulumi.Input<pulumiK0s.types.input.K0sArgs>;
25
- hooks?: pulumi.Input<pulumiK0s.types.input.HooksArgs>;
24
+ k0s?: pulumi.Input<pulumiK0s.types.input.ClusterK0sArgs>;
25
+ hooks?: pulumi.Input<pulumiK0s.types.input.ClusterHooksArgs>;
26
26
  cloudProvider?: pulumi.Input<boolean>;
27
27
  protect?: boolean;
28
28
  }
@@ -23,6 +23,12 @@ export class Operator extends ComponentResource {
23
23
  chart: "redis-operator",
24
24
  values: {
25
25
  fullnameOverride: name,
26
+ redisOperator: {
27
+ webhook: false,
28
+ },
29
+ service: {
30
+ namespace: this.namespace,
31
+ },
26
32
  resources: {
27
33
  requests: { cpu: "50m", memory: "96Mi" },
28
34
  limits: { cpu: "300m", memory: "128Mi" },
@@ -1 +1 @@
1
- {"version":3,"file":"operator.js","sourceRoot":"","sources":["../../../lib/redis/operator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AAMrD,MAAM,OAAO,QAAS,SAAQ,iBAAiB;IAC5B,WAAW,CAA6B;IACzC,SAAS,CAAwB;IAEjD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAkB,EAAE,IAAsC;QAClF,KAAK,CAAC,gBAAgB,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAE1C,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE/B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS;YAC7B,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;YAC/B,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QAEhF,IAAI,CAAC,WAAW,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAC/C,IAAI,EACJ;YACE,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,cAAc,EAAE,EAAE,IAAI,EAAE,iDAAiD,EAAE;YAC3E,KAAK,EAAE,gBAAgB;YACvB,MAAM,EAAE;gBACN,gBAAgB,EAAE,IAAI;gBACtB,SAAS,EAAE;oBACT,QAAQ,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE;oBACxC,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE;iBACzC;aACF;SACF,EACD,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;CACF"}
1
+ {"version":3,"file":"operator.js","sourceRoot":"","sources":["../../../lib/redis/operator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AAMrD,MAAM,OAAO,QAAS,SAAQ,iBAAiB;IAC5B,WAAW,CAA6B;IACzC,SAAS,CAAwB;IAEjD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAkB,EAAE,IAAsC;QAClF,KAAK,CAAC,gBAAgB,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAE1C,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE/B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS;YAC7B,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;YAC/B,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QAEhF,IAAI,CAAC,WAAW,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAC/C,IAAI,EACJ;YACE,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,cAAc,EAAE,EAAE,IAAI,EAAE,iDAAiD,EAAE;YAC3E,KAAK,EAAE,gBAAgB;YACvB,MAAM,EAAE;gBACN,gBAAgB,EAAE,IAAI;gBACtB,aAAa,EAAE;oBACb,OAAO,EAAE,KAAK;iBACf;gBACD,OAAO,EAAE;oBACP,SAAS,EAAE,IAAI,CAAC,SAAS;iBAC1B;gBACD,SAAS,EAAE;oBACT,QAAQ,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE;oBACxC,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE;iBACzC;aACF;SACF,EACD,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;CACF"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ydkn/pulumi-components",
3
- "version": "0.7.6",
3
+ "version": "0.7.7",
4
4
  "keywords": [
5
5
  "pulumi"
6
6
  ],
@@ -16,11 +16,11 @@
16
16
  "devDependencies": {
17
17
  "@types/bcrypt": "^5.0.2",
18
18
  "@types/js-yaml": "^4.0.9",
19
- "@types/node": "^20.11.19",
19
+ "@types/node": "^20.11.20",
20
20
  "@types/ssh2": "^1.11.19",
21
21
  "@types/ssh2-sftp-client": "^9.0.3",
22
- "@typescript-eslint/eslint-plugin": "^7.0.1",
23
- "@typescript-eslint/parser": "^7.0.1",
22
+ "@typescript-eslint/eslint-plugin": "^7.0.2",
23
+ "@typescript-eslint/parser": "^7.0.2",
24
24
  "bcrypt": "^5.1.1",
25
25
  "copyfiles": "^2.4.1",
26
26
  "eslint": "^8.56.0",
@@ -34,23 +34,23 @@
34
34
  "typescript": "^5.3.3"
35
35
  },
36
36
  "dependencies": {
37
- "@pulumi/aws": "^6.22.2",
38
- "@pulumi/cloudflare": "^5.20.0",
39
- "@pulumi/gitlab": "^6.8.1",
37
+ "@pulumi/aws": "^6.23.0",
38
+ "@pulumi/cloudflare": "^5.21.0",
39
+ "@pulumi/gitlab": "^6.9.0",
40
40
  "@pulumi/hcloud": "^1.17.0",
41
- "@pulumi/kubernetes": "^4.7.1",
41
+ "@pulumi/kubernetes": "^4.8.0",
42
42
  "@pulumi/mailgun": "^3.5.1",
43
- "@pulumi/pulumi": "^3.106.0",
43
+ "@pulumi/pulumi": "^3.107.0",
44
44
  "@pulumi/random": "^4.15.1",
45
45
  "@pulumi/tls": "^5.0.1",
46
- "@ydkn/pulumi-k0s": "^0.1.11",
46
+ "@ydkn/pulumi-k0s": "^0.2.1",
47
47
  "glob": "^10.3.10",
48
48
  "js-yaml": "^4.1.0",
49
49
  "just-template": "^2.2.0",
50
50
  "ssh2": "^1.15.0",
51
51
  "ssh2-sftp-client": "^10.0.3",
52
52
  "template-file": "^6.0.1",
53
- "urllib": "^3.22.2"
53
+ "urllib": "^3.22.4"
54
54
  },
55
55
  "scripts": {
56
56
  "clean": "rimraf dist",