@ydkn/pulumi-components 0.8.4 → 0.8.6
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 +4 -4
- package/index.js +4 -4
- package/index.js.map +1 -1
- package/lib/alpine/deployment.js +5 -9
- package/lib/alpine/deployment.js.map +1 -1
- package/lib/avahi/deployment.js +2 -2
- package/lib/avahi/service.d.ts +1 -0
- package/lib/avahi/service.js +6 -7
- package/lib/avahi/service.js.map +1 -1
- package/lib/blocky/deployment.js +3 -5
- package/lib/blocky/deployment.js.map +1 -1
- package/lib/certManager/certificate.js +5 -15
- package/lib/certManager/certificate.js.map +1 -1
- package/lib/certManager/index.d.ts +2 -2
- package/lib/certManager/index.js.map +1 -1
- package/lib/certManager/issuer.d.ts +8 -0
- package/lib/certManager/issuer.js.map +1 -1
- package/lib/certManager/operator.d.ts +13 -3
- package/lib/certManager/operator.js +104 -42
- package/lib/certManager/operator.js.map +1 -1
- package/lib/common/componentResource.js +1 -3
- package/lib/common/componentResource.js.map +1 -1
- package/lib/externalDns/operator.d.ts +4 -0
- package/lib/externalDns/operator.js +51 -18
- package/lib/externalDns/operator.js.map +1 -1
- package/lib/freeradius/deployment.js +4 -3
- package/lib/freeradius/deployment.js.map +1 -1
- package/lib/gitlab/project.js +21 -63
- package/lib/gitlab/project.js.map +1 -1
- package/lib/gitlab/renovate.js +2 -6
- package/lib/gitlab/renovate.js.map +1 -1
- package/lib/grafana/alloy.js +9 -15
- package/lib/grafana/alloy.js.map +1 -1
- package/lib/grafana/deployment.js +3 -5
- package/lib/grafana/deployment.js.map +1 -1
- package/lib/hcloud/cluster.js +9 -27
- package/lib/hcloud/cluster.js.map +1 -1
- package/lib/hostPathProvisioner/deployment.d.ts +4 -0
- package/lib/hostPathProvisioner/deployment.js +39 -40
- package/lib/hostPathProvisioner/deployment.js.map +1 -1
- package/lib/{versitygw → jellyfin}/deployment.d.ts +20 -23
- package/lib/jellyfin/deployment.js +203 -0
- package/lib/jellyfin/deployment.js.map +1 -0
- package/lib/jellyfin/index.d.ts +2 -0
- package/lib/jellyfin/index.js +3 -0
- package/lib/jellyfin/index.js.map +1 -0
- package/lib/k0s/cluster.js +7 -21
- package/lib/k0s/cluster.js.map +1 -1
- package/lib/kubeStateMetrics/deployment.js +2 -6
- package/lib/kubeStateMetrics/deployment.js.map +1 -1
- package/lib/kubernetes/crashedCleanup.js +1 -3
- package/lib/kubernetes/crashedCleanup.js.map +1 -1
- package/lib/kubernetes/v1/secureIngress.js +2 -6
- package/lib/kubernetes/v1/secureIngress.js.map +1 -1
- package/lib/localPathProvisioner/deployment.js +1 -3
- package/lib/localPathProvisioner/deployment.js.map +1 -1
- package/lib/loki/deployment.js +2 -6
- package/lib/loki/deployment.js.map +1 -1
- package/lib/mastodon/deployment.d.ts +74 -0
- package/lib/mastodon/deployment.js +358 -0
- package/lib/mastodon/deployment.js.map +1 -0
- package/lib/mastodon/index.d.ts +2 -0
- package/lib/mastodon/index.js +3 -0
- package/lib/mastodon/index.js.map +1 -0
- package/lib/mongodb/cluster.js +7 -15
- package/lib/mongodb/cluster.js.map +1 -1
- package/lib/nats/cluster.js +4 -6
- package/lib/nats/cluster.js.map +1 -1
- package/lib/nats/stream.js +2 -6
- package/lib/nats/stream.js.map +1 -1
- package/lib/netbird/management.js +10 -14
- package/lib/netbird/management.js.map +1 -1
- package/lib/nginx/deployment.d.ts +30 -0
- package/lib/nginx/deployment.js +167 -0
- package/lib/nginx/deployment.js.map +1 -0
- package/lib/nginx/index.d.ts +2 -0
- package/lib/nginx/index.js +3 -0
- package/lib/nginx/index.js.map +1 -0
- package/lib/nodeExporter/deployment.js +1 -3
- package/lib/nodeExporter/deployment.js.map +1 -1
- package/lib/nodeLocalDns/deployment.js +1 -3
- package/lib/nodeLocalDns/deployment.js.map +1 -1
- package/lib/plex/mediaServer.d.ts +1 -1
- package/lib/plex/mediaServer.js +16 -9
- package/lib/plex/mediaServer.js.map +1 -1
- package/lib/postgresql/cluster.d.ts +2 -0
- package/lib/postgresql/cluster.js +7 -3
- package/lib/postgresql/cluster.js.map +1 -1
- package/lib/prometheus/operator.js +4 -8
- package/lib/prometheus/operator.js.map +1 -1
- package/lib/proxy/deployment.js +3 -5
- package/lib/proxy/deployment.js.map +1 -1
- package/lib/raspberrypi/cluster.js +8 -24
- package/lib/raspberrypi/cluster.js.map +1 -1
- package/lib/redis/standalone.d.ts +1 -0
- package/lib/redis/standalone.js +11 -11
- package/lib/redis/standalone.js.map +1 -1
- package/lib/rook/cluster.js +1 -3
- package/lib/rook/cluster.js.map +1 -1
- package/lib/rook/operator.js +1 -3
- package/lib/rook/operator.js.map +1 -1
- package/lib/samba/dc.js +5 -11
- package/lib/samba/dc.js.map +1 -1
- package/lib/samba/deployment.js +2 -6
- package/lib/samba/deployment.js.map +1 -1
- package/lib/torproxy/deployment.js +1 -3
- package/lib/torproxy/deployment.js.map +1 -1
- package/lib/traefik/controller.js +6 -14
- package/lib/traefik/controller.js.map +1 -1
- package/lib/traefik/middleware.d.ts +5 -0
- package/lib/traefik/middleware.js.map +1 -1
- package/lib/transmission/deployment.d.ts +5 -1
- package/lib/transmission/deployment.js +27 -5
- package/lib/transmission/deployment.js.map +1 -1
- package/lib/ubuntu/deployment.js +5 -9
- package/lib/ubuntu/deployment.js.map +1 -1
- package/lib/unifi/networkServer.js +4 -6
- package/lib/unifi/networkServer.js.map +1 -1
- package/lib/velero/operator.d.ts +8 -0
- package/lib/velero/operator.js +46 -18
- package/lib/velero/operator.js.map +1 -1
- package/lib/zitadel/deployment.js +3 -5
- package/lib/zitadel/deployment.js.map +1 -1
- package/package.json +18 -22
- package/lib/lldap/deployment.d.ts +0 -40
- package/lib/lldap/deployment.js +0 -207
- package/lib/lldap/deployment.js.map +0 -1
- package/lib/lldap/index.d.ts +0 -2
- package/lib/lldap/index.js +0 -3
- package/lib/lldap/index.js.map +0 -1
- package/lib/minio/index.d.ts +0 -3
- package/lib/minio/index.js +0 -4
- package/lib/minio/index.js.map +0 -1
- package/lib/minio/operator.d.ts +0 -18
- package/lib/minio/operator.js +0 -50
- package/lib/minio/operator.js.map +0 -1
- package/lib/minio/tenant.d.ts +0 -70
- package/lib/minio/tenant.js +0 -194
- package/lib/minio/tenant.js.map +0 -1
- package/lib/versitygw/deployment.js +0 -260
- package/lib/versitygw/deployment.js.map +0 -1
- package/lib/versitygw/index.d.ts +0 -2
- package/lib/versitygw/index.js +0 -3
- package/lib/versitygw/index.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operator.js","sourceRoot":"","sources":["../../../lib/certManager/operator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"operator.js","sourceRoot":"","sources":["../../../lib/certManager/operator.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,9 +16,7 @@ export class ComponentResource extends pulumi.ComponentResource {
|
|
|
16
16
|
*/
|
|
17
17
|
constructor(type, name, args, opts, remote) {
|
|
18
18
|
super(type, name, args, opts, remote);
|
|
19
|
-
|
|
20
|
-
opts = {};
|
|
21
|
-
}
|
|
19
|
+
opts ??= {};
|
|
22
20
|
this._opts = { ...opts, parent: this };
|
|
23
21
|
}
|
|
24
22
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"componentResource.js","sourceRoot":"","sources":["../../../lib/common/componentResource.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAEzC,MAAM,OAAO,iBAAkB,SAAQ,MAAM,CAAC,iBAAiB;IAC5C,KAAK,CAAkC;IAExD;;;;;;;;;;;;OAYG;IACH,YACE,IAAY,EACZ,IAAY,EACZ,IAAoB,EACpB,IAAsC,EACtC,MAAgB;QAEhB,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAEtC,IAAI,
|
|
1
|
+
{"version":3,"file":"componentResource.js","sourceRoot":"","sources":["../../../lib/common/componentResource.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAEzC,MAAM,OAAO,iBAAkB,SAAQ,MAAM,CAAC,iBAAiB;IAC5C,KAAK,CAAkC;IAExD;;;;;;;;;;;;OAYG;IACH,YACE,IAAY,EACZ,IAAY,EACZ,IAAoB,EACpB,IAAsC,EACtC,MAAgB;QAEhB,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAEtC,IAAI,KAAK,EAAE,CAAC;QAEZ,IAAI,CAAC,KAAK,GAAG,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACzC,CAAC;IAED,8DAA8D;IAC9D,IAAI,CAAC,QAAc,EAAE,IAAsC;QACzD,OAAO,iBAAiB,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC;IACtE,CAAC;IAED,8DAA8D;IAC9D,MAAM,CAAC,IAAI,CAAC,IAAsC,EAAE,QAAc;QAChE,IAAI,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC;QAEnB,OAAO,IAAI,CAAC,QAAQ,CAAC;QACrB,OAAO,IAAI,CAAC,SAAS,CAAC;QAEtB,MAAM,SAAS,GAA8B,EAAE,CAAC;QAEhD,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAChC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAChC,CAAC;QAED,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACjC,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAuD,CAAC;YAEtF,IAAI,gBAAgB,IAAI,IAAI,EAAE,CAAC;gBAC7B,KAAK,MAAM,CAAC,IAAI,gBAAgB,EAAE,CAAC;oBACjC,4DAA4D;oBAC5D,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;gBACtC,CAAC;YACH,CAAC;YAED,MAAM,aAAa,GAAG,IAAI,CAAC,SAAsC,CAAC;YAElE,IAAI,aAAa,IAAI,IAAI,EAAE,CAAC;gBAC1B,KAAK,MAAM,CAAC,IAAI,aAAa,EAAE,CAAC;oBAC9B,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACpB,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE,CAAC;gBAC1B,IAAI,CAAC,YAAY,QAAQ,EAAE,CAAC;oBAC1B,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;oBAElB,MAAM;gBACR,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
|
|
@@ -4,11 +4,15 @@ export interface CloudflareArgs {
|
|
|
4
4
|
apiToken: pulumi.Input<string>;
|
|
5
5
|
proxied?: pulumi.Input<boolean>;
|
|
6
6
|
}
|
|
7
|
+
export interface HetznerArgs {
|
|
8
|
+
apiToken: pulumi.Input<string>;
|
|
9
|
+
}
|
|
7
10
|
export interface ExternalDnsArgs {
|
|
8
11
|
namespace?: pulumi.Input<string>;
|
|
9
12
|
clusterName: pulumi.Input<string>;
|
|
10
13
|
replicas?: pulumi.Input<number>;
|
|
11
14
|
cloudflare?: pulumi.Input<CloudflareArgs>;
|
|
15
|
+
hetzner?: pulumi.Input<HetznerArgs>;
|
|
12
16
|
}
|
|
13
17
|
export declare class ExternalDns extends ComponentResource {
|
|
14
18
|
private static crdBranch;
|
|
@@ -17,9 +17,7 @@ export class ExternalDns extends ComponentResource {
|
|
|
17
17
|
constructor(name, args, opts) {
|
|
18
18
|
super("external-dns", name, args, opts);
|
|
19
19
|
opts = this.opts(k8s.Provider);
|
|
20
|
-
|
|
21
|
-
args.replicas = 1;
|
|
22
|
-
}
|
|
20
|
+
args.replicas ??= 1;
|
|
23
21
|
this.crd = new k8s.yaml.ConfigFile(name, {
|
|
24
22
|
file: [
|
|
25
23
|
"https://raw.githubusercontent.com/kubernetes-sigs/external-dns",
|
|
@@ -54,7 +52,10 @@ export class ExternalDns extends ComponentResource {
|
|
|
54
52
|
triggerLoopOnEvent: true,
|
|
55
53
|
extraArgs: ["--publish-internal-services", "--publish-host-ip"],
|
|
56
54
|
env: [],
|
|
57
|
-
provider:
|
|
55
|
+
provider: {
|
|
56
|
+
name: undefined,
|
|
57
|
+
webhook: undefined,
|
|
58
|
+
},
|
|
58
59
|
service: { ipFamilyPolicy: "PreferDualStack" },
|
|
59
60
|
serviceMonitor: { enabled: true },
|
|
60
61
|
affinity: {
|
|
@@ -76,39 +77,71 @@ export class ExternalDns extends ComponentResource {
|
|
|
76
77
|
},
|
|
77
78
|
},
|
|
78
79
|
resources: {
|
|
79
|
-
requests: { memory: "
|
|
80
|
-
limits: { memory: "
|
|
80
|
+
requests: { memory: "48Mi" },
|
|
81
|
+
limits: { memory: "64Mi" },
|
|
81
82
|
},
|
|
82
83
|
};
|
|
83
84
|
if (args.cloudflare !== undefined) {
|
|
84
|
-
this.providerSecret = new kubernetes.v1.Secret(name
|
|
85
|
+
this.providerSecret = new kubernetes.v1.Secret(`${name}-cloudflare`, {
|
|
85
86
|
metadata: { namespace: this.namespace, name: pulumi.interpolate `${name}-cloudflare` },
|
|
86
87
|
stringData: {
|
|
87
88
|
cloudflare_api_token: pulumi.all([args.cloudflare]).apply(([cloudflare]) => cloudflare.apiToken),
|
|
88
89
|
},
|
|
89
90
|
}, opts);
|
|
90
|
-
helmValues.provider = "cloudflare";
|
|
91
|
+
helmValues.provider.name = "cloudflare";
|
|
91
92
|
helmValues.extraArgs = pulumi.all([helmValues.extraArgs, args.cloudflare]).apply(([extraArgs, cloudflare]) => {
|
|
93
|
+
extraArgs.push("--cloudflare-dns-records-per-page=5000");
|
|
92
94
|
if (cloudflare.proxied) {
|
|
93
95
|
extraArgs.push("--cloudflare-proxied");
|
|
94
96
|
}
|
|
95
97
|
return extraArgs;
|
|
96
98
|
});
|
|
97
99
|
helmValues.env = pulumi.all([helmValues.env, this.providerSecret.metadata.name]).apply(([env, secretName]) => {
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
key: "cloudflare_api_token",
|
|
105
|
-
},
|
|
100
|
+
env.push({
|
|
101
|
+
name: "CF_API_TOKEN",
|
|
102
|
+
valueFrom: {
|
|
103
|
+
secretKeyRef: {
|
|
104
|
+
name: secretName,
|
|
105
|
+
key: "cloudflare_api_token",
|
|
106
106
|
},
|
|
107
|
-
}
|
|
108
|
-
}
|
|
107
|
+
},
|
|
108
|
+
});
|
|
109
109
|
return env;
|
|
110
110
|
});
|
|
111
111
|
}
|
|
112
|
+
else if (args.hetzner !== undefined) {
|
|
113
|
+
this.providerSecret = new kubernetes.v1.Secret(`${name}-hetzner`, {
|
|
114
|
+
metadata: { namespace: this.namespace, name: pulumi.interpolate `${name}-hetzner` },
|
|
115
|
+
stringData: {
|
|
116
|
+
api_token: pulumi.all([args.hetzner]).apply(([hetzner]) => hetzner.apiToken),
|
|
117
|
+
},
|
|
118
|
+
}, opts);
|
|
119
|
+
helmValues.provider.name = "webhook";
|
|
120
|
+
helmValues.provider.webhook = {
|
|
121
|
+
image: { repository: "ghcr.io/mconfalonieri/external-dns-hetzner-webhook", tag: "latest" },
|
|
122
|
+
env: [
|
|
123
|
+
{
|
|
124
|
+
name: "HETZNER_API_KEY",
|
|
125
|
+
valueFrom: { secretKeyRef: { name: this.providerSecret.metadata.name, key: "api_token" } },
|
|
126
|
+
},
|
|
127
|
+
{ name: "DEFAULT_TTL", value: "3600" },
|
|
128
|
+
],
|
|
129
|
+
resources: {
|
|
130
|
+
requests: { memory: "24Mi" },
|
|
131
|
+
limits: { memory: "32Mi" },
|
|
132
|
+
},
|
|
133
|
+
livenessProbe: {
|
|
134
|
+
httpGet: { path: "/health", port: "http-webhook" },
|
|
135
|
+
initialDelaySeconds: 10,
|
|
136
|
+
timeoutSeconds: 5,
|
|
137
|
+
},
|
|
138
|
+
readinessProbe: {
|
|
139
|
+
httpGet: { path: "/ready", port: "http-webhook" },
|
|
140
|
+
initialDelaySeconds: 10,
|
|
141
|
+
timeoutSeconds: 5,
|
|
142
|
+
},
|
|
143
|
+
};
|
|
144
|
+
}
|
|
112
145
|
this.helmRelease = new kubernetes.helm.v3.Release(name, {
|
|
113
146
|
name,
|
|
114
147
|
namespace: this.namespace,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operator.js","sourceRoot":"","sources":["../../../lib/externalDns/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;
|
|
1
|
+
{"version":3,"file":"operator.js","sourceRoot":"","sources":["../../../lib/externalDns/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;AAmBrD,MAAM,OAAO,WAAY,SAAQ,iBAAiB;IACxC,MAAM,CAAC,SAAS,GAAG,QAAQ,CAAC;IAEnB,GAAG,CAAsB;IACzB,cAAc,CAAsB;IACpC,WAAW,CAA6B;IACzC,SAAS,CAAwB;IAEjD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAqB,EAAE,IAAsC;QACrF,KAAK,CAAC,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAExC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE/B,IAAI,CAAC,QAAQ,KAAK,CAAC,CAAC;QAEpB,IAAI,CAAC,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,CAChC,IAAI,EACJ;YACE,IAAI,EAAE;gBACJ,gEAAgE;gBAChE,WAAW,CAAC,SAAS;gBACrB,oCAAoC;aACrC,CAAC,IAAI,CAAC,GAAG,CAAC;YACX,eAAe,EAAE;gBACf,8DAA8D;gBAC9D,CAAC,CAAM,EAAE,EAAE;oBACT,+DAA+D;oBAC/D,IAAI,CAAC,CAAC,QAAQ,KAAK,SAAS,IAAI,CAAC,CAAC,QAAQ,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;wBACrE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,4BAA4B,CAAC;4BAClD,2DAA2D,CAAC;oBAChE,CAAC;oBAED,OAAO,CAAC,CAAC,CAAC,0DAA0D;gBACtE,CAAC;aACF;SACF,EACD,IAAI,CACL,CAAC;QAEF,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,UAAU,GAAG;YACjB,gBAAgB,EAAE,IAAI;YACtB,QAAQ,EAAE,MAAM;YAChB,SAAS,EAAE,MAAM;YACjB,MAAM,EAAE,MAAM;YACd,QAAQ,EAAE,KAAK;YACf,UAAU,EAAE,IAAI,CAAC,WAAW;YAC5B,SAAS,EAAE,gBAAgB;YAC3B,OAAO,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,CAAC;YACtC,QAAQ,EAAE,IAAI;YACd,kBAAkB,EAAE,IAAI;YACxB,SAAS,EAAE,CAAC,6BAA6B,EAAE,mBAAmB,CAAyC;YACvG,GAAG,EAAE,EAAkE;YACvE,QAAQ,EAAE;gBACR,IAAI,EAAE,SAA+B;gBACrC,OAAO,EAAE,SAQI;aACd;YACD,OAAO,EAAE,EAAE,cAAc,EAAE,iBAAiB,EAAE;YAC9C,cAAc,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;YACjC,QAAQ,EAAE;gBACR,eAAe,EAAE;oBACf,+CAA+C,EAAE;wBAC/C;4BACE,MAAM,EAAE,GAAG;4BACX,eAAe,EAAE;gCACf,aAAa,EAAE;oCACb,gBAAgB,EAAE;wCAChB,EAAE,GAAG,EAAE,wBAAwB,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,cAAc,CAAC,EAAE;wCAC3E,EAAE,GAAG,EAAE,4BAA4B,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;qCACtE;iCACF;gCACD,WAAW,EAAE,wBAAwB;6BACtC;yBACF;qBACF;iBACF;aACF;YACD,SAAS,EAAE;gBACT,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;gBAC5B,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;aAC3B;SACF,CAAC;QAEF,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YAClC,IAAI,CAAC,cAAc,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,MAAM,CAC5C,GAAG,IAAI,aAAa,EACpB;gBACE,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,WAAW,CAAA,GAAG,IAAI,aAAa,EAAE;gBACrF,UAAU,EAAE;oBACV,oBAAoB,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC;iBACjG;aACF,EACD,IAAI,CACL,CAAC;YAEF,UAAU,CAAC,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAC;YAExC,UAAU,CAAC,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE,EAAE;gBAC3G,SAAS,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAC;gBAEzD,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;oBACvB,SAAS,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;gBACzC,CAAC;gBAED,OAAO,SAAS,CAAC;YACnB,CAAC,CAAC,CAAC;YAEH,UAAU,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE,EAAE;gBAC3G,GAAG,CAAC,IAAI,CAAC;oBACP,IAAI,EAAE,cAAc;oBACpB,SAAS,EAAE;wBACT,YAAY,EAAE;4BACZ,IAAI,EAAE,UAAU;4BAChB,GAAG,EAAE,sBAAsB;yBAC5B;qBACF;iBACF,CAAC,CAAC;gBAEH,OAAO,GAAG,CAAC;YACb,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YACtC,IAAI,CAAC,cAAc,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,MAAM,CAC5C,GAAG,IAAI,UAAU,EACjB;gBACE,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,CAAC,WAAW,CAAA,GAAG,IAAI,UAAU,EAAE;gBAClF,UAAU,EAAE;oBACV,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC;iBAC7E;aACF,EACD,IAAI,CACL,CAAC;YAEF,UAAU,CAAC,QAAQ,CAAC,IAAI,GAAG,SAAS,CAAC;YACrC,UAAU,CAAC,QAAQ,CAAC,OAAO,GAAG;gBAC5B,KAAK,EAAE,EAAE,UAAU,EAAE,oDAAoD,EAAE,GAAG,EAAE,QAAQ,EAAE;gBAC1F,GAAG,EAAE;oBACH;wBACE,IAAI,EAAE,iBAAiB;wBACvB,SAAS,EAAE,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,EAAE;qBAC3F;oBACD,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE;iBACvC;gBACD,SAAS,EAAE;oBACT,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;oBAC5B,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;iBAC3B;gBACD,aAAa,EAAE;oBACb,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE;oBAClD,mBAAmB,EAAE,EAAE;oBACvB,cAAc,EAAE,CAAC;iBAClB;gBACD,cAAc,EAAE;oBACd,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,cAAc,EAAE;oBACjD,mBAAmB,EAAE,EAAE;oBACvB,cAAc,EAAE,CAAC;iBAClB;aACF,CAAC;QACJ,CAAC;QAED,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,gDAAgD,EAAE;YAC1E,KAAK,EAAE,cAAc;YACrB,MAAM,EAAE,UAAU;SACnB,EACD,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC"}
|
|
@@ -29,9 +29,10 @@ export class FreeRadiusServer extends ComponentResource {
|
|
|
29
29
|
*/
|
|
30
30
|
constructor(name, args, opts) {
|
|
31
31
|
super("freeradius", name, args, opts);
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
32
|
+
args.resources ??= {
|
|
33
|
+
requests: { memory: "64Mi" },
|
|
34
|
+
limits: { memory: "128Mi" },
|
|
35
|
+
};
|
|
35
36
|
const emptyOpts = this.opts();
|
|
36
37
|
const k8sOpts = this.opts(k8s.Provider);
|
|
37
38
|
this.namespace = args.namespace
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/freeradius/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAC1C,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,QAAQ,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;AAqBvD,MAAM,OAAO,gBAAiB,SAAQ,iBAAiB;IACpC,WAAW,CAAwB;IACnC,OAAO,CAAuB;IAC9B,MAAM,CAAqB;IAC3B,aAAa,CAA0B;IACvC,QAAQ,CAAqB;IAC7B,WAAW,CAA0B;IACrC,UAAU,CAAyB;IACnC,mBAAmB,CAAoC;IACvD,OAAO,CAAwB;IAChC,SAAS,CAAwB;IACjC,YAAY,CAAwB;IACpC,EAAE,CAAwB;IAE1C;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAA0B,EAAE,IAAsC;QAC1F,KAAK,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAEtC,IAAI,
|
|
1
|
+
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/freeradius/deployment.ts"],"names":[],"mappings":"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"}
|
package/lib/gitlab/project.js
CHANGED
|
@@ -13,21 +13,11 @@ export class Project extends ComponentResource {
|
|
|
13
13
|
constructor(name, args, opts) {
|
|
14
14
|
super("gitlab:project", name, args, opts);
|
|
15
15
|
opts = this.opts(gitlab.Provider);
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
}
|
|
22
|
-
if (args.autocloseReferencedIssues === undefined) {
|
|
23
|
-
args.autocloseReferencedIssues = true;
|
|
24
|
-
}
|
|
25
|
-
if (args.buildsAccessLevel === undefined) {
|
|
26
|
-
args.buildsAccessLevel = "private";
|
|
27
|
-
}
|
|
28
|
-
if (args.containerRegistryAccessLevel === undefined) {
|
|
29
|
-
args.containerRegistryAccessLevel = "private";
|
|
30
|
-
}
|
|
16
|
+
args.autoCancelPendingPipelines ??= "enabled";
|
|
17
|
+
args.autoDevopsEnabled ??= false;
|
|
18
|
+
args.autocloseReferencedIssues ??= true;
|
|
19
|
+
args.buildsAccessLevel ??= "private";
|
|
20
|
+
args.containerRegistryAccessLevel ??= "private";
|
|
31
21
|
args.containerExpirationPolicy = pulumi
|
|
32
22
|
.all([args.containerRegistryAccessLevel, args.containerExpirationPolicy])
|
|
33
23
|
.apply(([accessLevel, policy]) => {
|
|
@@ -46,54 +36,22 @@ export class Project extends ComponentResource {
|
|
|
46
36
|
nameRegexKeep: "^(v\\d(\\.\\d)+|latest)$",
|
|
47
37
|
};
|
|
48
38
|
});
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
args.onlyAllowMergeIfAllDiscussionsAreResolved = true;
|
|
66
|
-
}
|
|
67
|
-
if (args.onlyAllowMergeIfPipelineSucceeds === undefined) {
|
|
68
|
-
args.onlyAllowMergeIfPipelineSucceeds = true;
|
|
69
|
-
}
|
|
70
|
-
if (args.packagesEnabled === undefined) {
|
|
71
|
-
args.packagesEnabled = false;
|
|
72
|
-
}
|
|
73
|
-
if (args.pagesAccessLevel === undefined) {
|
|
74
|
-
args.pagesAccessLevel = "disabled";
|
|
75
|
-
}
|
|
76
|
-
if (args.printingMergeRequestLinkEnabled === undefined) {
|
|
77
|
-
args.printingMergeRequestLinkEnabled = true;
|
|
78
|
-
}
|
|
79
|
-
if (args.removeSourceBranchAfterMerge === undefined) {
|
|
80
|
-
args.removeSourceBranchAfterMerge = true;
|
|
81
|
-
}
|
|
82
|
-
if (args.sharedRunnersEnabled === undefined) {
|
|
83
|
-
args.sharedRunnersEnabled = true;
|
|
84
|
-
}
|
|
85
|
-
if (args.snippetsEnabled === undefined) {
|
|
86
|
-
args.snippetsEnabled = false;
|
|
87
|
-
}
|
|
88
|
-
if (args.squashOption === undefined) {
|
|
89
|
-
args.squashOption = "default_on";
|
|
90
|
-
}
|
|
91
|
-
if (args.visibilityLevel === undefined) {
|
|
92
|
-
args.visibilityLevel = "private";
|
|
93
|
-
}
|
|
94
|
-
if (args.wikiEnabled === undefined) {
|
|
95
|
-
args.wikiEnabled = false;
|
|
96
|
-
}
|
|
39
|
+
args.defaultBranch ??= "main";
|
|
40
|
+
args.initializeWithReadme ??= false;
|
|
41
|
+
args.issuesEnabled ??= true;
|
|
42
|
+
args.lfsEnabled ??= false;
|
|
43
|
+
args.mergeRequestsEnabled ??= true;
|
|
44
|
+
args.onlyAllowMergeIfAllDiscussionsAreResolved ??= true;
|
|
45
|
+
args.onlyAllowMergeIfPipelineSucceeds ??= true;
|
|
46
|
+
args.packagesEnabled ??= false;
|
|
47
|
+
args.pagesAccessLevel ??= "disabled";
|
|
48
|
+
args.printingMergeRequestLinkEnabled ??= true;
|
|
49
|
+
args.removeSourceBranchAfterMerge ??= true;
|
|
50
|
+
args.sharedRunnersEnabled ??= true;
|
|
51
|
+
args.snippetsEnabled ??= false;
|
|
52
|
+
args.squashOption ??= "default_on";
|
|
53
|
+
args.visibilityLevel ??= "private";
|
|
54
|
+
args.wikiEnabled ??= false;
|
|
97
55
|
this.project = new gitlab.Project(name, args, { ...opts, protect: args.protect });
|
|
98
56
|
this.pipelineBadge = new gitlab.ProjectBadge(`${name}-pipeline-badge`, {
|
|
99
57
|
project: this.project.id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.js","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,oBAAoB,CAAC;AAMvD,MAAM,OAAO,OAAQ,SAAQ,iBAAiB;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,
|
|
1
|
+
{"version":3,"file":"project.js","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,oBAAoB,CAAC;AAMvD,MAAM,OAAO,OAAQ,SAAQ,iBAAiB;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,CAAC,0BAA0B,KAAK,SAAS,CAAC;QAC9C,IAAI,CAAC,iBAAiB,KAAK,KAAK,CAAC;QACjC,IAAI,CAAC,yBAAyB,KAAK,IAAI,CAAC;QACxC,IAAI,CAAC,iBAAiB,KAAK,SAAS,CAAC;QACrC,IAAI,CAAC,4BAA4B,KAAK,SAAS,CAAC;QAEhD,IAAI,CAAC,yBAAyB,GAAG,MAAM;aACpC,GAAG,CAAC,CAAC,IAAI,CAAC,4BAA4B,EAAE,IAAI,CAAC,yBAAyB,CAAC,CAAC;aACxE,KAAK,CAAC,CAAC,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE,EAAE;YAC/B,IAAI,WAAW,KAAK,UAAU,EAAE,CAAC;gBAC/B,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,OAAO,MAAM,CAAC;YAChB,CAAC;YAED,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,IAAI;gBACb,SAAS,EAAE,KAAK;gBAChB,KAAK,EAAE,EAAE;gBACT,eAAe,EAAE,IAAI;gBACrB,aAAa,EAAE,0BAA0B;aAC1C,CAAC;QACJ,CAAC,CAAC,CAAC;QAEL,IAAI,CAAC,aAAa,KAAK,MAAM,CAAC;QAC9B,IAAI,CAAC,oBAAoB,KAAK,KAAK,CAAC;QACpC,IAAI,CAAC,aAAa,KAAK,IAAI,CAAC;QAC5B,IAAI,CAAC,UAAU,KAAK,KAAK,CAAC;QAC1B,IAAI,CAAC,oBAAoB,KAAK,IAAI,CAAC;QACnC,IAAI,CAAC,yCAAyC,KAAK,IAAI,CAAC;QACxD,IAAI,CAAC,gCAAgC,KAAK,IAAI,CAAC;QAC/C,IAAI,CAAC,eAAe,KAAK,KAAK,CAAC;QAC/B,IAAI,CAAC,gBAAgB,KAAK,UAAU,CAAC;QACrC,IAAI,CAAC,+BAA+B,KAAK,IAAI,CAAC;QAC9C,IAAI,CAAC,4BAA4B,KAAK,IAAI,CAAC;QAC3C,IAAI,CAAC,oBAAoB,KAAK,IAAI,CAAC;QACnC,IAAI,CAAC,eAAe,KAAK,KAAK,CAAC;QAC/B,IAAI,CAAC,YAAY,KAAK,YAAY,CAAC;QACnC,IAAI,CAAC,eAAe,KAAK,SAAS,CAAC;QACnC,IAAI,CAAC,WAAW,KAAK,KAAK,CAAC;QAE3B,IAAI,CAAC,OAAO,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAElF,IAAI,CAAC,aAAa,GAAG,IAAI,MAAM,CAAC,YAAY,CAC1C,GAAG,IAAI,iBAAiB,EACxB;YACE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;YACxB,IAAI,EAAE,iBAAiB;YACvB,OAAO,EAAE,8CAA8C;YACvD,QAAQ,EAAE,6DAA6D;SACxE,EACD,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;CACF"}
|
package/lib/gitlab/renovate.js
CHANGED
|
@@ -15,12 +15,8 @@ export class Renovate extends ComponentResource {
|
|
|
15
15
|
constructor(name, args, opts) {
|
|
16
16
|
super("gitlab:renovate", name, args, opts);
|
|
17
17
|
opts = this.opts(k8s.Provider);
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
}
|
|
21
|
-
if (args.resources === undefined) {
|
|
22
|
-
args.resources = { requests: { memory: "1024Mi" }, limits: { memory: "1280Mi" } };
|
|
23
|
-
}
|
|
18
|
+
args.schedule ??= "0 2 * * 0";
|
|
19
|
+
args.resources ??= { requests: { memory: "1024Mi" }, limits: { memory: "1280Mi" } };
|
|
24
20
|
this.namespace = args.namespace
|
|
25
21
|
? pulumi.output(args.namespace)
|
|
26
22
|
: new k8s.core.v1.Namespace(name, { metadata: { name } }, opts).metadata.name;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renovate.js","sourceRoot":"","sources":["../../../lib/gitlab/renovate.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;AAUrD,MAAM,OAAO,QAAS,SAAQ,iBAAiB;IAC5B,MAAM,CAAuB;IAC7B,OAAO,CAAuB;IAC/B,SAAS,CAAwB;IAEjD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAkB,EAAE,IAAsC;QAClF,KAAK,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAE3C,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE/B,IAAI,
|
|
1
|
+
{"version":3,"file":"renovate.js","sourceRoot":"","sources":["../../../lib/gitlab/renovate.ts"],"names":[],"mappings":"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"}
|
package/lib/grafana/alloy.js
CHANGED
|
@@ -21,18 +21,12 @@ export class Alloy extends ComponentResource {
|
|
|
21
21
|
*/
|
|
22
22
|
constructor(name, args, opts) {
|
|
23
23
|
super("grafana:alloy", name, args, opts);
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
limits: { memory: "768Mi" },
|
|
31
|
-
};
|
|
32
|
-
}
|
|
33
|
-
if (args.installPrometheusCRDs === undefined) {
|
|
34
|
-
args.installPrometheusCRDs = true;
|
|
35
|
-
}
|
|
24
|
+
args.replicas ??= 1;
|
|
25
|
+
args.resources ??= {
|
|
26
|
+
requests: { memory: "448Mi" },
|
|
27
|
+
limits: { memory: "640Mi" },
|
|
28
|
+
};
|
|
29
|
+
args.installPrometheusCRDs ??= true;
|
|
36
30
|
const k8sOpts = this.opts(k8s.Provider);
|
|
37
31
|
this.namespace = args.namespace
|
|
38
32
|
? pulumi.output(args.namespace)
|
|
@@ -119,8 +113,8 @@ export class Alloy extends ComponentResource {
|
|
|
119
113
|
},
|
|
120
114
|
configReloader: {
|
|
121
115
|
resources: {
|
|
122
|
-
requests: { memory: "
|
|
123
|
-
limits: { memory: "
|
|
116
|
+
requests: { memory: "16Mi" },
|
|
117
|
+
limits: { memory: "24Mi" },
|
|
124
118
|
},
|
|
125
119
|
},
|
|
126
120
|
controller: {
|
|
@@ -131,7 +125,7 @@ export class Alloy extends ComponentResource {
|
|
|
131
125
|
serviceMonitor: { enabled: true },
|
|
132
126
|
ingress: {
|
|
133
127
|
enabled: args.hostname ?? false,
|
|
134
|
-
ingressClassName: args.ingressClassName ?? "
|
|
128
|
+
ingressClassName: args.ingressClassName ?? "internal",
|
|
135
129
|
annotations: {
|
|
136
130
|
"cert-manager.io/cluster-issuer": args.clusterIssuer ?? Certificate.DefaultClusterIssuer,
|
|
137
131
|
"traefik.ingress.kubernetes.io/router.entrypoints": "websecure",
|
package/lib/grafana/alloy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"alloy.js","sourceRoot":"","sources":["../../../lib/grafana/alloy.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;AAEvD,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AA4BtD,MAAM,OAAO,KAAM,SAAQ,iBAAiB;IACzB,qBAAqB,CAAwD;IAC7E,gBAAgB,CAAuB;IACvC,UAAU,CAAuB;IACjC,WAAW,CAA6B;IACxC,cAAc,CAAsB;IACpC,gBAAgB,CAAwB;IACxC,qBAAqB,CAA4B;IAClD,SAAS,CAAwB;IAEjD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAe,EAAE,IAAsC;QAC/E,KAAK,CAAC,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAEzC,IAAI,
|
|
1
|
+
{"version":3,"file":"alloy.js","sourceRoot":"","sources":["../../../lib/grafana/alloy.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;AAEvD,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AA4BtD,MAAM,OAAO,KAAM,SAAQ,iBAAiB;IACzB,qBAAqB,CAAwD;IAC7E,gBAAgB,CAAuB;IACvC,UAAU,CAAuB;IACjC,WAAW,CAA6B;IACxC,cAAc,CAAsB;IACpC,gBAAgB,CAAwB;IACxC,qBAAqB,CAA4B;IAClD,SAAS,CAAwB;IAEjD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAe,EAAE,IAAsC;QAC/E,KAAK,CAAC,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAEzC,IAAI,CAAC,QAAQ,KAAK,CAAC,CAAC;QACpB,IAAI,CAAC,SAAS,KAAK;YACjB,QAAQ,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;YAC7B,MAAM,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;SAC5B,CAAC;QACF,IAAI,CAAC,qBAAqB,KAAK,IAAI,CAAC;QAEpC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAExC,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,IAAI,CAAC,qBAAqB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,qBAAqB,CAAC,EAAE,EAAE;YACtG,IAAI,qBAAqB,KAAK,IAAI,EAAE,CAAC;gBACnC,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CACnC,GAAG,IAAI,kBAAkB,EACzB;oBACE,IAAI,EAAE,GAAG,IAAI,kBAAkB;oBAC/B,SAAS,EAAE,IAAI,CAAC,SAAS;oBACzB,cAAc,EAAE,EAAE,IAAI,EAAE,oDAAoD,EAAE;oBAC9E,KAAK,EAAE,0BAA0B;iBAClC,EACD,OAAO,CACR,CAAC;YACJ,CAAC;YAED,OAAO,SAAS,CAAC;QACnB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,MAAM,CAC9C,GAAG,IAAI,yBAAyB,EAChC;YACE,QAAQ,EAAE,EAAE,IAAI,EAAE,GAAG,IAAI,yBAAyB,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE;YAC/E,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,EAAE;gBAC/D,OAAO;oBACL,QAAQ,EAAE,UAAU,EAAE,QAAQ,IAAI,EAAE;oBACpC,QAAQ,EAAE,UAAU,EAAE,QAAQ,IAAI,EAAE;iBACrC,CAAC;YACJ,CAAC,CAAC;SACH,EACD,OAAO,CACR,CAAC;QAEF,IAAI,CAAC,UAAU,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,MAAM,CACxC,GAAG,IAAI,mBAAmB,EAC1B;YACE,QAAQ,EAAE,EAAE,IAAI,EAAE,GAAG,IAAI,mBAAmB,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE;YACzE,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE;gBACnD,OAAO;oBACL,QAAQ,EAAE,IAAI,EAAE,QAAQ,IAAI,EAAE;oBAC9B,QAAQ,EAAE,IAAI,EAAE,QAAQ,IAAI,EAAE;iBAC/B,CAAC;YACJ,CAAC,CAAC;SACH,EACD,OAAO,CACR,CAAC;QAEF,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,uCAAuC,EAAE;YACjE,KAAK,EAAE,OAAO;YACd,MAAM,EAAE;gBACN,gBAAgB,EAAE,IAAI;gBACtB,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE;gBACvB,KAAK,EAAE;oBACL,eAAe,EAAE,KAAK;oBACtB,UAAU,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;oBAC7B,SAAS,EAAE;wBACT,MAAM,EAAE,IAAI;wBACZ,OAAO,EAAE,MAAM;6BACZ,GAAG,CAAC;4BACH,IAAI,CAAC,SAAS;4BACd,IAAI,CAAC,WAAW;4BAChB,IAAI,CAAC,UAAU;4BACf,IAAI,CAAC,IAAI;4BACT,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI;4BACnC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI;yBAC9B,CAAC;6BACD,KAAK,CAAC,CAAC,CAAC,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE,oBAAoB,EAAE,cAAc,CAAC,EAAE,EAAE;4BAC1F,MAAM,MAAM,GAAG,CAAC,WAAW,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,GAAG,CAAC,CAAC;4BAEvE,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gCAC7B,IAAI,UAAU,CAAC,QAAQ,KAAK,SAAS,IAAI,UAAU,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;oCAC3E,MAAM,CAAC,IAAI,CACT,kDAAkD,EAClD,kBAAkB,SAAS,GAAG,EAC9B,aAAa,oBAAoB,GAAG,EACpC,GAAG,CACJ,CAAC;gCACJ,CAAC;gCAED,MAAM,CAAC,IAAI,CAAC,qCAAqC,EAAE,YAAY,EAAE,UAAU,UAAU,CAAC,GAAG,GAAG,CAAC,CAAC;gCAE9F,IAAI,UAAU,CAAC,QAAQ,KAAK,SAAS,IAAI,UAAU,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;oCAC3E,MAAM,CAAC,IAAI,CACT,cAAc,EACd,wFAAwF,EACxF,0EAA0E,EAC1E,GAAG,CACJ,CAAC;gCACJ,CAAC;gCAED,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,oCAAoC,WAAW,KAAK,EAAE,GAAG,CAAC,CAAC;gCAE5E,MAAM,CAAC,IAAI,CACT,6CAA6C,EAC7C,yDAAyD,EACzD,GAAG,EACH,iDAAiD,EACjD,yDAAyD,EACzD,GAAG,CACJ,CAAC;4BACJ,CAAC;4BAED,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gCACvB,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;oCAC/D,MAAM,CAAC,IAAI,CACT,+CAA+C,EAC/C,gBAAgB,SAAS,GAAG,EAC5B,WAAW,cAAc,GAAG,EAC5B,GAAG,CACJ,CAAC;gCACJ,CAAC;gCAED,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE,YAAY,EAAE,UAAU,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;gCAExE,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;oCAC/D,MAAM,CAAC,IAAI,CACT,cAAc,EACd,qFAAqF,EACrF,uEAAuE,EACvE,GAAG,CACJ,CAAC;gCACJ,CAAC;gCAED,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,oCAAoC,WAAW,KAAK,EAAE,GAAG,CAAC,CAAC;gCAE5E,MAAM,CAAC,IAAI,CACT,+BAA+B,EAC/B,cAAc,EACd,GAAG,EACH,4BAA4B,EAC5B,6CAA6C,EAC7C,QAAQ,EACR,iDAAiD,EACjD,oBAAoB,EACpB,4BAA4B,EAC5B,GAAG,EACH,QAAQ,EACR,gDAAgD,EAChD,oBAAoB,EACpB,sBAAsB,EACtB,GAAG,EACH,QAAQ,EACR,0DAA0D,EAC1D,oBAAoB,EACpB,4BAA4B,EAC5B,GAAG,EACH,QAAQ,EACR,wEAAwE,EACxE,oBAAoB,EACpB,sBAAsB,EACtB,GAAG,EACH,QAAQ,EACR,6EAA6E,EAC7E,oBAAoB,EACpB,4BAA4B,EAC5B,GAAG,EACH,GAAG,EACH,iCAAiC,EACjC,4CAA4C,EAC5C,yCAAyC,EACzC,GAAG,CACJ,CAAC;4BACJ,CAAC;4BAED,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBAC3B,CAAC,CAAC;qBACL;oBACD,SAAS,EAAE,IAAI,CAAC,SAAS;iBAC1B;gBACD,cAAc,EAAE;oBACd,SAAS,EAAE;wBACT,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;wBAC5B,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;qBAC3B;iBACF;gBACD,UAAU,EAAE;oBACV,IAAI,EAAE,aAAa;oBACnB,QAAQ,EAAE,CAAC;oBACX,8BAA8B,EAAE,IAAI;iBACrC;gBACD,cAAc,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;gBACjC,OAAO,EAAE;oBACP,OAAO,EAAE,IAAI,CAAC,QAAQ,IAAI,KAAK;oBAC/B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,IAAI,UAAU;oBACrD,WAAW,EAAE;wBACX,gCAAgC,EAAE,IAAI,CAAC,aAAa,IAAI,WAAW,CAAC,oBAAoB;wBACxF,kDAAkD,EAAE,WAAW;wBAC/D,0CAA0C,EAAE,MAAM;qBACnD;oBACD,KAAK,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC;oBACtB,GAAG,EAAE,CAAC,EAAE,UAAU,EAAE,GAAG,IAAI,MAAM,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC5D,QAAQ,EAAE,KAAK;iBAChB;aACF;SACF,EACD,OAAO,CACR,CAAC;QAEF,MAAM,eAAe,GAAG;YACtB,IAAI,EAAE,SAAS;YACf,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,MAAM,EAAE;gBACN,wBAAwB,EAAE,SAAS;aACpC;SACF,CAAC;QAEF,IAAI,CAAC,cAAc,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,OAAO,CAC7C,SAAS,EACT;YACE,QAAQ,EAAE,eAAe;YACzB,IAAI,EAAE;gBACJ,SAAS,EAAE,MAAM;gBACjB,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;aACpF;SACF,EACD,OAAO,CACR,CAAC;QAEF,IAAI,CAAC,gBAAgB,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,SAAS,CAC/C,SAAS,EACT;YACE,QAAQ,EAAE,eAAe;YACzB,OAAO,EAAE;gBACP;oBACE,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CACpD,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;wBACnB,EAAE,EAAE,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC,WAAY;wBAChD,SAAS,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE;qBACjD,CAAC,CAAC,CACJ;oBACD,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;iBACjE;aACF;SACF,EACD,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,cAAc,EAAE,CAC/C,CAAC;QAEF,IAAI,CAAC,qBAAqB,GAAG,IAAI,UAAU,CAAC,cAAc,CACxD,GAAG,IAAI,UAAU,EACjB;YACE,QAAQ,EAAE,eAAe;YACzB,IAAI,EAAE;gBACJ,SAAS,EAAE;oBACT;wBACE,eAAe,EAAE,qDAAqD;wBACtE,WAAW,EAAE,IAAI;wBACjB,QAAQ,EAAE,KAAK;wBACf,IAAI,EAAE,eAAe;wBACrB,MAAM,EAAE,OAAO;wBACf,SAAS,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE;wBACvC,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,kBAAkB,CAAC,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC;qBACnF;oBACD;wBACE,eAAe,EAAE,qDAAqD;wBACtE,WAAW,EAAE,IAAI;wBACjB,eAAe,EAAE,KAAK;wBACtB,QAAQ,EAAE,KAAK;wBACf,IAAI,EAAE,mBAAmB;wBACzB,IAAI,EAAE,eAAe;wBACrB,MAAM,EAAE,OAAO;wBACf,SAAS,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE;wBACvC,iBAAiB,EAAE;4BACjB;gCACE,MAAM,EAAE,MAAM;gCACd,YAAY,EAAE,CAAC,UAAU,CAAC;gCAC1B,KAAK,EAAE,OAAO;6BACf;4BACD;gCACE,MAAM,EAAE,MAAM;gCACd,YAAY,EAAE,CAAC,UAAU,CAAC;gCAC1B,KAAK,EAAE;oCACL,2CAA2C;oCAC3C,gCAAgC;oCAChC,oCAAoC;oCACpC,kCAAkC;iCACnC,CAAC,IAAI,CAAC,GAAG,CAAC;6BACZ;4BACD;gCACE,MAAM,EAAE,MAAM;gCACd,YAAY,EAAE,CAAC,UAAU,CAAC;gCAC1B,KAAK,EAAE;oCACL,yBAAyB;oCACzB,oCAAoC;oCACpC,6CAA6C;oCAC7C,iCAAiC;oCACjC,iCAAiC;oCACjC,kCAAkC;oCAClC,kCAAkC;iCACnC,CAAC,IAAI,CAAC,GAAG,CAAC;6BACZ;4BACD;gCACE,MAAM,EAAE,MAAM;gCACd,YAAY,EAAE,CAAC,UAAU,CAAC;gCAC1B,KAAK,EAAE,CAAC,8BAA8B,EAAE,uBAAuB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;6BAC3E;4BACD;gCACE,MAAM,EAAE,MAAM;gCACd,YAAY,EAAE,CAAC,UAAU,CAAC;gCAC1B,KAAK,EAAE,CAAC,4BAA4B,EAAE,uBAAuB,EAAE,uBAAuB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;6BAClG;4BACD;gCACE,MAAM,EAAE,MAAM;gCACd,YAAY,EAAE,CAAC,UAAU,CAAC;gCAC1B,KAAK,EAAE,kBAAkB;6BAC1B;4BACD;gCACE,MAAM,EAAE,MAAM;gCACd,YAAY,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC;gCAC3B,KAAK,EAAE,KAAK;6BACb;yBACF;wBACD,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,kBAAkB,CAAC,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC;qBACnF;oBACD;wBACE,eAAe,EAAE,qDAAqD;wBACtE,WAAW,EAAE,IAAI;wBACjB,eAAe,EAAE,KAAK;wBACtB,QAAQ,EAAE,KAAK;wBACf,IAAI,EAAE,iBAAiB;wBACvB,IAAI,EAAE,eAAe;wBACrB,MAAM,EAAE,OAAO;wBACf,SAAS,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE;wBACvC,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,kBAAkB,CAAC,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC;qBACnF;iBACF;gBACD,iBAAiB,EAAE,EAAE,UAAU,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;gBACnD,QAAQ,EAAE,EAAE,WAAW,EAAE,eAAe,CAAC,MAAM,EAAE;aAClD;SACF,EACD,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,gBAAgB,EAAE,CACjD,CAAC;QAEF,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;CACF"}
|
|
@@ -37,9 +37,7 @@ export class Grafana extends ComponentResource {
|
|
|
37
37
|
super("grafana", name, args, opts);
|
|
38
38
|
const emptyOpts = this.opts();
|
|
39
39
|
const k8sOpts = this.opts(k8s.Provider);
|
|
40
|
-
|
|
41
|
-
args.replicas = 1;
|
|
42
|
-
}
|
|
40
|
+
args.replicas ??= 1;
|
|
43
41
|
this.adminPassword = pulumi.secret(new random.RandomPassword(`${name}-admin-password`, { length: 24, special: true }, emptyOpts).result);
|
|
44
42
|
this.namespace = args.namespace
|
|
45
43
|
? pulumi.output(args.namespace)
|
|
@@ -102,8 +100,8 @@ export class Grafana extends ComponentResource {
|
|
|
102
100
|
},
|
|
103
101
|
},
|
|
104
102
|
resources: {
|
|
105
|
-
requests: { memory: "
|
|
106
|
-
limits: { memory: "
|
|
103
|
+
requests: { memory: "192Mi" },
|
|
104
|
+
limits: { memory: "256Mi" },
|
|
107
105
|
},
|
|
108
106
|
},
|
|
109
107
|
}, k8sOpts);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/grafana/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAE1C,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAkB3C,MAAM,OAAO,OAAQ,SAAQ,iBAAiB;IACpC,MAAM,CAAU,oBAAoB,GAAG;QAC7C,oBAAoB;QACpB,kBAAkB;QAClB,sBAAsB;QACtB,iBAAiB;QACjB,gBAAgB;KACjB,CAAC;IACM,MAAM,CAAU,cAAc,GAAG;QACvC,cAAc;QACd,uBAAuB;QACvB,gBAAgB;QAChB,cAAc;QACd,eAAe;QACf,oBAAoB;QACpB,eAAe;QACf,aAAa;QACb,iBAAiB;KAClB,CAAC;IAEe,WAAW,CAA6B;IACzC,aAAa,CAAwB;IACrC,SAAS,CAAwB;IAEjD;;;;;OAKG;IACH,YAAY,IAAY,EAAE,IAAiB,EAAE,IAAsC;QACjF,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAEnC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAExC,IAAI,
|
|
1
|
+
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/grafana/deployment.ts"],"names":[],"mappings":"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"}
|
package/lib/hcloud/cluster.js
CHANGED
|
@@ -144,31 +144,15 @@ export class Cluster extends ComponentResource {
|
|
|
144
144
|
name: this.name,
|
|
145
145
|
nodes: this.nodes.apply((nodes) => pulumi.all(nodes).apply((nodes) => nodes.filter((node) => !node.disabled))),
|
|
146
146
|
k0s: pulumi.all([args.k0s]).apply(([k0s]) => {
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
}
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
}
|
|
153
|
-
if (k0s.config.spec === undefined) {
|
|
154
|
-
k0s.config.spec = {};
|
|
155
|
-
}
|
|
156
|
-
if (k0s.config.spec.network === undefined) {
|
|
157
|
-
k0s.config.spec.network = {};
|
|
158
|
-
}
|
|
159
|
-
if (k0s.config.spec.network.provider === undefined) {
|
|
160
|
-
k0s.config.spec.network.provider = "calico";
|
|
161
|
-
}
|
|
147
|
+
k0s ??= {};
|
|
148
|
+
k0s.config ??= {};
|
|
149
|
+
k0s.config.spec ??= {};
|
|
150
|
+
k0s.config.spec.network ??= {};
|
|
151
|
+
k0s.config.spec.network.provider ??= "calico";
|
|
162
152
|
if (k0s.config.spec.network.provider === "calico") {
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
if (k0s.config.spec.network.calico.mode === undefined) {
|
|
167
|
-
k0s.config.spec.network.calico.mode = "bird";
|
|
168
|
-
}
|
|
169
|
-
if (k0s.config.spec.network.calico.wireguard === undefined) {
|
|
170
|
-
k0s.config.spec.network.calico.wireguard = true;
|
|
171
|
-
}
|
|
153
|
+
k0s.config.spec.network.calico = {};
|
|
154
|
+
k0s.config.spec.network.calico.mode ??= "bird";
|
|
155
|
+
k0s.config.spec.network.calico.wireguard ??= true;
|
|
172
156
|
if (k0s.config.spec.network.calico.ipAutodetectionMethod === undefined) {
|
|
173
157
|
const interfaces = new Set();
|
|
174
158
|
for (const os of Object.values(Cluster.interfacesMap)) {
|
|
@@ -209,9 +193,7 @@ export class Cluster extends ComponentResource {
|
|
|
209
193
|
const results = [];
|
|
210
194
|
for (const nodeGroup of nodes) {
|
|
211
195
|
let nodesCount = nodeGroup.count;
|
|
212
|
-
|
|
213
|
-
nodesCount = 1;
|
|
214
|
-
}
|
|
196
|
+
nodesCount ??= 1;
|
|
215
197
|
nodeGroup.operatingSystem = nodeGroup.operatingSystem ?? Cluster.defaultOperatingSystem;
|
|
216
198
|
const roles = nodeGroup.roles ?? [];
|
|
217
199
|
let isController = false;
|