Skip to content

Commit 46dff7c

Browse files
authored
Merge pull request #54 from giusdp/main
Fix network for worker RUNTIME_NETWORK env var
2 parents e4c2b57 + 4171732 commit 46dff7c

4 files changed

Lines changed: 118 additions & 2 deletions

File tree

.cz.toml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
[tool]
19+
[tool.commitizen]
20+
name = "cz_conventional_commits"
21+
version = "0.1.0"
22+
tag_format = "v$version"

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
strategy:
3939
matrix:
4040
# build and publish in parallel: linux/amd64, linux/arm64, windows/amd64, darwin/amd64, darwin/arm64
41-
goos: [linux, windows, darwin]
41+
goos: [linux]
4242
goarch: [amd64, arm64]
4343
exclude:
4444
- goarch: arm64

CHANGELOG.md

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
<!--
2+
~ Licensed to the Apache Software Foundation (ASF) under one
3+
~ or more contributor license agreements. See the NOTICE file
4+
~ distributed with this work for additional information
5+
~ regarding copyright ownership. The ASF licenses this file
6+
~ to you under the Apache License, Version 2.0 (the
7+
~ "License"); you may not use this file except in compliance
8+
~ with the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing,
13+
~ software distributed under the License is distributed on an
14+
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
~ KIND, either express or implied. See the License for the
16+
~ specific language governing permissions and limitations
17+
~ under the License.
18+
-->
19+
20+
## v0.1.0 (2022-09-17)
21+
22+
### Feat
23+
24+
- **dev**: bind logs to host folder
25+
- **log**: add DisableAnimation in log builder
26+
- **admin-dev**: add internal network for worker+runtimes in dev deployment
27+
- add 'a' alias for admin cmd
28+
- **log**: add parametric writer for logger
29+
- add invoke, create and delete fn subcommands
30+
- **admin-deploy**: reset sub command to remove local deployment
31+
- **admin-deploy**: give proper names to fl containers
32+
- **admin-deploy**: deploy containers attached on fl_net network
33+
- **admin**: start core and worker container with admin deploy
34+
- add version flag (-v or --version)
35+
- **main**: add version flag
36+
- wire logger into cli tool and use preflights in admin deploy
37+
- **log**: introduce log pkg that wraps spinner
38+
- add docker pkg to run preflight tests
39+
- add sample admin command with spinner
40+
- create client and fn service in main and bind it to kong
41+
- **fn**: use FnService.Invoke when cmd fn is used
42+
- **FnService**: add FnService with simple Invoke
43+
- **client**: add send method and remove interface
44+
- **client**: add an initial client package
45+
- setup kong library with sample cli main
46+
- create go project
47+
48+
### Fix
49+
50+
- **deploy-local**: pass correct network to worker RUNTIME_NETWORK env var
51+
- **reset**: update reset with new deployer
52+
- **license**: add license header
53+
- **log**: don't clear currentMessage in StopSpinner
54+
- **license**: add license header
55+
- task install file and error warning
56+
- **fn**: extract error content from swagger errors
57+
- **deploy_local**: remove protocol from docker_host value in deployment
58+
- **admin-deploy**: mount docker socket in container
59+
- **license**: add license header
60+
- **log**: return correct err in StopSpinner
61+
- **log**: add license header
62+
- **log**: add err handling for spinner start and stop
63+
- **license**: add license headers
64+
- **admin**: fix logging and add image pulling
65+
- **Taskfile.yml**: fix paths
66+
- **spinner**: add missing license header
67+
68+
### Refactor
69+
70+
- merge remove networks to reflect the setup
71+
- **reset**: add reset functions to deployer interface
72+
- **dev**: deployer arch and tests output
73+
- **logs**: add testing mode for log and missing tests
74+
- **admin**: remove init token and join
75+
- **admin**: break admin subcmds in files
76+
- **command**: move admin and fn in their own packages
77+
- move private cli code in internal folder
78+
- **go.mod**: change module name from funless-cli to fl-cli
79+
- **fn**: remove writer from fn functions, add logger as parameter
80+
- add writer and context as parameters for fn
81+
- **client**: remove unused functions and tests in client
82+
- **deploy_local**: move docker host code in utils function
83+
- re-organize deploy code in admin pkg
84+
- **admin-deploy**: remove preflight checks and start refact admin cmd
85+
- **constants**: use latest tag for docker images
86+
- **log**: builder pattern with tests
87+
- **logs**: change log message style with a spinner each step
88+
- **docker-package**: move shell interface in its file
89+
- **log.go**: add DEBUG prefix for debug messages
90+
- change log writer to fmt
91+
- **preflight**: use the logger to print preflight status
92+
- project structure refactor
93+
- **license**: add license header to new files
94+
- **client**: refactor client.go and reduce clientAPI to just get request

pkg/deploy/local.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func (d *LocalDeployer) StartWorker(ctx context.Context) error {
160160

161161
containerConfig := &container.Config{
162162
Image: pkg.FLWorker,
163-
Env: []string{"RUNTIME_NETWORK=" + d.flNetName},
163+
Env: []string{"RUNTIME_NETWORK=" + d.flRuntimeNetName},
164164
}
165165

166166
hostConf := &container.HostConfig{

0 commit comments

Comments
 (0)