@ydkn/pulumi-components 0.5.4 → 0.5.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.
- package/lib/aws/bucket.d.ts.map +1 -1
- package/lib/aws/bucket.js +7 -1
- package/lib/aws/bucket.js.map +1 -1
- package/lib/blocky/deployment.d.ts +11 -1
- package/lib/blocky/deployment.d.ts.map +1 -1
- package/lib/blocky/deployment.js +127 -37
- package/lib/blocky/deployment.js.map +1 -1
- package/lib/dhcpd/deployment.d.ts +1 -0
- package/lib/dhcpd/deployment.d.ts.map +1 -1
- package/lib/dhcpd/deployment.js +3 -2
- package/lib/dhcpd/deployment.js.map +1 -1
- package/lib/externalDns/operator.js.map +1 -1
- package/lib/fcos/assets/rpm-opstree-install.sh +2 -8
- package/lib/fcos/host.d.ts.map +1 -1
- package/lib/fcos/host.js +1 -1
- package/lib/fcos/host.js.map +1 -1
- package/lib/freeradius/deployment.d.ts +2 -0
- package/lib/freeradius/deployment.d.ts.map +1 -1
- package/lib/freeradius/deployment.js +2 -0
- package/lib/freeradius/deployment.js.map +1 -1
- package/lib/gitlab/project.d.ts.map +1 -1
- package/lib/gitlab/project.js +0 -6
- package/lib/gitlab/project.js.map +1 -1
- package/lib/hcloud/assets/fcos-install.sh +5 -6
- package/lib/hcloud/cluster.d.ts +13 -3
- package/lib/hcloud/cluster.d.ts.map +1 -1
- package/lib/hcloud/cluster.js +32 -12
- package/lib/hcloud/cluster.js.map +1 -1
- package/lib/hcloud/wireguard.js +1 -1
- package/lib/hcloud/wireguard.js.map +1 -1
- package/lib/metallb/controller.d.ts +1 -0
- package/lib/metallb/controller.d.ts.map +1 -1
- package/lib/metallb/controller.js +1 -0
- package/lib/metallb/controller.js.map +1 -1
- package/lib/metallb/ipAddressPool.d.ts +1 -0
- package/lib/metallb/ipAddressPool.d.ts.map +1 -1
- package/lib/metallb/ipAddressPool.js.map +1 -1
- package/lib/metallb/l2Advertisement.d.ts +1 -0
- package/lib/metallb/l2Advertisement.d.ts.map +1 -1
- package/lib/metallb/l2Advertisement.js.map +1 -1
- package/lib/mongodb/cluster.d.ts +2 -0
- package/lib/mongodb/cluster.d.ts.map +1 -1
- package/lib/mongodb/cluster.js +4 -2
- package/lib/mongodb/cluster.js.map +1 -1
- package/lib/nats/cluster.d.ts +2 -0
- package/lib/nats/cluster.d.ts.map +1 -1
- package/lib/nats/cluster.js +2 -1
- package/lib/nats/cluster.js.map +1 -1
- package/lib/openldap/deployment.d.ts +2 -0
- package/lib/openldap/deployment.d.ts.map +1 -1
- package/lib/openldap/deployment.js +2 -0
- package/lib/openldap/deployment.js.map +1 -1
- package/lib/postgresql/cluster.d.ts +15 -0
- package/lib/postgresql/cluster.d.ts.map +1 -1
- package/lib/postgresql/cluster.js +5 -2
- package/lib/postgresql/cluster.js.map +1 -1
- package/lib/postgresql/operator.d.ts.map +1 -1
- package/lib/postgresql/operator.js +3 -0
- package/lib/postgresql/operator.js.map +1 -1
- package/lib/prometheus/serviceMonitor.d.ts +1 -0
- package/lib/prometheus/serviceMonitor.d.ts.map +1 -1
- package/lib/prometheus/serviceMonitor.js.map +1 -1
- package/lib/raspberrypi/cluster.js.map +1 -1
- package/lib/redis/standalone.d.ts +2 -0
- package/lib/redis/standalone.d.ts.map +1 -1
- package/lib/redis/standalone.js +12 -9
- package/lib/redis/standalone.js.map +1 -1
- package/lib/rook/cluster.js +3 -3
- package/lib/samba/deployment.d.ts.map +1 -1
- package/lib/samba/deployment.js +7 -2
- package/lib/samba/deployment.js.map +1 -1
- package/lib/torproxy/deployment.d.ts +2 -9
- package/lib/torproxy/deployment.d.ts.map +1 -1
- package/lib/torproxy/deployment.js +5 -3
- package/lib/torproxy/deployment.js.map +1 -1
- package/lib/traefik/controller.d.ts +1 -0
- package/lib/traefik/controller.d.ts.map +1 -1
- package/lib/traefik/controller.js +5 -0
- package/lib/traefik/controller.js.map +1 -1
- package/lib/traefik/secureIngress.js.map +1 -1
- package/lib/transmission/deployment.d.ts.map +1 -1
- package/lib/transmission/deployment.js +6 -2
- package/lib/transmission/deployment.js.map +1 -1
- package/lib/ubuntu/deployment.d.ts +2 -0
- package/lib/ubuntu/deployment.d.ts.map +1 -1
- package/lib/ubuntu/deployment.js +2 -0
- package/lib/ubuntu/deployment.js.map +1 -1
- package/lib/unifi/controller.d.ts +2 -0
- package/lib/unifi/controller.d.ts.map +1 -1
- package/lib/unifi/controller.js +2 -0
- package/lib/unifi/controller.js.map +1 -1
- package/lib/velero/operator.d.ts.map +1 -1
- package/lib/velero/operator.js +9 -8
- package/lib/velero/operator.js.map +1 -1
- package/lib/wireguard/deployment.js.map +1 -1
- package/package.json +23 -23
package/lib/aws/bucket.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bucket.d.ts","sourceRoot":"","sources":["../../../lib/aws/bucket.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAEzC,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,WAAW,UAAW,SAAQ,GAAG,CAAC,EAAE,CAAC,UAAU;IACnD,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,qBAAa,MAAO,SAAQ,iBAAiB;IAC3C,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAwB;IAC3C,SAAgB,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC;IACtC,SAAgB,SAAS,EAAE,SAAS,CAAC;IACrC,SAAgB,UAAU,EAAE,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC;IAE/C;;;;;OAKG;gBACS,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,wBAAwB;
|
|
1
|
+
{"version":3,"file":"bucket.d.ts","sourceRoot":"","sources":["../../../lib/aws/bucket.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAEzC,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,WAAW,UAAW,SAAQ,GAAG,CAAC,EAAE,CAAC,UAAU;IACnD,IAAI,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,qBAAa,MAAO,SAAQ,iBAAiB;IAC3C,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAwB;IAC3C,SAAgB,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC;IACtC,SAAgB,SAAS,EAAE,SAAS,CAAC;IACrC,SAAgB,UAAU,EAAE,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC;IAE/C;;;;;OAKG;gBACS,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,wBAAwB;CAmDnF"}
|
package/lib/aws/bucket.js
CHANGED
|
@@ -45,7 +45,13 @@ class Bucket extends common_1.ComponentResource {
|
|
|
45
45
|
const emptyOpts = this.opts();
|
|
46
46
|
const awsOpts = this.opts(aws.Provider);
|
|
47
47
|
this.id = new random.RandomId(`${name}-bucket`, { byteLength: 6, prefix: pulumi.interpolate `${args.name ?? name}-` }, { ...emptyOpts, protect: args.protect }).hex;
|
|
48
|
-
this.bucket = new aws.s3.Bucket(name, {
|
|
48
|
+
this.bucket = new aws.s3.Bucket(name, {
|
|
49
|
+
...args,
|
|
50
|
+
bucket: this.id,
|
|
51
|
+
serverSideEncryptionConfiguration: {
|
|
52
|
+
rule: { bucketKeyEnabled: true, applyServerSideEncryptionByDefault: { sseAlgorithm: "aws:kms" } },
|
|
53
|
+
},
|
|
54
|
+
}, { ...awsOpts, protect: args.protect });
|
|
49
55
|
this.accessKey = new accessKey_1.AccessKey(name, { name: this.id }, awsOpts);
|
|
50
56
|
this.userPolicy = new aws.iam.UserPolicy(name, {
|
|
51
57
|
user: this.accessKey.user.name,
|
package/lib/aws/bucket.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bucket.js","sourceRoot":"","sources":["../../../lib/aws/bucket.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AACzC,uDAAyC;AACzC,iDAAmC;AACnC,sCAA8C;AAC9C,2CAAwC;AAOxC,MAAa,MAAO,SAAQ,0BAAiB;IAC1B,EAAE,CAAwB;IAC3B,MAAM,CAAgB;IACtB,SAAS,CAAY;IACrB,UAAU,CAAqB;IAE/C;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAgB,EAAE,IAAsC;QAChF,KAAK,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAEtC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAExC,IAAI,CAAC,EAAE,GAAG,IAAI,MAAM,CAAC,QAAQ,CAC3B,GAAG,IAAI,SAAS,EAChB,EAAE,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,WAAW,CAAA,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,GAAG,EAAE,EACpE,EAAE,GAAG,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CACxC,CAAC,GAAG,CAAC;QAEN,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"bucket.js","sourceRoot":"","sources":["../../../lib/aws/bucket.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AACzC,uDAAyC;AACzC,iDAAmC;AACnC,sCAA8C;AAC9C,2CAAwC;AAOxC,MAAa,MAAO,SAAQ,0BAAiB;IAC1B,EAAE,CAAwB;IAC3B,MAAM,CAAgB;IACtB,SAAS,CAAY;IACrB,UAAU,CAAqB;IAE/C;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAgB,EAAE,IAAsC;QAChF,KAAK,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAEtC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAExC,IAAI,CAAC,EAAE,GAAG,IAAI,MAAM,CAAC,QAAQ,CAC3B,GAAG,IAAI,SAAS,EAChB,EAAE,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,WAAW,CAAA,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,GAAG,EAAE,EACpE,EAAE,GAAG,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CACxC,CAAC,GAAG,CAAC;QAEN,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC,MAAM,CAC7B,IAAI,EACJ;YACE,GAAG,IAAI;YACP,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,iCAAiC,EAAE;gBACjC,IAAI,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,kCAAkC,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,EAAE;aAClG;SACF,EACD,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CACtC,CAAC;QAEF,IAAI,CAAC,SAAS,GAAG,IAAI,qBAAS,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;QAEjE,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,UAAU,CACtC,IAAI,EACJ;YACE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI;YAC9B,MAAM,EAAE;gBACN,OAAO,EAAE,YAAY;gBACrB,SAAS,EAAE;oBACT;wBACE,MAAM,EAAE,OAAO;wBACf,MAAM,EAAE,CAAC,eAAe,CAAC;wBACzB,QAAQ,EAAE,CAAC,MAAM,CAAC,WAAW,CAAA,gBAAgB,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;qBAC/D;oBACD;wBACE,MAAM,EAAE,OAAO;wBACf,MAAM,EAAE,CAAC,MAAM,CAAC;wBAChB,QAAQ,EAAE,CAAC,MAAM,CAAC,WAAW,CAAA,gBAAgB,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC;qBACjE;iBACF;aACF;SACF,EACD,OAAO,CACR,CAAC;QAEF,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;CACF;AA/DD,wBA+DC"}
|
|
@@ -1,17 +1,27 @@
|
|
|
1
1
|
import * as pulumi from "@pulumi/pulumi";
|
|
2
2
|
import { ComponentResource } from "../common";
|
|
3
|
+
export interface RedisArgs {
|
|
4
|
+
address: pulumi.Input<string>;
|
|
5
|
+
database?: pulumi.Input<number>;
|
|
6
|
+
}
|
|
3
7
|
export interface BlockyArgs {
|
|
4
8
|
namespace?: pulumi.Input<string>;
|
|
5
9
|
nameservers?: pulumi.Input<pulumi.Input<string>[]>;
|
|
6
10
|
blocklists?: pulumi.Input<{
|
|
7
11
|
[key: string]: pulumi.Input<pulumi.Input<string>[]>;
|
|
8
12
|
}>;
|
|
13
|
+
redis?: pulumi.Input<RedisArgs>;
|
|
9
14
|
hostname?: pulumi.Input<string>;
|
|
15
|
+
serviceType?: pulumi.Input<string>;
|
|
16
|
+
serviceLoadBalancerClass?: pulumi.Input<string>;
|
|
10
17
|
replicas?: pulumi.Input<number>;
|
|
11
18
|
}
|
|
12
19
|
export declare class Blocky extends ComponentResource {
|
|
13
|
-
private readonly
|
|
20
|
+
private readonly config;
|
|
21
|
+
private readonly deployment;
|
|
14
22
|
private readonly service;
|
|
23
|
+
private readonly metricService;
|
|
24
|
+
private readonly serviceMonitor;
|
|
15
25
|
private readonly grafanaDashboard;
|
|
16
26
|
readonly namespace: pulumi.Output<string>;
|
|
17
27
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../lib/blocky/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAKzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../lib/blocky/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAKzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAK9C,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;KAAE,CAAC,CAAC;IACnF,KAAK,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAChD,QAAQ,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;CACjC;AAED,qBAAa,MAAO,SAAQ,iBAAiB;IAC3C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwB;IAC/C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAyB;IACpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwB;IAChD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;IACpD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAY;IAC7C,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;CA+MnF"}
|
package/lib/blocky/deployment.js
CHANGED
|
@@ -31,10 +31,14 @@ const path = __importStar(require("path"));
|
|
|
31
31
|
const yaml = __importStar(require("js-yaml"));
|
|
32
32
|
const common_1 = require("../common");
|
|
33
33
|
const kubernetes = __importStar(require("../kubernetes"));
|
|
34
|
+
const prometheus_1 = require("../prometheus");
|
|
34
35
|
const grafana_1 = require("../grafana");
|
|
35
36
|
class Blocky extends common_1.ComponentResource {
|
|
36
|
-
|
|
37
|
+
config;
|
|
38
|
+
deployment;
|
|
37
39
|
service;
|
|
40
|
+
metricService;
|
|
41
|
+
serviceMonitor;
|
|
38
42
|
grafanaDashboard;
|
|
39
43
|
namespace;
|
|
40
44
|
/**
|
|
@@ -45,13 +49,13 @@ class Blocky extends common_1.ComponentResource {
|
|
|
45
49
|
*/
|
|
46
50
|
constructor(name, args, opts) {
|
|
47
51
|
super("blocky", name, args, opts);
|
|
48
|
-
|
|
52
|
+
const k8sOpts = this.opts(k8s.Provider);
|
|
49
53
|
if (args.replicas === undefined) {
|
|
50
54
|
args.replicas = 1;
|
|
51
55
|
}
|
|
52
56
|
this.namespace = args.namespace
|
|
53
57
|
? pulumi.output(args.namespace)
|
|
54
|
-
: new k8s.core.v1.Namespace(name, { metadata: { name } },
|
|
58
|
+
: new k8s.core.v1.Namespace(name, { metadata: { name } }, k8sOpts).metadata.name;
|
|
55
59
|
const metadata = {
|
|
56
60
|
name,
|
|
57
61
|
namespace: this.namespace,
|
|
@@ -60,69 +64,155 @@ class Blocky extends common_1.ComponentResource {
|
|
|
60
64
|
"app.kubernetes.io/instance": name,
|
|
61
65
|
},
|
|
62
66
|
};
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
values: {
|
|
69
|
-
fullnameOverride: name,
|
|
70
|
-
controller: { replicas: args.replicas },
|
|
71
|
-
config: pulumi.all([args.nameservers, args.blocklists]).apply(([nameservers, blocklists]) => yaml.dump({
|
|
67
|
+
const upstreamServers = args.nameservers ?? ["193.110.81.0", "185.253.5.0"];
|
|
68
|
+
this.config = new k8s.core.v1.ConfigMap(name, {
|
|
69
|
+
metadata,
|
|
70
|
+
data: {
|
|
71
|
+
"config.yml": pulumi.all([args.blocklists, args.redis]).apply(([blocklists, redis]) => yaml.dump({
|
|
72
72
|
logLevel: "warn",
|
|
73
73
|
logFormat: "json",
|
|
74
|
+
logPrivacy: true,
|
|
75
|
+
port: 53,
|
|
76
|
+
tlsPort: 853,
|
|
74
77
|
httpPort: 4000,
|
|
75
|
-
|
|
78
|
+
httpsPort: 4443,
|
|
79
|
+
upstream: { default: upstreamServers },
|
|
76
80
|
blocking: {
|
|
77
|
-
blackLists: blocklists,
|
|
78
|
-
clientGroupsBlock: { default: Object.keys(blocklists ?? {}) },
|
|
79
81
|
blockType: "nxDomain",
|
|
82
|
+
blockTTL: "6h",
|
|
83
|
+
downloadAttempts: 3,
|
|
84
|
+
downloadCooldown: "2s",
|
|
85
|
+
downloadTimeout: "60s",
|
|
86
|
+
failStartOnListError: false,
|
|
87
|
+
processingConcurrency: 4,
|
|
88
|
+
refreshPeriod: "4h",
|
|
89
|
+
blackLists: blocklists,
|
|
90
|
+
clientGroupsBlock: { default: Object.keys(blocklists ?? []) },
|
|
80
91
|
},
|
|
81
92
|
caching: { prefetching: true },
|
|
93
|
+
redis: redis
|
|
94
|
+
? {
|
|
95
|
+
address: redis.address,
|
|
96
|
+
database: redis.database ?? 0,
|
|
97
|
+
connectionAttempts: 10,
|
|
98
|
+
connectionCooldown: "3s",
|
|
99
|
+
required: true,
|
|
100
|
+
}
|
|
101
|
+
: undefined,
|
|
82
102
|
prometheus: { enable: true, path: "/metrics" },
|
|
83
103
|
})),
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
104
|
+
},
|
|
105
|
+
}, k8sOpts);
|
|
106
|
+
this.deployment = new k8s.apps.v1.Deployment(name, {
|
|
107
|
+
metadata,
|
|
108
|
+
spec: {
|
|
109
|
+
selector: { matchLabels: metadata.labels },
|
|
110
|
+
replicas: args.replicas,
|
|
111
|
+
template: {
|
|
112
|
+
metadata: { labels: metadata.labels },
|
|
113
|
+
spec: {
|
|
114
|
+
dnsPolicy: "ClusterFirst",
|
|
115
|
+
dnsConfig: { options: [{ name: "ndots", value: "1" }] },
|
|
116
|
+
securityContext: {
|
|
117
|
+
runAsUser: 568,
|
|
118
|
+
runAsGroup: 568,
|
|
119
|
+
fsGroup: 568,
|
|
120
|
+
fsGroupChangePolicy: "OnRootMismatch",
|
|
121
|
+
supplementalGroups: [568],
|
|
122
|
+
},
|
|
123
|
+
containers: [
|
|
88
124
|
{
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
125
|
+
name: "blocky",
|
|
126
|
+
image: "spx01/blocky:latest",
|
|
127
|
+
imagePullPolicy: "Always",
|
|
128
|
+
securityContext: { readOnlyRootFilesystem: true, runAsNonRoot: true },
|
|
129
|
+
volumeMounts: [
|
|
130
|
+
{ name: "config", mountPath: "/app/config.yml", subPath: "config.yml", readOnly: true },
|
|
131
|
+
],
|
|
132
|
+
ports: [
|
|
133
|
+
{ name: "dnstcp", protocol: "TCP", containerPort: 53 },
|
|
134
|
+
{ name: "dnsudp", protocol: "UDP", containerPort: 53 },
|
|
135
|
+
{ name: "dot", protocol: "TCP", containerPort: 853 },
|
|
136
|
+
{ name: "http", protocol: "TCP", containerPort: 4000 },
|
|
137
|
+
{ name: "https", protocol: "TCP", containerPort: 4443 },
|
|
138
|
+
],
|
|
139
|
+
resources: {
|
|
140
|
+
requests: { memory: "96Mi" },
|
|
141
|
+
limits: { memory: "128Mi" },
|
|
98
142
|
},
|
|
99
143
|
},
|
|
100
144
|
],
|
|
145
|
+
volumes: [{ name: "config", configMap: { name: this.config.metadata.name, defaultMode: 420 } }],
|
|
146
|
+
affinity: {
|
|
147
|
+
podAntiAffinity: {
|
|
148
|
+
preferredDuringSchedulingIgnoredDuringExecution: [
|
|
149
|
+
{
|
|
150
|
+
podAffinityTerm: {
|
|
151
|
+
labelSelector: {
|
|
152
|
+
matchExpressions: [
|
|
153
|
+
{
|
|
154
|
+
key: "app.kubernetes.io/name",
|
|
155
|
+
operator: "In",
|
|
156
|
+
values: [metadata.labels["app.kubernetes.io/name"]],
|
|
157
|
+
},
|
|
158
|
+
{
|
|
159
|
+
key: "app.kubernetes.io/instance",
|
|
160
|
+
operator: "In",
|
|
161
|
+
values: [metadata.labels["app.kubernetes.io/instance"]],
|
|
162
|
+
},
|
|
163
|
+
],
|
|
164
|
+
},
|
|
165
|
+
topologyKey: "kubernetes.io/hostname",
|
|
166
|
+
},
|
|
167
|
+
weight: 100,
|
|
168
|
+
},
|
|
169
|
+
],
|
|
170
|
+
},
|
|
171
|
+
},
|
|
101
172
|
},
|
|
102
173
|
},
|
|
103
|
-
resources: {
|
|
104
|
-
requests: { memory: "64Mi" },
|
|
105
|
-
limits: { memory: "96Mi" },
|
|
106
|
-
},
|
|
107
174
|
},
|
|
108
|
-
},
|
|
109
|
-
this.service = new kubernetes.v1.Service(
|
|
110
|
-
metadata
|
|
175
|
+
}, k8sOpts);
|
|
176
|
+
this.service = new kubernetes.v1.Service(name, {
|
|
177
|
+
metadata,
|
|
111
178
|
spec: {
|
|
179
|
+
loadBalancerClass: args.serviceLoadBalancerClass,
|
|
180
|
+
type: args.serviceType || "ClusterIP",
|
|
112
181
|
selector: metadata.labels,
|
|
113
182
|
ports: [
|
|
114
183
|
{ name: "udp", protocol: "UDP", port: 53 },
|
|
115
184
|
{ name: "tcp", protocol: "TCP", port: 53 },
|
|
185
|
+
{ name: "dot", protocol: "TCP", port: 853 },
|
|
116
186
|
],
|
|
117
187
|
},
|
|
118
188
|
hostnames: args.hostname ? [args.hostname] : undefined,
|
|
119
|
-
}, { ...
|
|
189
|
+
}, { ...k8sOpts, dependsOn: [this.deployment] });
|
|
190
|
+
const metricsMetadata = {
|
|
191
|
+
...metadata,
|
|
192
|
+
name: `${name}-metrics`,
|
|
193
|
+
labels: { ...metadata.labels, "app.kubernetes.io/component": "metrics" },
|
|
194
|
+
};
|
|
195
|
+
this.metricService = new k8s.core.v1.Service(`${name}-metrics`, {
|
|
196
|
+
metadata: metricsMetadata,
|
|
197
|
+
spec: {
|
|
198
|
+
selector: metadata.labels,
|
|
199
|
+
ports: [{ name: "http", protocol: "TCP", port: 4000 }],
|
|
200
|
+
},
|
|
201
|
+
}, { ...k8sOpts, dependsOn: [this.deployment] });
|
|
202
|
+
this.serviceMonitor = new prometheus_1.ServiceMonitor(`${name}-metrics`, {
|
|
203
|
+
metadata: metricsMetadata,
|
|
204
|
+
spec: {
|
|
205
|
+
namespaceSelector: { matchNames: [this.namespace] },
|
|
206
|
+
selector: { matchLabels: metricsMetadata.labels },
|
|
207
|
+
endpoints: [{ port: "http", path: "/metrics", interval: "1m", scrapeTimeout: "30s" }],
|
|
208
|
+
},
|
|
209
|
+
}, k8sOpts);
|
|
120
210
|
this.grafanaDashboard = new grafana_1.Dashboard(`${name}-grafana-dashboard`, {
|
|
121
211
|
metadata: { ...metadata, name: pulumi.interpolate `${name}-grafana-dashboard` },
|
|
122
212
|
name: "blocky",
|
|
123
213
|
// eslint-disable-next-line security/detect-non-literal-fs-filename
|
|
124
214
|
data: fs.readFileSync(path.join(__dirname, "assets", "dashboard.json"), "utf-8"),
|
|
125
|
-
},
|
|
215
|
+
}, k8sOpts);
|
|
126
216
|
this.registerOutputs();
|
|
127
217
|
}
|
|
128
218
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/blocky/deployment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AACzC,wDAA0C;AAC1C,uCAAyB;AACzB,2CAA6B;AAC7B,8CAAgC;AAChC,sCAA8C;AAC9C,0DAA4C;AAC5C,wCAAuC;
|
|
1
|
+
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/blocky/deployment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AACzC,wDAA0C;AAC1C,uCAAyB;AACzB,2CAA6B;AAC7B,8CAAgC;AAChC,sCAA8C;AAC9C,0DAA4C;AAC5C,8CAA+C;AAC/C,wCAAuC;AAkBvC,MAAa,MAAO,SAAQ,0BAAiB;IAC1B,MAAM,CAAwB;IAC9B,UAAU,CAAyB;IACnC,OAAO,CAAwB;IAC/B,aAAa,CAAsB;IACnC,cAAc,CAAiB;IAC/B,gBAAgB,CAAY;IAC7B,SAAS,CAAwB;IAEjD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAgB,EAAE,IAAsC;QAChF,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAElC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAExC,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE;YAC/B,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;SACnB;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,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QAEnF,MAAM,QAAQ,GAAG;YACf,IAAI;YACJ,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,MAAM,EAAE;gBACN,wBAAwB,EAAE,QAAQ;gBAClC,4BAA4B,EAAE,IAAI;aACnC;SACF,CAAC;QAEF,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;QAE5E,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CACrC,IAAI,EACJ;YACE,QAAQ;YACR,IAAI,EAAE;gBACJ,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,CACpF,IAAI,CAAC,IAAI,CAAC;oBACR,QAAQ,EAAE,MAAM;oBAChB,SAAS,EAAE,MAAM;oBACjB,UAAU,EAAE,IAAI;oBAChB,IAAI,EAAE,EAAE;oBACR,OAAO,EAAE,GAAG;oBACZ,QAAQ,EAAE,IAAI;oBACd,SAAS,EAAE,IAAI;oBACf,QAAQ,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE;oBACtC,QAAQ,EAAE;wBACR,SAAS,EAAE,UAAU;wBACrB,QAAQ,EAAE,IAAI;wBACd,gBAAgB,EAAE,CAAC;wBACnB,gBAAgB,EAAE,IAAI;wBACtB,eAAe,EAAE,KAAK;wBACtB,oBAAoB,EAAE,KAAK;wBAC3B,qBAAqB,EAAE,CAAC;wBACxB,aAAa,EAAE,IAAI;wBACnB,UAAU,EAAE,UAAU;wBACtB,iBAAiB,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE;qBAC9D;oBACD,OAAO,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;oBAC9B,KAAK,EAAE,KAAK;wBACV,CAAC,CAAC;4BACE,OAAO,EAAE,KAAK,CAAC,OAAO;4BACtB,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,CAAC;4BAC7B,kBAAkB,EAAE,EAAE;4BACtB,kBAAkB,EAAE,IAAI;4BACxB,QAAQ,EAAE,IAAI;yBACf;wBACH,CAAC,CAAC,SAAS;oBACb,UAAU,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE;iBAC/C,CAAC,CACH;aACF;SACF,EACD,OAAO,CACR,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,IAAI,CAAC,QAAQ;gBACvB,QAAQ,EAAE;oBACR,QAAQ,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE;oBACrC,IAAI,EAAE;wBACJ,SAAS,EAAE,cAAc;wBACzB,SAAS,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE;wBACvD,eAAe,EAAE;4BACf,SAAS,EAAE,GAAG;4BACd,UAAU,EAAE,GAAG;4BACf,OAAO,EAAE,GAAG;4BACZ,mBAAmB,EAAE,gBAAgB;4BACrC,kBAAkB,EAAE,CAAC,GAAG,CAAC;yBAC1B;wBACD,UAAU,EAAE;4BACV;gCACE,IAAI,EAAE,QAAQ;gCACd,KAAK,EAAE,qBAAqB;gCAC5B,eAAe,EAAE,QAAQ;gCACzB,eAAe,EAAE,EAAE,sBAAsB,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE;gCACrE,YAAY,EAAE;oCACZ,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,iBAAiB,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE;iCACxF;gCACD,KAAK,EAAE;oCACL,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,EAAE,EAAE;oCACtD,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,EAAE,EAAE;oCACtD,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE;oCACpD,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE;oCACtD,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE;iCACxD;gCACD,SAAS,EAAE;oCACT,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;oCAC5B,MAAM,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;iCAC5B;6BACF;yBACF;wBACD,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,EAAE,CAAC;wBAC/F,QAAQ,EAAE;4BACR,eAAe,EAAE;gCACf,+CAA+C,EAAE;oCAC/C;wCACE,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,4BAA4B;wDACjC,QAAQ,EAAE,IAAI;wDACd,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAAC;qDACxD;iDACF;6CACF;4CACD,WAAW,EAAE,wBAAwB;yCACtC;wCACD,MAAM,EAAE,GAAG;qCACZ;iCACF;6BACF;yBACF;qBACF;iBACF;aACF;SACF,EACD,OAAO,CACR,CAAC;QAEF,IAAI,CAAC,OAAO,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,OAAO,CACtC,IAAI,EACJ;YACE,QAAQ;YACR,IAAI,EAAE;gBACJ,iBAAiB,EAAE,IAAI,CAAC,wBAAwB;gBAChD,IAAI,EAAE,IAAI,CAAC,WAAW,IAAI,WAAW;gBACrC,QAAQ,EAAE,QAAQ,CAAC,MAAM;gBACzB,KAAK,EAAE;oBACL,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE;oBAC1C,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE;oBAC1C,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE;iBAC5C;aACF;YACD,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;SACvD,EACD,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAC7C,CAAC;QAEF,MAAM,eAAe,GAAG;YACtB,GAAG,QAAQ;YACX,IAAI,EAAE,GAAG,IAAI,UAAU;YACvB,MAAM,EAAE,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,6BAA6B,EAAE,SAAS,EAAE;SACzE,CAAC;QAEF,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAC1C,GAAG,IAAI,UAAU,EACjB;YACE,QAAQ,EAAE,eAAe;YACzB,IAAI,EAAE;gBACJ,QAAQ,EAAE,QAAQ,CAAC,MAAM;gBACzB,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;aACvD;SACF,EACD,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAC7C,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,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC;aACtF;SACF,EACD,OAAO,CACR,CAAC;QAEF,IAAI,CAAC,gBAAgB,GAAG,IAAI,mBAAS,CACnC,GAAG,IAAI,oBAAoB,EAC3B;YACE,QAAQ,EAAE,EAAE,GAAG,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,WAAW,CAAA,GAAG,IAAI,oBAAoB,EAAE;YAC9E,IAAI,EAAE,QAAQ;YACd,mEAAmE;YACnE,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,gBAAgB,CAAC,EAAE,OAAO,CAAC;SACjF,EACD,OAAO,CACR,CAAC;QAEF,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;CACF;AA9ND,wBA8NC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../lib/dhcpd/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C,MAAM,WAAW,MAAM;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,SAAS;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC9C,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,KAAM,SAAQ,iBAAiB;IAC1C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAyB;IAEpD;;;;;OAKG;gBACS,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,wBAAwB;CAuIlF"}
|
|
1
|
+
{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../lib/dhcpd/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C,MAAM,WAAW,MAAM;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,SAAS;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC9C,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,KAAM,SAAQ,iBAAiB;IAC1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwB;IAC/C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAyB;IAEpD;;;;;OAKG;gBACS,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,wBAAwB;CAuIlF"}
|
package/lib/dhcpd/deployment.js
CHANGED
|
@@ -28,6 +28,7 @@ const pulumi = __importStar(require("@pulumi/pulumi"));
|
|
|
28
28
|
const k8s = __importStar(require("@pulumi/kubernetes"));
|
|
29
29
|
const common_1 = require("../common");
|
|
30
30
|
class Dhcpd extends common_1.ComponentResource {
|
|
31
|
+
config;
|
|
31
32
|
deployment;
|
|
32
33
|
/**
|
|
33
34
|
* Create a new DHCPd resource.
|
|
@@ -51,7 +52,7 @@ class Dhcpd extends common_1.ComponentResource {
|
|
|
51
52
|
"app.kubernetes.io/instance": name,
|
|
52
53
|
},
|
|
53
54
|
};
|
|
54
|
-
|
|
55
|
+
this.config = new k8s.core.v1.ConfigMap(name, {
|
|
55
56
|
metadata,
|
|
56
57
|
data: {
|
|
57
58
|
"dhcpd.conf": pulumi.all([args.subnets]).apply(([subnets]) => {
|
|
@@ -110,7 +111,7 @@ class Dhcpd extends common_1.ComponentResource {
|
|
|
110
111
|
},
|
|
111
112
|
],
|
|
112
113
|
volumes: [
|
|
113
|
-
{ name: "config", configMap: { name:
|
|
114
|
+
{ name: "config", configMap: { name: this.config.metadata.name } },
|
|
114
115
|
{ name: "data", emptyDir: {} },
|
|
115
116
|
],
|
|
116
117
|
affinity: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/dhcpd/deployment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AACzC,wDAA0C;AAC1C,sCAA8C;AAiB9C,MAAa,KAAM,SAAQ,0BAAiB;IACzB,UAAU,CAAyB;IAEpD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAe,EAAE,IAAsC;QAC/E,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAEjC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE/B,IAAI,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAE/B,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE;YAChC,SAAS,GAAG,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;SACzF;QAED,MAAM,QAAQ,GAAG;YACf,IAAI;YACJ,SAAS;YACT,MAAM,EAAE;gBACN,wBAAwB,EAAE,OAAO;gBACjC,6BAA6B,EAAE,OAAO;gBACtC,4BAA4B,EAAE,IAAI;aACnC;SACF,CAAC;QAEF,MAAM,
|
|
1
|
+
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/dhcpd/deployment.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operator.js","sourceRoot":"","sources":["../../../lib/externalDns/operator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"operator.js","sourceRoot":"","sources":["../../../lib/externalDns/operator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
#!/bin/sh
|
|
1
|
+
#!/bin/sh
|
|
2
2
|
|
|
3
3
|
PACKAGES=$(ls /etc/rpm-opstree-install/)
|
|
4
4
|
INSTALLED_PACKAGES=$(/usr/bin/rpm-ostree status | grep LayeredPackages: | awk '{for (i=2; i<=NF; i++) print $i}')
|
|
5
5
|
|
|
6
|
-
install_packages=""
|
|
7
|
-
|
|
8
6
|
for package in ${PACKAGES}; do
|
|
9
7
|
installed="false"
|
|
10
8
|
|
|
@@ -15,12 +13,8 @@ for package in ${PACKAGES}; do
|
|
|
15
13
|
done
|
|
16
14
|
|
|
17
15
|
if [ "${installed}" = "false" ]; then
|
|
18
|
-
|
|
16
|
+
/usr/bin/rpm-ostree install --apply-live --allow-inactive "${package}"
|
|
19
17
|
fi
|
|
20
18
|
done
|
|
21
19
|
|
|
22
|
-
if [ ! -z "${install_packages}" ]; then
|
|
23
|
-
/usr/bin/rpm-ostree install --apply-live --allow-inactive ${install_packages}
|
|
24
|
-
fi
|
|
25
|
-
|
|
26
20
|
exit 0
|
package/lib/fcos/host.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"host.d.ts","sourceRoot":"","sources":["../../../lib/fcos/host.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAY,UAAU,EAAU,MAAM,UAAU,CAAC;AAExD,MAAM,WAAW,YAAY;IAC3B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC3B;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,QAAS,SAAQ,UAAU;IAC1C;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;CACvD;AAED,qBAAa,IAAK,SAAQ,iBAAiB;IACzC,SAAgB,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,UAAU,CAAA;KAAE,CAAC,CAAC;IACjF,SAAgB,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEtD;;;;;OAKG;gBACS,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,wBAAwB;
|
|
1
|
+
{"version":3,"file":"host.d.ts","sourceRoot":"","sources":["../../../lib/fcos/host.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAY,UAAU,EAAU,MAAM,UAAU,CAAC;AAExD,MAAM,WAAW,YAAY;IAC3B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC3B;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,QAAS,SAAQ,UAAU;IAC1C;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;CACvD;AAED,qBAAa,IAAK,SAAQ,iBAAiB;IACzC,SAAgB,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,UAAU,CAAA;KAAE,CAAC,CAAC;IACjF,SAAgB,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEtD;;;;;OAKG;gBACS,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,wBAAwB;CA2DjF"}
|
package/lib/fcos/host.js
CHANGED
|
@@ -52,7 +52,7 @@ class Host extends common_1.ComponentResource {
|
|
|
52
52
|
modules: pulumi.all([args.modules]).apply(([modules]) => (modules || []).concat("wireguard")),
|
|
53
53
|
packages: pulumi
|
|
54
54
|
.all([args.packages])
|
|
55
|
-
.apply(([packages]) => (packages || []).concat("netcat", "tcpdump", "iperf3", "htop", "golang-gvisor")),
|
|
55
|
+
.apply(([packages]) => (packages || []).concat("netcat", "tcpdump", "iperf3", "htop", "golang-gvisor", "container-selinux")),
|
|
56
56
|
users: pulumi
|
|
57
57
|
.all([args.users, args.sshUsers, this.sshPrivateKeys])
|
|
58
58
|
.apply(([users, sshUsers, sshPrivateKeys]) => {
|
package/lib/fcos/host.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"host.js","sourceRoot":"","sources":["../../../lib/fcos/host.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AACzC,iDAAmC;AACnC,sCAA8C;AAC9C,qCAAwD;AAoBxD,MAAa,IAAK,SAAQ,0BAAiB;IACzB,cAAc,CAAmD;IACjE,cAAc,CAAwB;IAEtD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAc,EAAE,IAAsC;QAC9E,KAAK,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAErC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAE9B,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE;YACrE,MAAM,cAAc,GAAsC,EAAE,CAAC;YAE7D,KAAK,MAAM,OAAO,IAAI,QAAQ,IAAI,EAAE,EAAE;gBACpC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAC/C,GAAG,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE,EACzB,EAAE,SAAS,EAAE,SAAS,EAAE,EACxB,SAAS,CACV,CAAC;aACH;YAED,OAAO,cAAc,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,cAAc,GAAG,IAAI,eAAM,CAC9B,IAAI,EACJ;YACE,GAAG,IAAI;YACP,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAC7F,QAAQ,EAAE,MAAM;iBACb,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBACpB,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"host.js","sourceRoot":"","sources":["../../../lib/fcos/host.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,8 @@ export interface FreeRadiusServerArgs {
|
|
|
12
12
|
hostname: pulumi.Input<string>;
|
|
13
13
|
domain: pulumi.Input<string>;
|
|
14
14
|
ldap: pulumi.Input<LdapArgs>;
|
|
15
|
+
serviceType?: pulumi.Input<string>;
|
|
16
|
+
serviceLoadBalancerClass?: pulumi.Input<string>;
|
|
15
17
|
resources?: pulumi.Input<k8s.types.input.core.v1.ResourceRequirements>;
|
|
16
18
|
protect?: boolean;
|
|
17
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../lib/freeradius/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;AAI9C,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/B,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/B,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,oBAAoB;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACjC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC;IACvE,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,qBAAa,gBAAiB,SAAQ,iBAAiB;IACrD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAwB;IACpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqB;IAC5C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0B;IACxD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqB;IAC9C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA0B;IACtD,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;IACjD,SAAgB,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACpD,SAAgB,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAE1C;;;;;OAKG;gBACS,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,wBAAwB;
|
|
1
|
+
{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../lib/freeradius/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;AAI9C,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/B,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/B,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,oBAAoB;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACjC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAChD,SAAS,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC;IACvE,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,qBAAa,gBAAiB,SAAQ,iBAAiB;IACrD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAwB;IACpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqB;IAC5C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0B;IACxD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqB;IAC9C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA0B;IACtD,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;IACjD,SAAgB,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACpD,SAAgB,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAE1C;;;;;OAKG;gBACS,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,wBAAwB;IAqM5F,OAAO,CAAC,MAAM,CAAC,mBAAmB;CAGnC"}
|
|
@@ -180,6 +180,8 @@ class FreeRadiusServer extends common_1.ComponentResource {
|
|
|
180
180
|
this.service = new kubernetes.v1.Service(name, {
|
|
181
181
|
metadata,
|
|
182
182
|
spec: {
|
|
183
|
+
loadBalancerClass: args.serviceLoadBalancerClass,
|
|
184
|
+
type: args.serviceType || "ClusterIP",
|
|
183
185
|
selector: metadata.labels,
|
|
184
186
|
ports: [
|
|
185
187
|
{ name: "radius", port: 1812, targetPort: "radius", protocol: "UDP" },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/freeradius/deployment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AACzC,uDAAyC;AACzC,wDAA0C;AAC1C,2CAA6B;AAC7B,4DAA8C;AAC9C,sCAA8C;AAC9C,0DAA4C;AAC5C,4DAA8C;
|
|
1
|
+
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/freeradius/deployment.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../../lib/gitlab/project.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C,MAAM,WAAW,WAAY,SAAQ,MAAM,CAAC,WAAW;IACrD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,qBAAa,OAAQ,SAAQ,iBAAiB;IAC5C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;IAEpD;;;;;OAKG;gBACS,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,wBAAwB;
|
|
1
|
+
{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../../lib/gitlab/project.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C,MAAM,WAAW,WAAY,SAAQ,MAAM,CAAC,WAAW;IACrD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,qBAAa,OAAQ,SAAQ,iBAAiB;IAC5C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;IAEpD;;;;;OAKG;gBACS,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,wBAAwB;CAyHpF"}
|
package/lib/gitlab/project.js
CHANGED
|
@@ -92,18 +92,12 @@ class Project extends common_1.ComponentResource {
|
|
|
92
92
|
if (args.onlyAllowMergeIfPipelineSucceeds === undefined) {
|
|
93
93
|
args.onlyAllowMergeIfPipelineSucceeds = true;
|
|
94
94
|
}
|
|
95
|
-
if (args.operationsAccessLevel === undefined) {
|
|
96
|
-
args.operationsAccessLevel = "disabled";
|
|
97
|
-
}
|
|
98
95
|
if (args.packagesEnabled === undefined) {
|
|
99
96
|
args.packagesEnabled = false;
|
|
100
97
|
}
|
|
101
98
|
if (args.pagesAccessLevel === undefined) {
|
|
102
99
|
args.pagesAccessLevel = "disabled";
|
|
103
100
|
}
|
|
104
|
-
if (args.pipelinesEnabled === undefined) {
|
|
105
|
-
args.pipelinesEnabled = true;
|
|
106
|
-
}
|
|
107
101
|
if (args.printingMergeRequestLinkEnabled === undefined) {
|
|
108
102
|
args.printingMergeRequestLinkEnabled = true;
|
|
109
103
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../../lib/gitlab/project.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAyC;AACzC,uDAAyC;AACzC,sCAA8C;AAM9C,MAAa,OAAQ,SAAQ,0BAAiB;IAC3B,OAAO,CAAiB;IACxB,aAAa,CAAsB;IAEpD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAiB,EAAE,IAAsC;QACjF,KAAK,CAAC,gBAAgB,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAE1C,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAElC,IAAI,IAAI,CAAC,0BAA0B,KAAK,SAAS,EAAE;YACjD,IAAI,CAAC,0BAA0B,GAAG,SAAS,CAAC;SAC7C;QAED,IAAI,IAAI,CAAC,iBAAiB,KAAK,SAAS,EAAE;YACxC,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;SAChC;QAED,IAAI,IAAI,CAAC,yBAAyB,KAAK,SAAS,EAAE;YAChD,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC;SACvC;QAED,IAAI,IAAI,CAAC,iBAAiB,KAAK,SAAS,EAAE;YACxC,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC;SACpC;QAED,IAAI,IAAI,CAAC,wBAAwB,KAAK,SAAS,EAAE;YAC/C,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC;SACtC;QAED,IAAI,CAAC,yBAAyB,GAAG,MAAM;aACpC,GAAG,CAAC,CAAC,IAAI,CAAC,wBAAwB,EAAE,IAAI,CAAC,yBAAyB,CAAC,CAAC;aACpE,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,EAAE;YAC3B,IAAI,OAAO,IAAI,MAAM,KAAK,SAAS,EAAE;gBACnC,OAAO;oBACL,OAAO,EAAE,IAAI;oBACb,OAAO,EAAE,IAAI;oBACb,SAAS,EAAE,KAAK;oBAChB,KAAK,EAAE,EAAE;oBACT,eAAe,EAAE,IAAI;oBACrB,aAAa,EAAE,iBAAiB;iBACjC,CAAC;aACH;iBAAM;gBACL,OAAO,EAAE,CAAC;aACX;QACH,CAAC,CAAC,CAAC;QAEL,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE;YACpC,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC;SAC7B;QAED,IAAI,IAAI,CAAC,oBAAoB,KAAK,SAAS,EAAE;YAC3C,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC;SACnC;QAED,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE;YACpC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;SAC3B;QAED,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE;YACjC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;SACzB;QAED,IAAI,IAAI,CAAC,oBAAoB,KAAK,SAAS,EAAE;YAC3C,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;SAClC;QAED,IAAI,IAAI,CAAC,yCAAyC,KAAK,SAAS,EAAE;YAChE,IAAI,CAAC,yCAAyC,GAAG,IAAI,CAAC;SACvD;QAED,IAAI,IAAI,CAAC,gCAAgC,KAAK,SAAS,EAAE;YACvD,IAAI,CAAC,gCAAgC,GAAG,IAAI,CAAC;SAC9C;QAED,IAAI,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../../lib/gitlab/project.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,17 @@
|
|
|
1
1
|
#!/bin/sh -e
|
|
2
2
|
|
|
3
|
-
COREOS_INSTALLER_VERSION="0.
|
|
3
|
+
COREOS_INSTALLER_VERSION="0.17.0"
|
|
4
|
+
COREOS_INSTALLER_BASE_URL="https://static-9236c836e774.s3.eu-central-1.amazonaws.com/fcos"
|
|
4
5
|
|
|
5
6
|
DRIVE="${1}"
|
|
6
7
|
CONFIG="${2}"
|
|
7
8
|
|
|
8
|
-
curl -sf -o /tmp/coreos-installer "
|
|
9
|
+
curl -sf -o /tmp/coreos-installer "${COREOS_INSTALLER_BASE_URL}/v${COREOS_INSTALLER_VERSION}/$(arch)/coreos-installer"
|
|
9
10
|
chmod +x /tmp/coreos-installer
|
|
10
11
|
|
|
11
12
|
cat <<EOF >/etc/apt/sources.list
|
|
12
|
-
deb http://mirror.hetzner.com/debian/packages
|
|
13
|
-
deb http://mirror.hetzner.com/debian/packages
|
|
14
|
-
deb http://mirror.hetzner.com/debian/packages bookworm-backports main contrib non-free
|
|
15
|
-
deb http://mirror.hetzner.com/debian/security bookworm-security main contrib non-free
|
|
13
|
+
deb http://mirror.hetzner.com/debian/packages testing main contrib non-free
|
|
14
|
+
deb http://mirror.hetzner.com/debian/packages testing-updates main contrib non-free
|
|
16
15
|
EOF
|
|
17
16
|
|
|
18
17
|
export DEBIAN_FRONTEND=noninteractive
|