Skip to content

Commit 34beaa3

Browse files
authored
Merge pull request #202 from ruby-no-kai/rk25net-kor-boot
boot rk25net for kor25
2 parents 3dd0139 + 83995b3 commit 34beaa3

43 files changed

Lines changed: 222 additions & 123 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

data/ssh_import_ids.json

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
[
2-
"gh:nna774",
32
"gh:hanazuki",
4-
"gh:terfno",
3+
"gh:nna774",
54
"gh:unasuke",
5+
"gh:takuan517",
66
"gh:utgwkk",
77
"gh:osyoyu",
8-
"gh:takuan517",
9-
"gh:hokkai7go",
8+
"gh:terfno",
9+
"gh:marokiki",
1010
"gh:gotti",
11-
"gh:pastak",
12-
"gh:IIIIshii",
13-
"gh:MaySoMusician",
14-
"gh:ayatk",
11+
1512
"gh:Little-Rubyist",
1613

1714
"gh:sorah"

gen/k8s/dhcp/configmap.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/k8s/dhcp/db-upgrade-job.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/k8s/dhcp/deployment.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/k8s/dns-cache/deployment.yml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/k8s/karpenter/ebs_gp3.yml

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/k8s/karpenter/kustomization.yml

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gen/k8s/tftp/deployment.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

k8s/dhcp/configmap.jsonnet

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,18 @@ local config = {
3535
// 'reconnect-wait-time': 2000,
3636
//},
3737

38-
'control-socket': {
39-
'socket-type': 'unix',
40-
'socket-name': '/run/kea/dhcp4.sock',
41-
},
38+
'control-sockets': [
39+
{
40+
'socket-type': 'unix',
41+
'socket-name': '/var/run/kea/dhcp4.sock',
42+
},
43+
// TODO: Enable this once stork-agent supports kea-dhcp4 http control-socket (due to kea-ctrl-agent deprecation)
44+
// {
45+
// 'socket-type': 'http',
46+
// 'socket-address': '127.0.0.1',
47+
// 'socket-port': 10080,
48+
// },
49+
],
4250

4351
loggers: [
4452
{

k8s/dhcp/pod.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ local db_name = 'kea';
33
{
44
app_container:: {
55
name: 'app',
6-
image: '005216166247.dkr.ecr.ap-northeast-1.amazonaws.com/kea:e51596dd7b827a41941f584f7d062dd923170319',
6+
image: '005216166247.dkr.ecr.ap-northeast-1.amazonaws.com/kea:0d9cc84dd9a3c9d4354b3c55887245959f389773',
77
env: [
88
{ name: 'LEASE_DATABASE_NAME', value: db_name },
99
{ name: 'LEASE_DATABASE_HOST', value: db_host },

0 commit comments

Comments
 (0)