Skip to content

Commit 64d0d1c

Browse files
pddgpddg
authored
Merge pull request #55 from pddg/photon-1.2.0
photon 1.2.0
2 parents 7e1bab1 + 2c910d7 commit 64d0d1c

6 files changed

Lines changed: 62 additions & 115 deletions

File tree

‎.env‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
PHOTON_VERSION=1.0.1
2-
PHOTON_SHA256SUM=4ef937f7f33fb89fef403f825edae14299240a0115df756f8fad67b3dc266437
1+
PHOTON_VERSION=1.2.0
2+
PHOTON_SHA256SUM=3455a6c2c9828393c2506d23540015b3b220cf00f4a9bb2c39e8007971cbe8c7
33
CONTAINER_REVISION=0

‎.github/workflows/build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
v1-aqua-installer-${{runner.os}}-${{runner.arch}}-
2525
- uses: aquaproj/aqua-installer@11dd79b4e498d471a9385aa9fb7f62bb5f52a73c # v4.0.4
2626
with:
27-
aqua_version: v2.46.0
27+
aqua_version: v2.60.0
2828
- name: Run unit tests
2929
run: |
3030
make test

‎aqua-checksums.json‎

Lines changed: 48 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,183 +1,123 @@
11
{
22
"checksums": [
33
{
4-
"id": "github_release/github.com/golangci/golangci-lint/v2.0.2/golangci-lint-2.0.2-darwin-amd64.tar.gz",
5-
"checksum": "A88CBDC86B483FE44E90BF2DCC3FEC2AF8C754116E6EDF0AA6592CAC5BAA7A0E",
4+
"id": "github_release/github.com/golangci/golangci-lint/v2.12.2/golangci-lint-2.12.2-darwin-amd64.tar.gz",
5+
"checksum": "F6F06D94B6241521C53D15450C5209B028270BF966F842AFB11C030C79F5BC16",
66
"algorithm": "sha256"
77
},
88
{
9-
"id": "github_release/github.com/golangci/golangci-lint/v2.0.2/golangci-lint-2.0.2-darwin-arm64.tar.gz",
10-
"checksum": "664550E7954F5F4451AAE99B4F7382C1A47039C66F39CA605F5D9AF1A0D32B49",
9+
"id": "github_release/github.com/golangci/golangci-lint/v2.12.2/golangci-lint-2.12.2-darwin-arm64.tar.gz",
10+
"checksum": "A9C54498731B3128F79E090BE6110F3E5FFFCCC617B08142ED244D4126C73F29",
1111
"algorithm": "sha256"
1212
},
1313
{
14-
"id": "github_release/github.com/golangci/golangci-lint/v2.0.2/golangci-lint-2.0.2-linux-amd64.tar.gz",
15-
"checksum": "89CC8A7810DC63B9A37900DA03E37C3601CAF46D42265D774E0F1A5D883D53E2",
14+
"id": "github_release/github.com/golangci/golangci-lint/v2.12.2/golangci-lint-2.12.2-linux-amd64.tar.gz",
15+
"checksum": "8DF580D2670FED8FA984AAC0507099AF8DF275E665215F5C7A2AE3943893A553",
1616
"algorithm": "sha256"
1717
},
1818
{
19-
"id": "github_release/github.com/golangci/golangci-lint/v2.0.2/golangci-lint-2.0.2-linux-arm64.tar.gz",
20-
"checksum": "789D5B91219AC68C2336F77D41CD7E33A910420594780F455893F8453D09595B",
19+
"id": "github_release/github.com/golangci/golangci-lint/v2.12.2/golangci-lint-2.12.2-linux-arm64.tar.gz",
20+
"checksum": "44CD40A8C76C86755375ADFEEA52CFD3533CB43D7BD647771E0AE065E166DF3A",
2121
"algorithm": "sha256"
2222
},
2323
{
24-
"id": "github_release/github.com/golangci/golangci-lint/v2.0.2/golangci-lint-2.0.2-windows-amd64.zip",
25-
"checksum": "FE4B946CC01366B989001215687003A9C4A7098589921F75E6228D6D8CFFC15C",
24+
"id": "github_release/github.com/golangci/golangci-lint/v2.12.2/golangci-lint-2.12.2-windows-amd64.zip",
25+
"checksum": "BD42E3EBC8CB4ECECB86941983BAAF1DC221BBB04D838E94CE63B49CC91E02BB",
2626
"algorithm": "sha256"
2727
},
2828
{
29-
"id": "github_release/github.com/golangci/golangci-lint/v2.0.2/golangci-lint-2.0.2-windows-arm64.zip",
30-
"checksum": "646BD9250EF8C771D85CD22FE8E6F2397AE39599179755E3BBFA9EF97AD44090",
29+
"id": "github_release/github.com/golangci/golangci-lint/v2.12.2/golangci-lint-2.12.2-windows-arm64.zip",
30+
"checksum": "947B9A5BF762D465710B376C156F0184ABB2168378B0826AF1899E0EE7183742",
3131
"algorithm": "sha256"
3232
},
3333
{
34-
"id": "github_release/github.com/golangci/golangci-lint/v2.4.0/golangci-lint-2.4.0-darwin-amd64.tar.gz",
35-
"checksum": "7904CE63F79DB44934939CF7A063086EA0EA98E9B19EBA0A9D52CCDD0D21951C",
34+
"id": "github_release/github.com/kubernetes-sigs/kind/v0.32.0/kind-darwin-amd64",
35+
"checksum": "295AC6D0D634C9819C9907DF45E3017D1F13166BD13C3404C45E79F7FAA47498",
3636
"algorithm": "sha256"
3737
},
3838
{
39-
"id": "github_release/github.com/golangci/golangci-lint/v2.4.0/golangci-lint-2.4.0-darwin-arm64.tar.gz",
40-
"checksum": "CD4DD53FA09B6646BAFF5FD22B8C64D91DB02C21C7496DF27992D75D34FEEC59",
39+
"id": "github_release/github.com/kubernetes-sigs/kind/v0.32.0/kind-darwin-arm64",
40+
"checksum": "DCA67911095A110C2B5C36E26DF6CAC860C602033E456C0DB47BE498CDEF1EBB",
4141
"algorithm": "sha256"
4242
},
4343
{
44-
"id": "github_release/github.com/golangci/golangci-lint/v2.4.0/golangci-lint-2.4.0-linux-amd64.tar.gz",
45-
"checksum": "FAE792524C04424C0AC369F5B8076F04B45CF29FC945A370E55D369A8DC11840",
44+
"id": "github_release/github.com/kubernetes-sigs/kind/v0.32.0/kind-linux-amd64",
45+
"checksum": "50030DE23CF40A18505F20426F6A8506BEDF13C6E509244BD1FA9463721B0F54",
4646
"algorithm": "sha256"
4747
},
4848
{
49-
"id": "github_release/github.com/golangci/golangci-lint/v2.4.0/golangci-lint-2.4.0-linux-arm64.tar.gz",
50-
"checksum": "70AC11F55B80EC78FD3A879249CC9255121B8DFD7F7ED4FC46ED137F4ABF17E7",
49+
"id": "github_release/github.com/kubernetes-sigs/kind/v0.32.0/kind-linux-arm64",
50+
"checksum": "B92CD615E97585DE8DDADE28ED5CD7FEB4248D717C233EEA5B03C37298900F5D",
5151
"algorithm": "sha256"
5252
},
5353
{
54-
"id": "github_release/github.com/golangci/golangci-lint/v2.4.0/golangci-lint-2.4.0-windows-amd64.zip",
55-
"checksum": "003112F7A56746FEAABF20B744054BF9ACDF900C9E77176383623C4B1D76AAA9",
54+
"id": "github_release/github.com/kubernetes-sigs/kind/v0.32.0/kind-windows-amd64",
55+
"checksum": "0BCB2D1CFEDC1912D664014DB716937E8A0E843E91C6807B4DB2025DBC8989FA",
5656
"algorithm": "sha256"
5757
},
5858
{
59-
"id": "github_release/github.com/golangci/golangci-lint/v2.4.0/golangci-lint-2.4.0-windows-arm64.zip",
60-
"checksum": "DC0C2092AF5D47FC2CD31A1DFE7B4C7E765FAB22DE98BD21EF2FFCC53AD9F54F",
59+
"id": "github_release/github.com/kubernetes-sigs/kustomize/kustomize/v5.8.1/kustomize_v5.8.1_darwin_amd64.tar.gz",
60+
"checksum": "EE7CF0C1E3592AA7BB66BA82B359933A95E7F2E0B36E5F53ED0A4535B017F2F8",
6161
"algorithm": "sha256"
6262
},
6363
{
64-
"id": "github_release/github.com/kubernetes-sigs/kind/v0.27.0/kind-darwin-amd64",
65-
"checksum": "3435134325B6B9406CCFEC417B13BB46A808FC74E9A2EBB0CA31B379C8293863",
64+
"id": "github_release/github.com/kubernetes-sigs/kustomize/kustomize/v5.8.1/kustomize_v5.8.1_darwin_arm64.tar.gz",
65+
"checksum": "8886F8A78474E608CC81234F729FDA188A9767DA23E28925802F00ECE2BAB288",
6666
"algorithm": "sha256"
6767
},
6868
{
69-
"id": "github_release/github.com/kubernetes-sigs/kind/v0.27.0/kind-darwin-arm64",
70-
"checksum": "5240CA1ACB587E1D0386532DD8C3373D81F5173B5AF322919FC56F0CDD646596",
69+
"id": "github_release/github.com/kubernetes-sigs/kustomize/kustomize/v5.8.1/kustomize_v5.8.1_linux_amd64.tar.gz",
70+
"checksum": "029A7F0F4E1932C52A0476CF02A0FD855C0BB85694B82C338FC648DCB53A819D",
7171
"algorithm": "sha256"
7272
},
7373
{
74-
"id": "github_release/github.com/kubernetes-sigs/kind/v0.27.0/kind-linux-amd64",
75-
"checksum": "A6875AAEA358ACF0AC07786B1A6755D08FD640F4C79B7A2E46681CC13F49A04B",
74+
"id": "github_release/github.com/kubernetes-sigs/kustomize/kustomize/v5.8.1/kustomize_v5.8.1_linux_arm64.tar.gz",
75+
"checksum": "0953EA3E476F66D6DDFCD911D750F5167B9365AA9491B2326398E289FEF2C142",
7676
"algorithm": "sha256"
7777
},
7878
{
79-
"id": "github_release/github.com/kubernetes-sigs/kind/v0.27.0/kind-linux-arm64",
80-
"checksum": "5E4507A41C69679562610B1BE82BA4F80693A7826F4E9C6E39236169A3E4F9D0",
79+
"id": "github_release/github.com/kubernetes-sigs/kustomize/kustomize/v5.8.1/kustomize_v5.8.1_windows_amd64.zip",
80+
"checksum": "8EC7F5E815E526D4622C06DF0A7793D8CFB6EB1C74F816B46166097FEF8B26C6",
8181
"algorithm": "sha256"
8282
},
8383
{
84-
"id": "github_release/github.com/kubernetes-sigs/kind/v0.27.0/kind-windows-amd64",
85-
"checksum": "445EE4263D5DE090D60D049453D9691A2587A17CB349AA5AB8F402A47E3C2490",
84+
"id": "github_release/github.com/kubernetes-sigs/kustomize/kustomize/v5.8.1/kustomize_v5.8.1_windows_arm64.zip",
85+
"checksum": "F6F5090C373965760A30A59AF84C81853B80D2C7DBB3236424F440E47EED3F5A",
8686
"algorithm": "sha256"
8787
},
8888
{
89-
"id": "github_release/github.com/kubernetes-sigs/kind/v0.29.0/kind-darwin-amd64",
90-
"checksum": "3EB0D4DE25B854F34EA8CE8A3CBE15054FC03BC962B03E96FD10664B829FB6ED",
89+
"id": "github_release/github.com/suzuki-shunsuke/pinact/v4.1.0/pinact_darwin_amd64.tar.gz",
90+
"checksum": "6338D0220A28093C2C6916A047EEA8A17F4BA03A8562010DC8E942B2A2884364",
9191
"algorithm": "sha256"
9292
},
9393
{
94-
"id": "github_release/github.com/kubernetes-sigs/kind/v0.29.0/kind-darwin-arm64",
95-
"checksum": "314D8F1428842FD1BA2110FD0052A0F0B3AB5773AB1BDCDAD1FF036E913310C9",
94+
"id": "github_release/github.com/suzuki-shunsuke/pinact/v4.1.0/pinact_darwin_arm64.tar.gz",
95+
"checksum": "B670063CCFA178CDB5C7107D14E3DE896F10B93EDCC7DBE38B840CB99F2536DB",
9696
"algorithm": "sha256"
9797
},
9898
{
99-
"id": "github_release/github.com/kubernetes-sigs/kind/v0.29.0/kind-linux-amd64",
100-
"checksum": "C72EDA46430F065FB45C5F70E7C957CC9209402EF309294821978677C8FB3284",
99+
"id": "github_release/github.com/suzuki-shunsuke/pinact/v4.1.0/pinact_linux_amd64.tar.gz",
100+
"checksum": "8FCBF1B3E95551C82FD995535E3C1DEFA70E23299CE36EB3AFD6C98778DE6CA0",
101101
"algorithm": "sha256"
102102
},
103103
{
104-
"id": "github_release/github.com/kubernetes-sigs/kind/v0.29.0/kind-linux-arm64",
105-
"checksum": "03D45095DBD9CC1689F179A3E5E5DA24B77C2D1B257D7645ABF1B4174BEBCF2A",
104+
"id": "github_release/github.com/suzuki-shunsuke/pinact/v4.1.0/pinact_linux_arm64.tar.gz",
105+
"checksum": "2807669CD423A3572BC12EA4A5EAB80CD2F30D5644710E0C97A08A075FDADF10",
106106
"algorithm": "sha256"
107107
},
108108
{
109-
"id": "github_release/github.com/kubernetes-sigs/kind/v0.29.0/kind-windows-amd64",
110-
"checksum": "7EA3E9AF902DDC4ED773704AB932175BFEC8EAFFFFF27C4CAD6C2F397CD6E4EE",
109+
"id": "github_release/github.com/suzuki-shunsuke/pinact/v4.1.0/pinact_windows_amd64.zip",
110+
"checksum": "DE04E9612A50CB7B0263D162400305EA02FC85410C38887D1BE7446A7C5D5DC6",
111111
"algorithm": "sha256"
112112
},
113113
{
114-
"id": "github_release/github.com/kubernetes-sigs/kustomize/kustomize/v5.6.0/kustomize_v5.6.0_darwin_amd64.tar.gz",
115-
"checksum": "3432BE97F9FB4899148BF2485CCF9080E5E7702758EB16C92CD2F2F335E12A03",
114+
"id": "github_release/github.com/suzuki-shunsuke/pinact/v4.1.0/pinact_windows_arm64.zip",
115+
"checksum": "3F8FEDF5F7490B903497A8844A6954DEB80A1ECA5B1F38747E21AA9198A7C203",
116116
"algorithm": "sha256"
117117
},
118118
{
119-
"id": "github_release/github.com/kubernetes-sigs/kustomize/kustomize/v5.6.0/kustomize_v5.6.0_darwin_arm64.tar.gz",
120-
"checksum": "791D9497D2973D4AF17C9C0C2B3991CE82E61D1A2BF79F4EF78DD9DCE25A6D3D",
121-
"algorithm": "sha256"
122-
},
123-
{
124-
"id": "github_release/github.com/kubernetes-sigs/kustomize/kustomize/v5.6.0/kustomize_v5.6.0_linux_amd64.tar.gz",
125-
"checksum": "54E4031DDC4E7FC59E408DA29E7C646E8E57B8088C51B84B3DF0864F47B5148F",
126-
"algorithm": "sha256"
127-
},
128-
{
129-
"id": "github_release/github.com/kubernetes-sigs/kustomize/kustomize/v5.6.0/kustomize_v5.6.0_linux_arm64.tar.gz",
130-
"checksum": "AD8AB62D4F6D59A8AFDA0EEC4BA2E5CD2F86BF1AFEEA4B78D06DAAC945EB0660",
131-
"algorithm": "sha256"
132-
},
133-
{
134-
"id": "github_release/github.com/kubernetes-sigs/kustomize/kustomize/v5.6.0/kustomize_v5.6.0_windows_amd64.zip",
135-
"checksum": "F21D94E9660B4F11A47C4FDC26B936D513F8AADA879E5C53553ABD27369EF3A1",
136-
"algorithm": "sha256"
137-
},
138-
{
139-
"id": "github_release/github.com/kubernetes-sigs/kustomize/kustomize/v5.6.0/kustomize_v5.6.0_windows_arm64.zip",
140-
"checksum": "4E55C1B175659FFFEA12552ACC3D748387ECB49808B10458B5C9173777D70239",
141-
"algorithm": "sha256"
142-
},
143-
{
144-
"id": "github_release/github.com/kubernetes-sigs/kustomize/kustomize/v5.7.1/kustomize_v5.7.1_darwin_amd64.tar.gz",
145-
"checksum": "4A0DFF80C5644DF6BC8F51B342842969004CB6BA5F94DDDAABBEA7483493273D",
146-
"algorithm": "sha256"
147-
},
148-
{
149-
"id": "github_release/github.com/kubernetes-sigs/kustomize/kustomize/v5.7.1/kustomize_v5.7.1_darwin_arm64.tar.gz",
150-
"checksum": "073E9D16D5A235E2FF83E62D6B76EDB5D962ADBC33BE1E4860C4B3F1F39B33B9",
151-
"algorithm": "sha256"
152-
},
153-
{
154-
"id": "github_release/github.com/kubernetes-sigs/kustomize/kustomize/v5.7.1/kustomize_v5.7.1_linux_amd64.tar.gz",
155-
"checksum": "EA375E7372F9AA029129D4B2D16C66B7750B7F1213C4F66F910D981C895818D8",
156-
"algorithm": "sha256"
157-
},
158-
{
159-
"id": "github_release/github.com/kubernetes-sigs/kustomize/kustomize/v5.7.1/kustomize_v5.7.1_linux_arm64.tar.gz",
160-
"checksum": "4261A040217DF3BD6896597C3986D1465925726E4F22A945304B5233A4DCDBDA",
161-
"algorithm": "sha256"
162-
},
163-
{
164-
"id": "github_release/github.com/kubernetes-sigs/kustomize/kustomize/v5.7.1/kustomize_v5.7.1_windows_amd64.zip",
165-
"checksum": "4704F8B47582C1C52BF76A50B37178F7F7DE17F892713794A8BF44B01B50E0CE",
166-
"algorithm": "sha256"
167-
},
168-
{
169-
"id": "github_release/github.com/kubernetes-sigs/kustomize/kustomize/v5.7.1/kustomize_v5.7.1_windows_arm64.zip",
170-
"checksum": "D838872FFD5EFCD240E6B308A7899B2BB537352B2EB99A6B3FBB023DF9CA7C0D",
171-
"algorithm": "sha256"
172-
},
173-
{
174-
"id": "registries/github_content/github.com/aquaproj/aqua-registry/v4.331.1/registry.yaml",
175-
"checksum": "4B35CFEA118CA7CED9D3F218C556C98954810C3116B4000DEFF22782A392A5F0",
176-
"algorithm": "sha256"
177-
},
178-
{
179-
"id": "registries/github_content/github.com/aquaproj/aqua-registry/v4.403.0/registry.yaml",
180-
"checksum": "76BAA90A21FCD5AAAF0CB309CD10B7CA5442BCE53BEF4DFCC06B706841EB6130",
119+
"id": "registries/github_content/github.com/aquaproj/aqua-registry/v4.524.0/registry.yaml",
120+
"checksum": "1A8FB074F184555E3E370F26D1026EDAC34377D3B9666EFAD2504EFC940BDF51",
181121
"algorithm": "sha256"
182122
}
183123
]

‎aqua.yaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
# - all
99
registries:
1010
- type: standard
11-
ref: v4.403.0 # renovate: depName=aquaproj/aqua-registry
11+
ref: v4.524.0 # renovate: depName=aquaproj/aqua-registry
1212
packages:
13-
- name: kubernetes-sigs/kind@v0.29.0
14-
- name: kubernetes-sigs/kustomize@kustomize/v5.7.1
15-
- name: golangci/golangci-lint@v2.4.0
13+
- name: kubernetes-sigs/kind@v0.32.0
14+
- name: kubernetes-sigs/kustomize@kustomize/v5.8.1
15+
- name: golangci/golangci-lint@v2.12.2
16+
- name: suzuki-shunsuke/pinact@v4.1.0

‎cmd/photon-agent/main.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ var (
3232
logFormat string
3333
databaseURL string
3434
listenIP string
35+
defaultLanguage string
3536
updateStrategy string
3637
downloadSpeedLimitBytesPerSec string
3738
ioSpeedLimitBytesPerSec string
@@ -55,6 +56,7 @@ func main() {
5556
flag.StringVar(&photonDir, "photon-dir", getEnv("PHOTON_AGENT_PHOTON_DIR", "/photon"), "directory to store the Photon data")
5657
flag.StringVar(&updateStrategy, "update-strategy", getEnv("PHOTON_AGENT_UPDATE_STRATEGY", string(updater.DefaultUpdateStrategy)), "update strategy for the Photon database")
5758
flag.StringVar(&listenIP, "photon-listen-ip", getEnv("PHOTON_AGENT_PHOTON_LISTEN_IP", "127.0.0.1"), "IP address to listen on by photon")
59+
flag.StringVar(&defaultLanguage, "photon-default-language", getEnv("PHOTON_AGENT_PHOTON_DEFAULT_LANGUAGE", "en"), "default language for the Photon server")
5860

5961
// Speed limit options
6062
flag.StringVar(&downloadSpeedLimitBytesPerSec, "download-speed-limit", getEnv("PHOTON_AGENT_DOWNLOAD_SPEED_LIMIT", ""), "download speed limit in bytes per second (e.g. 10MB). default is unlimited")
@@ -110,6 +112,7 @@ func innerMain(ctx context.Context) error {
110112
ua := unarchiver.NewUnarchiver(unarchiverOptions...)
111113
photonServer := photon.NewPhotonServer(ctx, photonJarPath, photonDir, photon.WithArgs(
112114
"-listen-ip", listenIP,
115+
"-default-language", defaultLanguage,
113116
))
114117
photonDataDir := filepath.Join(photonDir, "photon_data")
115118
migrator := photondata.NewMigrator(photonDataDir, httpClient)

‎examples/kubernetes/01-sts.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ spec:
3838
valueFrom:
3939
fieldRef:
4040
fieldPath: status.podIP
41+
# Photon v1.2.0 or later accepts the default language for geocoding results. The default is "en" (English).
42+
- name: PHOTON_AGENT_PHOTON_DEFAULT_LANGUAGE
43+
value: ja
4144
volumeMounts:
4245
- mountPath: /photon/photon_data
4346
name: photon-data

0 commit comments

Comments
 (0)