@ydkn/pulumi-components 0.4.6 → 0.4.8
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/index.d.ts +3 -3
- package/index.d.ts.map +1 -1
- package/index.js +5 -5
- package/index.js.map +1 -1
- package/lib/aws/accessKey.d.ts +0 -3
- package/lib/aws/accessKey.d.ts.map +1 -1
- package/lib/aws/accessKey.js.map +1 -1
- package/lib/aws/bucket.d.ts +0 -6
- package/lib/aws/bucket.d.ts.map +1 -1
- package/lib/aws/bucket.js.map +1 -1
- package/lib/common/types.d.ts +1 -1
- package/lib/common/types.d.ts.map +1 -1
- package/lib/grafana/agent.d.ts +0 -1
- package/lib/grafana/agent.d.ts.map +1 -1
- package/lib/grafana/agent.js +42 -141
- package/lib/grafana/agent.js.map +1 -1
- package/lib/hcloud/kubernetes.d.ts.map +1 -1
- package/lib/hcloud/kubernetes.js +8 -17
- package/lib/hcloud/kubernetes.js.map +1 -1
- package/lib/kubeStateMetrics/deployment.d.ts.map +1 -1
- package/lib/kubeStateMetrics/deployment.js +1 -0
- package/lib/kubeStateMetrics/deployment.js.map +1 -1
- package/lib/mongodb/cluster.d.ts +1 -0
- package/lib/mongodb/cluster.d.ts.map +1 -1
- package/lib/mongodb/cluster.js +3 -3
- package/lib/mongodb/cluster.js.map +1 -1
- package/lib/nats/cluster.d.ts +21 -0
- package/lib/nats/cluster.d.ts.map +1 -0
- package/lib/{kubemq/operator.js → nats/cluster.js} +46 -20
- package/lib/nats/cluster.js.map +1 -0
- package/lib/nats/index.d.ts +3 -0
- package/lib/nats/index.d.ts.map +1 -0
- package/lib/nats/index.js +6 -0
- package/lib/nats/index.js.map +1 -0
- package/lib/nodeExporter/deployment.d.ts +19 -0
- package/lib/nodeExporter/deployment.d.ts.map +1 -0
- package/lib/nodeExporter/deployment.js +82 -0
- package/lib/nodeExporter/deployment.js.map +1 -0
- package/lib/nodeExporter/index.d.ts +3 -0
- package/lib/{devcontainer → nodeExporter}/index.d.ts.map +1 -1
- package/lib/nodeExporter/index.js +6 -0
- package/lib/nodeExporter/index.js.map +1 -0
- package/lib/plex/mediaServer.d.ts.map +1 -1
- package/lib/plex/mediaServer.js +4 -3
- package/lib/plex/mediaServer.js.map +1 -1
- package/lib/prometheus/operator.d.ts +1 -0
- package/lib/prometheus/operator.d.ts.map +1 -1
- package/lib/prometheus/operator.js +2 -0
- package/lib/prometheus/operator.js.map +1 -1
- package/lib/redis/operator.js +2 -2
- package/lib/redis/operator.js.map +1 -1
- package/lib/redis/standalone.d.ts +1 -0
- package/lib/redis/standalone.d.ts.map +1 -1
- package/lib/redis/standalone.js +1 -1
- package/lib/redis/standalone.js.map +1 -1
- package/lib/rook/blockPool.d.ts.map +1 -1
- package/lib/rook/blockPool.js +1 -0
- package/lib/rook/blockPool.js.map +1 -1
- package/lib/rook/cluster.js +2 -2
- package/lib/rook/cluster.js.map +1 -1
- package/lib/rook/filesystem.d.ts +3 -3
- package/lib/rook/filesystem.d.ts.map +1 -1
- package/lib/rook/filesystem.js +6 -5
- package/lib/rook/filesystem.js.map +1 -1
- package/lib/rook/index.d.ts +2 -1
- package/lib/rook/index.d.ts.map +1 -1
- package/lib/rook/index.js +3 -1
- package/lib/rook/index.js.map +1 -1
- package/lib/rook/operator.d.ts +3 -0
- package/lib/rook/operator.d.ts.map +1 -1
- package/lib/rook/operator.js +18 -0
- package/lib/rook/operator.js.map +1 -1
- package/lib/rook/sharedFilesystem.d.ts +52 -0
- package/lib/rook/sharedFilesystem.d.ts.map +1 -0
- package/lib/rook/sharedFilesystem.js +128 -0
- package/lib/rook/sharedFilesystem.js.map +1 -0
- package/lib/ssh/exec.d.ts.map +1 -1
- package/lib/ssh/exec.js +37 -37
- package/lib/ssh/exec.js.map +1 -1
- package/lib/ssh/file.d.ts +1 -1
- package/lib/ssh/file.d.ts.map +1 -1
- package/lib/ssh/file.js +35 -35
- package/lib/ssh/file.js.map +1 -1
- package/lib/traefik/controller.d.ts.map +1 -1
- package/lib/traefik/controller.js +6 -2
- package/lib/traefik/controller.js.map +1 -1
- package/lib/unifi/controller.js +1 -1
- package/lib/unifi/controller.js.map +1 -1
- package/lib/velero/operator.d.ts +1 -1
- package/lib/velero/operator.d.ts.map +1 -1
- package/lib/velero/operator.js +11 -6
- package/lib/velero/operator.js.map +1 -1
- package/lib/wireguard/deployment.d.ts +1 -0
- package/lib/wireguard/deployment.d.ts.map +1 -1
- package/lib/wireguard/deployment.js +1 -0
- package/lib/wireguard/deployment.js.map +1 -1
- package/package.json +14 -14
- package/lib/devcontainer/assets/init.sh +0 -44
- package/lib/devcontainer/deployment.d.ts +0 -39
- package/lib/devcontainer/deployment.d.ts.map +0 -1
- package/lib/devcontainer/deployment.js +0 -216
- package/lib/devcontainer/deployment.js.map +0 -1
- package/lib/devcontainer/index.d.ts +0 -3
- package/lib/devcontainer/index.js +0 -6
- package/lib/devcontainer/index.js.map +0 -1
- package/lib/kubemq/assets/dashboard.json +0 -5431
- package/lib/kubemq/cluster.d.ts +0 -29
- package/lib/kubemq/cluster.d.ts.map +0 -1
- package/lib/kubemq/cluster.js +0 -77
- package/lib/kubemq/cluster.js.map +0 -1
- package/lib/kubemq/index.d.ts +0 -4
- package/lib/kubemq/index.d.ts.map +0 -1
- package/lib/kubemq/index.js +0 -8
- package/lib/kubemq/index.js.map +0 -1
- package/lib/kubemq/operator.d.ts +0 -18
- package/lib/kubemq/operator.d.ts.map +0 -1
- package/lib/kubemq/operator.js.map +0 -1
package/lib/ssh/file.js
CHANGED
|
@@ -80,6 +80,40 @@ function sshFileCreate(connection, dst, srcFile, srcData) {
|
|
|
80
80
|
setTimeout(retryFunc, initialDelay);
|
|
81
81
|
});
|
|
82
82
|
}
|
|
83
|
+
class FileProvider {
|
|
84
|
+
async diff(id, olds, news) {
|
|
85
|
+
const replaces = [];
|
|
86
|
+
for (const [nKey, nValue] of Object.entries(news)) {
|
|
87
|
+
if (nKey === "__provider") {
|
|
88
|
+
continue;
|
|
89
|
+
}
|
|
90
|
+
let keyFound = false;
|
|
91
|
+
for (const [oKey, oValue] of Object.entries(olds)) {
|
|
92
|
+
if (oKey === "__provider") {
|
|
93
|
+
continue;
|
|
94
|
+
}
|
|
95
|
+
if (nKey === oKey) {
|
|
96
|
+
keyFound = true;
|
|
97
|
+
if (JSON.stringify(nValue) !== JSON.stringify(oValue)) {
|
|
98
|
+
replaces.push(nKey);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
if (!keyFound) {
|
|
103
|
+
replaces.push(nKey);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
return { changes: replaces.length > 0, replaces, deleteBeforeReplace: true };
|
|
107
|
+
}
|
|
108
|
+
async create(inputs) {
|
|
109
|
+
return sshFileCreate(inputs.connection, inputs.dst, inputs.src.file, inputs.src.data).then((r) => {
|
|
110
|
+
return {
|
|
111
|
+
id: require("uuid").v4(),
|
|
112
|
+
outs: inputs,
|
|
113
|
+
};
|
|
114
|
+
});
|
|
115
|
+
}
|
|
116
|
+
}
|
|
83
117
|
class File extends pulumi.dynamic.Resource {
|
|
84
118
|
/**
|
|
85
119
|
* Create a new SSH file resource.
|
|
@@ -88,41 +122,7 @@ class File extends pulumi.dynamic.Resource {
|
|
|
88
122
|
* @param opts A bag of options that control this resource's behavior.
|
|
89
123
|
*/
|
|
90
124
|
constructor(name, args, opts) {
|
|
91
|
-
|
|
92
|
-
async diff(id, olds, news) {
|
|
93
|
-
const replaces = [];
|
|
94
|
-
for (const [nKey, nValue] of Object.entries(news)) {
|
|
95
|
-
if (nKey === "__provider") {
|
|
96
|
-
continue;
|
|
97
|
-
}
|
|
98
|
-
let keyFound = false;
|
|
99
|
-
for (const [oKey, oValue] of Object.entries(olds)) {
|
|
100
|
-
if (oKey === "__provider") {
|
|
101
|
-
continue;
|
|
102
|
-
}
|
|
103
|
-
if (nKey === oKey) {
|
|
104
|
-
keyFound = true;
|
|
105
|
-
if (JSON.stringify(nValue) !== JSON.stringify(oValue)) {
|
|
106
|
-
replaces.push(nKey);
|
|
107
|
-
}
|
|
108
|
-
}
|
|
109
|
-
}
|
|
110
|
-
if (!keyFound) {
|
|
111
|
-
replaces.push(nKey);
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
return { changes: replaces.length > 0, replaces, deleteBeforeReplace: true };
|
|
115
|
-
},
|
|
116
|
-
async create(inputs) {
|
|
117
|
-
return sshFileCreate(inputs.connection, inputs.dst, inputs.src.file, inputs.src.data).then((r) => {
|
|
118
|
-
return {
|
|
119
|
-
id: require("uuid").v4(),
|
|
120
|
-
outs: inputs,
|
|
121
|
-
};
|
|
122
|
-
});
|
|
123
|
-
},
|
|
124
|
-
};
|
|
125
|
-
super(provider, name, args, opts);
|
|
125
|
+
super(new FileProvider(), name, args, opts);
|
|
126
126
|
}
|
|
127
127
|
static changeToken(str) {
|
|
128
128
|
return crypto.createHash("sha1").update(str, "utf8").digest("hex");
|
package/lib/ssh/file.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../../lib/ssh/file.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AACzC,wEAAoC;AACpC,+CAAiC;AACjC,uCAAyB;AAGzB,SAAS,aAAa,CACpB,UAAyC,EACzC,GAAW,EACX,OAAgB,EAChB,OAAyB;IAEzB,MAAM,qBAAqB,GAAG,UAAU,CAAC,kBAAkB,IAAI,GAAG,CAAC;IACnE,MAAM,YAAY,GAAG,UAAU,CAAC,YAAY,IAAI,CAAC,CAAC;IAClD,IAAI,mBAAmB,GAAG,UAAU,CAAC,OAAO,IAAI,EAAE,CAAC;IACnD,IAAI,oBAAoB,GAAG,UAAU,CAAC,kBAAkB,IAAI,GAAG,CAAC;IAEhE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,SAAS,SAAS;YAChB,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,SAAS,EAAE;gBAClD,MAAM,CAAC,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC,CAAC;aAC7D;YAED,MAAM,MAAM,GAAG,IAAI,0BAAI,EAAE,CAAC;YAE1B,MAAM;iBACH,OAAO,CAAC;gBACP,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,IAAI,EAAE,UAAU,CAAC,IAAI,IAAI,EAAE;gBAC3B,QAAQ,EAAE,UAAU,CAAC,QAAQ;gBAC7B,QAAQ,EAAE,UAAU,CAAC,QAAQ;gBAC7B,UAAU,EAAE,UAAU,CAAC,UAAU;gBACjC,UAAU,EAAE,UAAU,CAAC,oBAAoB;aAC5C,CAAC;iBACD,IAAI,CAAC,GAAG,EAAE;gBACT,IAAI,OAAO,KAAK,SAAS,EAAE;oBACzB,OAAO,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;iBACjC;qBAAM;oBACL,IAAI,OAAO,YAAY,MAAM,EAAE;wBAC7B,OAAO,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;qBACjC;oBAED,OAAO,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAiB,CAAC,EAAE,GAAG,CAAC,CAAC;iBACxD;YACH,CAAC,CAAC;iBACD,IAAI,CAAC,GAAG,EAAE;gBACT,MAAM,CAAC,GAAG,EAAE,CAAC;gBAEb,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACb,mBAAmB,EAAE,CAAC;gBACtB,oBAAoB,IAAI,qBAAqB,CAAC;gBAE9C,IAAI,mBAAmB,GAAG,CAAC,EAAE;oBAC3B,MAAM,CAAC,GAAG,CAAC,CAAC;iBACb;qBAAM;oBACL,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC;iBACzD;YACH,CAAC,CAAC,CAAC;QACP,CAAC;QAED,UAAU,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACL,CAAC;AAuCD,
|
|
1
|
+
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../../lib/ssh/file.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../lib/traefik/controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAIzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAK9C,MAAM,WAAW,WAAW;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACnC,kBAAkB,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;KAAE,CAAC;IAC7D,YAAY,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpC,mBAAmB,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC5C,gBAAgB,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;CACzD;AAED,qBAAa,OAAQ,SAAQ,iBAAiB;IAC5C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA6B;IACzD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAsB;IACrD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAY;IAC7C,SAAgB,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACjD,SAAgB,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAExD;;;;;OAKG;gBACS,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,wBAAwB;
|
|
1
|
+
{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../lib/traefik/controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAIzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAK9C,MAAM,WAAW,WAAW;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACnC,kBAAkB,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;KAAE,CAAC;IAC7D,YAAY,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpC,mBAAmB,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC5C,gBAAgB,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;CACzD;AAED,qBAAa,OAAQ,SAAQ,iBAAiB;IAC5C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA6B;IACzD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAsB;IACrD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAY;IAC7C,SAAgB,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACjD,SAAgB,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAExD;;;;;OAKG;gBACS,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,wBAAwB;CA6KpF"}
|
|
@@ -126,7 +126,11 @@ class Traefik extends common_1.ComponentResource {
|
|
|
126
126
|
labelSelector: {
|
|
127
127
|
matchExpressions: [
|
|
128
128
|
{ key: "app.kubernetes.io/name", operator: "In", values: ["traefik"] },
|
|
129
|
-
{
|
|
129
|
+
{
|
|
130
|
+
key: "app.kubernetes.io/instance",
|
|
131
|
+
operator: "In",
|
|
132
|
+
values: [pulumi.interpolate `${name}-${this.namespace}`],
|
|
133
|
+
},
|
|
130
134
|
],
|
|
131
135
|
},
|
|
132
136
|
topologyKey: "kubernetes.io/hostname",
|
|
@@ -146,7 +150,7 @@ class Traefik extends common_1.ComponentResource {
|
|
|
146
150
|
namespace: this.namespace,
|
|
147
151
|
labels: {
|
|
148
152
|
"app.kubernetes.io/name": "traefik",
|
|
149
|
-
"app.kubernetes.io/instance": name
|
|
153
|
+
"app.kubernetes.io/instance": pulumi.interpolate `${name}-traefik`,
|
|
150
154
|
},
|
|
151
155
|
};
|
|
152
156
|
this.metricsService = new k8s.core.v1.Service(`${name}-metrics`, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../lib/traefik/controller.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../lib/traefik/controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AACzC,wDAA0C;AAC1C,uCAAyB;AACzB,2CAA6B;AAC7B,sCAA8C;AAC9C,0DAA4C;AAC5C,8CAA+C;AAC/C,wCAAuC;AAYvC,MAAa,OAAQ,SAAQ,0BAAiB;IAC3B,WAAW,CAA6B;IACxC,cAAc,CAAsB;IACpC,cAAc,CAAiB;IAC/B,gBAAgB,CAAY;IAC7B,SAAS,CAAwB;IACjC,gBAAgB,CAAwB;IAExD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAiB,EAAE,IAAsC;QACjF,KAAK,CAAC,oBAAoB,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAE9C,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE/B,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE;YAC/B,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;SACnB;QAED,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,EAAE;YAClC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;SAChC;QAED,IAAI,IAAI,CAAC,kBAAkB,KAAK,SAAS,EAAE;YACzC,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;SAC9B;QAED,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,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,SAAS,CAAC,CAAC;QAEtE,IAAI,CAAC,WAAW,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAC/C,IAAI,EACJ;YACE,IAAI;YACJ,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,cAAc,EAAE,EAAE,IAAI,EAAE,iCAAiC,EAAE;YAC3D,KAAK,EAAE,SAAS;YAChB,MAAM,EAAE;gBACN,gBAAgB,EAAE,IAAI;gBACtB,UAAU,EAAE;oBACV,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,eAAe,EAAE,EAAE;iBACpB;gBACD,eAAe,EAAE,EAAE;gBACnB,mBAAmB,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,gBAAgB,CAAC,EAAE,EAAE;oBACpF,MAAM,IAAI,GAAG;wBACX,wDAAwD;wBACxD,6DAA6D;wBAC7D,+DAA+D;wBAC/D,4CAA4C;qBAC7C,CAAC;oBAEF,IAAI,gBAAgB,KAAK,SAAS,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;wBACjE,IAAI,CAAC,IAAI,CAAC,8CAA8C,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;wBACtF,IAAI,CAAC,IAAI,CAAC,oDAAoD,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;qBAC7F;oBAED,OAAO,IAAI,CAAC;gBACd,CAAC,CAAC;gBACF,SAAS,EAAE;oBACT,aAAa,EAAE;wBACb,YAAY,EAAE,IAAI,CAAC,YAAY;qBAChC;oBACD,iBAAiB,EAAE;wBACjB,YAAY,EAAE,IAAI,CAAC,YAAY;wBAC/B,gBAAgB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;wBACnC,yBAAyB,EAAE,IAAI;qBAChC;iBACF;gBACD,YAAY,EAAE;oBACZ,OAAO,EAAE,IAAI;oBACb,cAAc,EAAE,IAAI,CAAC,mBAAmB,IAAI,KAAK;oBACjD,kBAAkB,EAAE,IAAI;iBACzB;gBACD,YAAY,EAAE,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;gBAC/C,IAAI,EAAE;oBACJ,OAAO,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;oBAC3B,MAAM,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;iBAC3B;gBACD,OAAO,EAAE;oBACP,IAAI,EAAE,IAAI,CAAC,WAAW;oBACtB,WAAW,EAAE,IAAI,CAAC,kBAAkB;iBACrC;gBACD,OAAO,EAAE;oBACP,UAAU,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,gBAAgB,EAAE,IAAI,EAAE;iBAC9D;gBACD,mBAAmB,EAAE;oBACnB,OAAO,EAAE,IAAI;oBACb,cAAc,EAAE,KAAK;iBACtB;gBACD,QAAQ,EAAE;oBACR,eAAe,EAAE;wBACf,+CAA+C,EAAE;4BAC/C;gCACE,MAAM,EAAE,GAAG;gCACX,eAAe,EAAE;oCACf,aAAa,EAAE;wCACb,gBAAgB,EAAE;4CAChB,EAAE,GAAG,EAAE,wBAAwB,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE;4CACtE;gDACE,GAAG,EAAE,4BAA4B;gDACjC,QAAQ,EAAE,IAAI;gDACd,MAAM,EAAE,CAAC,MAAM,CAAC,WAAW,CAAA,GAAG,IAAI,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;6CACxD;yCACF;qCACF;oCACD,WAAW,EAAE,wBAAwB;iCACtC;6BACF;yBACF;qBACF;iBACF;gBACD,SAAS,EAAE;oBACT,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;oBAC5B,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;iBAC3B;aACF;SACF,EACD,IAAI,CACL,CAAC;QAEF,MAAM,eAAe,GAAG;YACtB,IAAI,EAAE,GAAG,IAAI,UAAU;YACvB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,MAAM,EAAE;gBACN,wBAAwB,EAAE,SAAS;gBACnC,4BAA4B,EAAE,MAAM,CAAC,WAAW,CAAA,GAAG,IAAI,UAAU;aAClE;SACF,CAAC;QAEF,IAAI,CAAC,cAAc,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAC3C,GAAG,IAAI,UAAU,EACjB;YACE,QAAQ,EAAE,eAAe;YACzB,IAAI,EAAE;gBACJ,QAAQ,EAAE,eAAe,CAAC,MAAM;gBAChC,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;aAChE;SACF,EACD,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAC3C,CAAC;QAEF,IAAI,CAAC,cAAc,GAAG,IAAI,2BAAc,CACtC,GAAG,IAAI,UAAU,EACjB;YACE,QAAQ,EAAE,eAAe;YACzB,IAAI,EAAE;gBACJ,iBAAiB,EAAE,EAAE,UAAU,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;gBACnD,QAAQ,EAAE,EAAE,WAAW,EAAE,eAAe,CAAC,MAAM,EAAE;gBACjD,SAAS,EAAE;oBACT;wBACE,IAAI,EAAE,SAAS;wBACf,WAAW,EAAE,IAAI;wBACjB,iBAAiB,EAAE;4BACjB;gCACE,MAAM,EAAE,MAAM;gCACd,YAAY,EAAE,CAAC,UAAU,CAAC;gCAC1B,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;6BAC3B;yBACF;qBACF;iBACF;aACF;SACF,EACD,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAC9C,CAAC;QAEF,IAAI,CAAC,gBAAgB,GAAG,IAAI,mBAAS,CACnC,GAAG,IAAI,oBAAoB,EAC3B;YACE,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,WAAW,CAAA,GAAG,IAAI,oBAAoB,EAAE;YAC5F,IAAI,EAAE,SAAS;YACf,mEAAmE;YACnE,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;SACjF,EACD,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;CACF;AA3LD,0BA2LC"}
|
package/lib/unifi/controller.js
CHANGED
|
@@ -93,7 +93,7 @@ class UnifiController extends common_1.ComponentResource {
|
|
|
93
93
|
image: "ghcr.io/linuxserver/unifi-controller:latest",
|
|
94
94
|
imagePullPolicy: "Always",
|
|
95
95
|
securityContext: { runAsNonRoot: false },
|
|
96
|
-
env: [{ name: "MEM_LIMIT", value: "
|
|
96
|
+
env: [{ name: "MEM_LIMIT", value: "896" }],
|
|
97
97
|
ports: [
|
|
98
98
|
{ protocol: "UDP", containerPort: 3478, name: "p3478" },
|
|
99
99
|
{ protocol: "UDP", containerPort: 10001, name: "p10001" },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../lib/unifi/controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AACzC,wDAA0C;AAC1C,sCAA8C;AAC9C,0DAA4C;AAC5C,oDAAsC;AAYtC,MAAa,eAAgB,SAAQ,0BAAiB;IACnC,WAAW,CAAoC;IAC/C,UAAU,CAAyB;IACnC,mBAAmB,CAAoC;IACvD,OAAO,CAAwB;IAC/B,OAAO,CAAwB;IAChC,SAAS,CAAwB;IACjC,SAAS,CAAwB;IAEjD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAyB,EAAE,IAAsC;QACzF,KAAK,CAAC,kBAAkB,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAE5C,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE/B,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;YAC9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;SACvB;QAED,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,MAAM,QAAQ,GAAG;YACf,IAAI,EAAE,MAAM,CAAC,WAAW,CAAA,GAAG,IAAI,aAAa;YAC5C,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,MAAM,EAAE;gBACN,wBAAwB,EAAE,OAAO;gBACjC,6BAA6B,EAAE,YAAY;gBAC3C,4BAA4B,EAAE,IAAI;aACnC;SACF,CAAC;QAEF,MAAM,eAAe,GAAG,GAAG,IAAI,kBAAkB,CAAC;QAElD,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAqB,CACtD,IAAI,EACJ;YACE,QAAQ,EAAE,EAAE,GAAG,QAAQ,EAAE,IAAI,EAAE,eAAe,EAAE;YAChD,IAAI,EAAE;gBACJ,WAAW,EAAE,CAAC,eAAe,CAAC;gBAC9B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,SAAS,EAAE,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE;aACnD;SACF,EACD,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CACnC,CAAC;QAEF,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAC1C,IAAI,EACJ;YACE,QAAQ;YACR,IAAI,EAAE;gBACJ,QAAQ,EAAE,EAAE,WAAW,EAAE,QAAQ,CAAC,MAAM,EAAE;gBAC1C,QAAQ,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE;gBAC9B,QAAQ,EAAE,CAAC;gBACX,QAAQ,EAAE;oBACR,QAAQ,EAAE;wBACR,MAAM,EAAE,QAAQ,CAAC,MAAM;wBACvB,WAAW,EAAE;4BACX,iCAAiC,EAAE,QAAQ;4BAC3C,mCAAmC,EACjC,gFAAgF;4BAClF,qCAAqC,EAAE,YAAY;4BACnD,mCAAmC,EAAE,IAAI;yBAC1C;qBACF;oBACD,IAAI,EAAE;wBACJ,UAAU,EAAE;4BACV;gCACE,IAAI,EAAE,YAAY;gCAClB,KAAK,EAAE,6CAA6C;gCACpD,eAAe,EAAE,QAAQ;gCACzB,eAAe,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE;gCACxC,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../lib/unifi/controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AACzC,wDAA0C;AAC1C,sCAA8C;AAC9C,0DAA4C;AAC5C,oDAAsC;AAYtC,MAAa,eAAgB,SAAQ,0BAAiB;IACnC,WAAW,CAAoC;IAC/C,UAAU,CAAyB;IACnC,mBAAmB,CAAoC;IACvD,OAAO,CAAwB;IAC/B,OAAO,CAAwB;IAChC,SAAS,CAAwB;IACjC,SAAS,CAAwB;IAEjD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAyB,EAAE,IAAsC;QACzF,KAAK,CAAC,kBAAkB,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAE5C,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE/B,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE;YAC9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;SACvB;QAED,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,MAAM,QAAQ,GAAG;YACf,IAAI,EAAE,MAAM,CAAC,WAAW,CAAA,GAAG,IAAI,aAAa;YAC5C,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,MAAM,EAAE;gBACN,wBAAwB,EAAE,OAAO;gBACjC,6BAA6B,EAAE,YAAY;gBAC3C,4BAA4B,EAAE,IAAI;aACnC;SACF,CAAC;QAEF,MAAM,eAAe,GAAG,GAAG,IAAI,kBAAkB,CAAC;QAElD,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAqB,CACtD,IAAI,EACJ;YACE,QAAQ,EAAE,EAAE,GAAG,QAAQ,EAAE,IAAI,EAAE,eAAe,EAAE;YAChD,IAAI,EAAE;gBACJ,WAAW,EAAE,CAAC,eAAe,CAAC;gBAC9B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,SAAS,EAAE,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE;aACnD;SACF,EACD,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CACnC,CAAC;QAEF,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAC1C,IAAI,EACJ;YACE,QAAQ;YACR,IAAI,EAAE;gBACJ,QAAQ,EAAE,EAAE,WAAW,EAAE,QAAQ,CAAC,MAAM,EAAE;gBAC1C,QAAQ,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE;gBAC9B,QAAQ,EAAE,CAAC;gBACX,QAAQ,EAAE;oBACR,QAAQ,EAAE;wBACR,MAAM,EAAE,QAAQ,CAAC,MAAM;wBACvB,WAAW,EAAE;4BACX,iCAAiC,EAAE,QAAQ;4BAC3C,mCAAmC,EACjC,gFAAgF;4BAClF,qCAAqC,EAAE,YAAY;4BACnD,mCAAmC,EAAE,IAAI;yBAC1C;qBACF;oBACD,IAAI,EAAE;wBACJ,UAAU,EAAE;4BACV;gCACE,IAAI,EAAE,YAAY;gCAClB,KAAK,EAAE,6CAA6C;gCACpD,eAAe,EAAE,QAAQ;gCACzB,eAAe,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE;gCACxC,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;gCAC1C,KAAK,EAAE;oCACL,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;oCACvD,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE;oCACzD,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;oCACvD,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;oCACvD,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;oCACvD,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;oCACvD,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;oCACvD,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;iCACxD;gCACD,aAAa,EAAE;oCACb,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE;oCACtD,mBAAmB,EAAE,EAAE;oCACvB,aAAa,EAAE,EAAE;oCACjB,gBAAgB,EAAE,CAAC;iCACpB;gCACD,cAAc,EAAE;oCACd,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE;oCACtD,mBAAmB,EAAE,EAAE;oCACvB,aAAa,EAAE,EAAE;oCACjB,gBAAgB,EAAE,CAAC;iCACpB;gCACD,YAAY,EAAE;oCACZ,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE;oCAC3C,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE;iCACzC;gCACD,SAAS,EAAE;oCACT,QAAQ,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;oCAC9B,MAAM,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;iCAC7B;6BACF;yBACF;wBACD,OAAO,EAAE;4BACP,EAAE,IAAI,EAAE,MAAM,EAAE,qBAAqB,EAAE,EAAE,SAAS,EAAE,eAAe,EAAE,EAAE;4BACvE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE;yBACjC;wBACD,QAAQ,EAAE;4BACR,eAAe,EAAE;gCACf,+CAA+C,EAAE;oCAC/C;wCACE,MAAM,EAAE,GAAG;wCACX,eAAe,EAAE;4CACf,aAAa,EAAE;gDACb,gBAAgB,EAAE;oDAChB;wDACE,GAAG,EAAE,wBAAwB;wDAC7B,QAAQ,EAAE,IAAI;wDACd,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;qDACpD;oDACD;wDACE,GAAG,EAAE,6BAA6B;wDAClC,QAAQ,EAAE,IAAI;wDACd,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,6BAA6B,CAAC,CAAC;qDACzD;oDACD;wDACE,GAAG,EAAE,4BAA4B;wDACjC,QAAQ,EAAE,IAAI;wDACd,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAAC;qDACxD;iDACF;6CACF;4CACD,WAAW,EAAE,wBAAwB;yCACtC;qCACF;iCACF;6BACF;yBACF;qBACF;iBACF;aACF;SACF,EACD,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,mBAAmB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,mBAAmB,CAC9D,IAAI,EACJ;YACE,QAAQ;YACR,IAAI,EAAE;gBACJ,YAAY,EAAE,CAAC;gBACf,QAAQ,EAAE,EAAE,WAAW,EAAE,QAAQ,CAAC,MAAM,EAAE;aAC3C;SACF,EACD,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,OAAO,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,OAAO,CACtC,IAAI,EACJ;YACE,SAAS,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC;YAChC,QAAQ;YACR,IAAI,EAAE;gBACJ,QAAQ,EAAE,QAAQ,CAAC,MAAM;gBACzB,KAAK,EAAE;oBACL,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;oBAC9C,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;oBAC9C,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;oBAC9C,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;oBAC9C,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;oBAC9C,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;oBAC9C,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE;oBAC9C,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE;iBACjD;aACF;SACF,EACD,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAC1C,CAAC;QAEF,IAAI,CAAC,OAAO,GAAG,IAAI,OAAO,CAAC,aAAa,CACtC,IAAI,EACJ;YACE,QAAQ;YACR,IAAI,EAAE;gBACJ,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,KAAK,EAAE;oBACL;wBACE,IAAI,EAAE,IAAI,CAAC,QAAQ;wBACnB,IAAI,EAAE;4BACJ,KAAK,EAAE;gCACL;oCACE,IAAI,EAAE,GAAG;oCACT,QAAQ,EAAE,QAAQ;oCAClB,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;iCACpF;6BACF;yBACF;qBACF;iBACF;aACF;SACF,EACD,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,cAAc,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QAEnF,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;CACF;AAzND,0CAyNC"}
|
package/lib/velero/operator.d.ts
CHANGED
|
@@ -15,7 +15,7 @@ export interface VeleroArgs {
|
|
|
15
15
|
protect?: boolean;
|
|
16
16
|
}
|
|
17
17
|
export declare class Velero extends ComponentResource {
|
|
18
|
-
private readonly
|
|
18
|
+
private readonly repoPasswordSecret;
|
|
19
19
|
private readonly helmRelease;
|
|
20
20
|
private readonly bucket;
|
|
21
21
|
readonly resticPassword: pulumi.Output<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operator.d.ts","sourceRoot":"","sources":["../../../lib/velero/operator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAIzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAI9C,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACjC;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAClC;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,qBAAa,MAAO,SAAQ,iBAAiB;IAC3C,OAAO,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"operator.d.ts","sourceRoot":"","sources":["../../../lib/velero/operator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAIzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAI9C,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACjC;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAClC;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,qBAAa,MAAO,SAAQ,iBAAiB;IAC3C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqB;IACxD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAkB;IAC9C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,SAAgB,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACtD,SAAgB,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEjD;;;;;OAKG;gBACS,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,wBAAwB;CAsJnF"}
|
package/lib/velero/operator.js
CHANGED
|
@@ -32,7 +32,7 @@ const common_1 = require("../common");
|
|
|
32
32
|
const helm = __importStar(require("../kubernetes/helm"));
|
|
33
33
|
const aws_1 = require("../aws");
|
|
34
34
|
class Velero extends common_1.ComponentResource {
|
|
35
|
-
|
|
35
|
+
repoPasswordSecret;
|
|
36
36
|
helmRelease;
|
|
37
37
|
bucket;
|
|
38
38
|
resticPassword;
|
|
@@ -62,8 +62,8 @@ class Velero extends common_1.ComponentResource {
|
|
|
62
62
|
"app.kubernetes.io/instance": name,
|
|
63
63
|
},
|
|
64
64
|
};
|
|
65
|
-
this.
|
|
66
|
-
metadata: { ...metadata, name: pulumi.interpolate `${name}-
|
|
65
|
+
this.repoPasswordSecret = new k8s.core.v1.Secret(name, {
|
|
66
|
+
metadata: { ...metadata, name: pulumi.interpolate `${name}-repo-credentials` },
|
|
67
67
|
stringData: {
|
|
68
68
|
"repository-password": this.resticPassword,
|
|
69
69
|
},
|
|
@@ -77,7 +77,7 @@ class Velero extends common_1.ComponentResource {
|
|
|
77
77
|
fullnameOverride: name,
|
|
78
78
|
backupsEnabled: true,
|
|
79
79
|
snapshotsEnabled: false,
|
|
80
|
-
|
|
80
|
+
deployNodeAgent: true,
|
|
81
81
|
configuration: {
|
|
82
82
|
provider: "aws",
|
|
83
83
|
backupStorageLocation: {
|
|
@@ -90,13 +90,18 @@ class Velero extends common_1.ComponentResource {
|
|
|
90
90
|
},
|
|
91
91
|
},
|
|
92
92
|
credentials: {
|
|
93
|
-
|
|
93
|
+
secretContents: {
|
|
94
94
|
AWS_ACCESS_KEY_ID: this.bucket.accessKey.accessKey.id,
|
|
95
95
|
AWS_SECRET_ACCESS_KEY: this.bucket.accessKey.accessKey.secret,
|
|
96
96
|
AWS_DEFAULT_REGION: this.bucket.bucket.region,
|
|
97
97
|
},
|
|
98
|
+
extraEnvVars: {
|
|
99
|
+
AWS_ACCESS_KEY_ID: "AWS_ACCESS_KEY_ID",
|
|
100
|
+
AWS_SECRET_ACCESS_KEY: "AWS_SECRET_ACCESS_KEY",
|
|
101
|
+
AWS_DEFAULT_REGION: "AWS_DEFAULT_REGION",
|
|
102
|
+
},
|
|
98
103
|
},
|
|
99
|
-
|
|
104
|
+
nodeAgent: {
|
|
100
105
|
privileged: true,
|
|
101
106
|
resources: {
|
|
102
107
|
requests: { memory: "192Mi" },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operator.js","sourceRoot":"","sources":["../../../lib/velero/operator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AACzC,uDAAyC;AACzC,wDAA0C;AAC1C,iDAAmC;AACnC,sCAA8C;AAC9C,yDAA2C;AAC3C,gCAAgC;AAiBhC,MAAa,MAAO,SAAQ,0BAAiB;IAC1B,
|
|
1
|
+
{"version":3,"file":"operator.js","sourceRoot":"","sources":["../../../lib/velero/operator.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ export interface WireguardArgs {
|
|
|
16
16
|
namespace?: pulumi.Input<string>;
|
|
17
17
|
interface: pulumi.Input<Interface>;
|
|
18
18
|
peers?: pulumi.Input<pulumi.Input<Peer>[]>;
|
|
19
|
+
natInterface?: pulumi.Input<string>;
|
|
19
20
|
nodeSelector?: pulumi.Input<{
|
|
20
21
|
[key: string]: pulumi.Input<string>;
|
|
21
22
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../lib/wireguard/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAChD,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;CAC7B;AAED,MAAM,WAAW,IAAI;IACnB,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;KAAE,CAAC,CAAC;CACtE;AAED,qBAAa,SAAU,SAAQ,iBAAiB;IAC9C,gBAAuB,YAAY,sCAAsC;IACzE,gBAAuB,iBAAiB,UAAU;IAClD,gBAAuB,oBAAoB,eAAe;IAC1D,gBAAuB,oBAAoB,SAAS;IAEpD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqB;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAwB;IAClD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAoC;IACxE,SAAgB,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACrD,SAAgB,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACrD,SAAgB,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEjD;;;;;OAKG;gBACS,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,wBAAwB;
|
|
1
|
+
{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../lib/wireguard/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAChD,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;CAC7B;AAED,MAAM,WAAW,IAAI;IACnB,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACpC,YAAY,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;KAAE,CAAC,CAAC;CACtE;AAED,qBAAa,SAAU,SAAQ,iBAAiB;IAC9C,gBAAuB,YAAY,sCAAsC;IACzE,gBAAuB,iBAAiB,UAAU;IAClD,gBAAuB,oBAAoB,eAAe;IAC1D,gBAAuB,oBAAoB,SAAS;IAEpD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqB;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAwB;IAClD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAoC;IACxE,SAAgB,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACrD,SAAgB,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACrD,SAAgB,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEjD;;;;;OAKG;gBACS,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,wBAAwB;CA4HtF"}
|
|
@@ -110,6 +110,7 @@ class Wireguard extends common_1.ComponentResource {
|
|
|
110
110
|
env: [
|
|
111
111
|
{ name: "IFACE", value: this.interfaceName },
|
|
112
112
|
{ name: "IPTABLES_ALLOW_FORWARD", value: "true" },
|
|
113
|
+
{ name: "IPTABLES_NAT_INTERFACE", value: args.natInterface ?? "" },
|
|
113
114
|
],
|
|
114
115
|
securityContext: { privileged: true, capabilities: { add: ["NET_ADMIN"] } },
|
|
115
116
|
volumeMounts: [{ name: "conf", mountPath: "/etc/wireguard", readOnly: true }],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/wireguard/deployment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AACzC,wDAA0C;AAC1C,sCAA8C;
|
|
1
|
+
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/wireguard/deployment.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ydkn/pulumi-components",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.8",
|
|
4
4
|
"keywords": [
|
|
5
5
|
"pulumi"
|
|
6
6
|
],
|
|
@@ -15,33 +15,33 @@
|
|
|
15
15
|
"devDependencies": {
|
|
16
16
|
"@types/bcrypt": "^5.0.0",
|
|
17
17
|
"@types/js-yaml": "^4.0.5",
|
|
18
|
-
"@types/node": "^18.11.
|
|
18
|
+
"@types/node": "^18.11.18",
|
|
19
19
|
"@types/ssh2": "^1.11.6",
|
|
20
20
|
"@types/ssh2-sftp-client": "^9.0.0",
|
|
21
|
-
"@types/uuid": "^
|
|
22
|
-
"@typescript-eslint/eslint-plugin": "^5.
|
|
23
|
-
"@typescript-eslint/parser": "^5.
|
|
21
|
+
"@types/uuid": "^9.0.0",
|
|
22
|
+
"@typescript-eslint/eslint-plugin": "^5.47.1",
|
|
23
|
+
"@typescript-eslint/parser": "^5.47.1",
|
|
24
24
|
"bcrypt": "^5.1.0",
|
|
25
25
|
"copyfiles": "^2.4.1",
|
|
26
|
-
"eslint": "^8.
|
|
26
|
+
"eslint": "^8.30.0",
|
|
27
27
|
"eslint-config-prettier": "^8.5.0",
|
|
28
28
|
"eslint-config-standard": "^17.0.0",
|
|
29
29
|
"eslint-plugin-import": "^2.26.0",
|
|
30
|
-
"eslint-plugin-n": "^15.
|
|
30
|
+
"eslint-plugin-n": "^15.6.0",
|
|
31
31
|
"eslint-plugin-node": "^11.1.0",
|
|
32
32
|
"eslint-plugin-promise": "^6.1.1",
|
|
33
33
|
"eslint-plugin-security": "^1.5.0",
|
|
34
|
-
"prettier": "^2.
|
|
34
|
+
"prettier": "^2.8.1",
|
|
35
35
|
"rimraf": "^3.0.2",
|
|
36
|
-
"typescript": "^4.
|
|
36
|
+
"typescript": "^4.9.4"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@pulumi/aws": "^5.
|
|
40
|
-
"@pulumi/cloudflare": "^4.
|
|
39
|
+
"@pulumi/aws": "^5.25.0",
|
|
40
|
+
"@pulumi/cloudflare": "^4.14.0",
|
|
41
41
|
"@pulumi/gitlab": "^4.9.0",
|
|
42
42
|
"@pulumi/hcloud": "^1.10.1",
|
|
43
|
-
"@pulumi/kubernetes": "^3.
|
|
44
|
-
"@pulumi/pulumi": "^3.
|
|
43
|
+
"@pulumi/kubernetes": "^3.23.1",
|
|
44
|
+
"@pulumi/pulumi": "^3.50.2",
|
|
45
45
|
"@pulumi/random": "^4.8.2",
|
|
46
46
|
"@pulumi/tls": "^4.6.1",
|
|
47
47
|
"@ydkn/pulumi-k0s": "^0.1.11",
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
"ssh2": "^1.11.0",
|
|
51
51
|
"ssh2-sftp-client": "^9.0.4",
|
|
52
52
|
"template-file": "^6.0.1",
|
|
53
|
-
"urllib": "^3.
|
|
53
|
+
"urllib": "^3.10.0",
|
|
54
54
|
"uuid": "^9.0.0"
|
|
55
55
|
},
|
|
56
56
|
"scripts": {
|
|
@@ -1,44 +0,0 @@
|
|
|
1
|
-
#!/bin/bash -e
|
|
2
|
-
|
|
3
|
-
function install_bg() {
|
|
4
|
-
# update package lists
|
|
5
|
-
apt-get update -y
|
|
6
|
-
|
|
7
|
-
# upgrade packages
|
|
8
|
-
apt-get dist-upgrade -y
|
|
9
|
-
|
|
10
|
-
# install additional packages
|
|
11
|
-
apt-get install $(cat /run/k8s/init/packages.txt) -y
|
|
12
|
-
}
|
|
13
|
-
|
|
14
|
-
# background installation of additional stuff
|
|
15
|
-
install_bg &
|
|
16
|
-
|
|
17
|
-
# setup new home directory
|
|
18
|
-
usermod -d /code code
|
|
19
|
-
|
|
20
|
-
# copy upstream home directory contents
|
|
21
|
-
rsync -a /home/code/ /code/
|
|
22
|
-
|
|
23
|
-
# fix permissions
|
|
24
|
-
chmod -R g-w,o-w /code/.cache
|
|
25
|
-
|
|
26
|
-
# setup ssh host keys
|
|
27
|
-
rm -f /etc/ssh/ssh_host_*_key
|
|
28
|
-
rm -f /etc/ssh/ssh_host_*_key.pub
|
|
29
|
-
cp /run/k8s/ssh/ssh_host_*_key /run/k8s/ssh/ssh_host_*_key.pub /etc/ssh/
|
|
30
|
-
chmod 600 /etc/ssh/ssh_host_*_key
|
|
31
|
-
chmod 644 /etc/ssh/ssh_host_*_key.pub
|
|
32
|
-
|
|
33
|
-
# install authorized keys for code
|
|
34
|
-
mkdir -p /code/.ssh
|
|
35
|
-
chmod 700 /code/.ssh
|
|
36
|
-
cp /run/k8s/ssh/authorized_keys /code/.ssh/authorized_keys
|
|
37
|
-
chmod 600 /code/.ssh/authorized_keys
|
|
38
|
-
chown -R code:code /code/.ssh
|
|
39
|
-
|
|
40
|
-
# remove motd
|
|
41
|
-
rm -rf /etc/update-motd.d/*
|
|
42
|
-
|
|
43
|
-
# start sshd
|
|
44
|
-
/usr/sbin/sshd -D
|
|
@@ -1,39 +0,0 @@
|
|
|
1
|
-
import * as pulumi from "@pulumi/pulumi";
|
|
2
|
-
import * as k8s from "@pulumi/kubernetes";
|
|
3
|
-
import { ComponentResource } from "../common";
|
|
4
|
-
export interface DevContainerArgs {
|
|
5
|
-
namespace?: pulumi.Input<string>;
|
|
6
|
-
image: pulumi.Input<string>;
|
|
7
|
-
hostname?: pulumi.Input<string>;
|
|
8
|
-
authorizedKeys?: pulumi.Input<pulumi.Input<string>[]>;
|
|
9
|
-
packages?: pulumi.Input<pulumi.Input<string>[]>;
|
|
10
|
-
volumes?: pulumi.Input<pulumi.Input<k8s.types.input.core.v1.Volume>[]>;
|
|
11
|
-
volumeMounts?: pulumi.Input<pulumi.Input<k8s.types.input.core.v1.VolumeMount>[]>;
|
|
12
|
-
nodeSelector?: pulumi.Input<{
|
|
13
|
-
[key: string]: pulumi.Input<string>;
|
|
14
|
-
}>;
|
|
15
|
-
storageClassName?: pulumi.Input<string>;
|
|
16
|
-
storageSize?: pulumi.Input<string>;
|
|
17
|
-
resources?: pulumi.Input<k8s.types.input.core.v1.ResourceRequirements>;
|
|
18
|
-
}
|
|
19
|
-
export declare class DevContainer extends ComponentResource {
|
|
20
|
-
private static readonly sshContainerPort;
|
|
21
|
-
private readonly sshPrivateKeysRSA;
|
|
22
|
-
private readonly sshPrivateKeysECDSA;
|
|
23
|
-
private readonly sshPrivateKeysED25519;
|
|
24
|
-
private readonly initScript;
|
|
25
|
-
private readonly sshSecret;
|
|
26
|
-
private readonly volumeClaim;
|
|
27
|
-
private readonly deployment;
|
|
28
|
-
private readonly podDisruptionBudget;
|
|
29
|
-
private readonly service;
|
|
30
|
-
readonly namespace: pulumi.Output<string>;
|
|
31
|
-
/**
|
|
32
|
-
* Create a new DevContainer resource.
|
|
33
|
-
* @param name The name of the DevContainer resource.
|
|
34
|
-
* @param args A bag of arguments to control the DevContainer creation.
|
|
35
|
-
* @param opts A bag of options that control this resource's behavior.
|
|
36
|
-
*/
|
|
37
|
-
constructor(name: string, args: DevContainerArgs, opts?: pulumi.ComponentResourceOptions);
|
|
38
|
-
}
|
|
39
|
-
//# sourceMappingURL=deployment.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../lib/devcontainer/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAEzC,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAG1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAG9C,MAAM,WAAW,gBAAgB;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAChC,cAAc,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACtD,QAAQ,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAChD,OAAO,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACvE,YAAY,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IACjF,YAAY,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;KAAE,CAAC,CAAC;IACrE,gBAAgB,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACxC,WAAW,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC;CACxE;AAED,qBAAa,YAAa,SAAQ,iBAAiB;IACjD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAM;IAE9C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAiB;IACnD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAiB;IACrD,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAiB;IACvD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAwB;IACnD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqB;IAC/C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoC;IAChE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAyB;IACpD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAoC;IACxE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwB;IAChD,SAAgB,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEjD;;;;;OAKG;gBACS,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,wBAAwB;CAkNzF"}
|