Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use werf to install modules' charts #50

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile-alpine3.9
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ RUN apk --no-cache add ca-certificates jq bash && \
tar -z -x -C /bin -f /helm.tgz --strip-components=1 linux-amd64/helm linux-amd64/tiller && \
rm -f /helm.tgz && \
helm init --client-only && \
mkdir /hooks
wget https://dl.bintray.com/flant/werf/v1.0.4-beta.12/werf-linux-amd64-v1.0.4-beta.12 -O /bin/werf && \
chmod +x /bin/werf
COPY --from=0 /addon-operator/addon-operator /
WORKDIR /
ENV MODULES_DIR /modules
Expand Down
2 changes: 1 addition & 1 deletion HOOKS.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ Binding context is information about the event which caused the hook execution.

The $BINDING_CONTEXT_PATH environment variable contains the path to a file with JSON array of structures with the following fields:

- `binding` is a string from the `name` parameter for `schecdule` or `onKubernetesEvent` or a binding type if parameter is not set and for other hooks. For example, binding context for `beforeAll` hook:
- `binding` is a string from the `name` parameter for `schedule` or `onKubernetesEvent` or a binding type if parameter is not set and for other hooks. For example, binding context for `beforeAll` hook:

```json
[{"binding":"beforeAll"}]
Expand Down
10 changes: 6 additions & 4 deletions cmd/addon-operator/main.go
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package main

import (
"flag"
"fmt"
"os"

"github.com/flant/shell-operator/pkg/executor"
"gopkg.in/alecthomas/kingpin.v2"
log "github.com/sirupsen/logrus"

shell_operator_app "github.com/flant/shell-operator/pkg/app"
"github.com/flant/shell-operator/pkg/executor"
utils_signal "github.com/flant/shell-operator/pkg/utils/signal"

operator "github.com/flant/addon-operator/pkg/addon-operator"
Expand All @@ -19,6 +20,7 @@ func main() {

// global defaults
app.SetupGlobalSettings(kpApp)
shell_operator_app.SetupGlobalSettings(kpApp)

// print version
kpApp.Command("version", "Show version.").Action(func(c *kingpin.ParseContext) error {
Expand All @@ -30,8 +32,8 @@ func main() {
kpApp.Command("start", "Start events processing.").
Default().
Action(func(c *kingpin.ParseContext) error {
// Setting flag.Parsed() for glog.
_ = flag.CommandLine.Parse([]string{})
shell_operator_app.SetupLogging()
log.Infof("%s %s, shell-operator %s", app.AppName, app.Version, shell_operator_app.Version)

// Be a good parent - clean up after the child processes
// in case if addon-operator is a PID 1 process.
Expand Down
16 changes: 8 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@ go 1.12

require (
github.com/evanphx/json-patch v4.5.0+incompatible
github.com/flant/shell-operator v1.0.0-beta.5.0.20190923140739-5f7d9cca9885 // branch: release-1.0
github.com/ghodss/yaml v1.0.0
github.com/go-yaml/yaml v2.1.0+incompatible
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/flant/shell-operator v1.0.0-beta.5.0.20191023161047-91e8e7a8683e // branch: json_logging
github.com/go-openapi/spec v0.19.3
github.com/kennygrant/sanitize v1.2.4
github.com/otiai10/copy v1.0.1
github.com/otiai10/curr v0.0.0-20190513014714-f5a3d24e5776 // indirect
github.com/peterbourgon/mergemap v0.0.0-20130613134717-e21c03b7a721
github.com/prometheus/client_golang v1.0.0
github.com/romana/rlog v0.0.0-20171115192701-f018bc92e7d7
github.com/segmentio/go-camelcase v0.0.0-20160726192923-7085f1e3c734
github.com/stretchr/testify v1.3.0
golang.org/x/tools v0.0.0-20190627033414-4874f863e654 // indirect
github.com/sirupsen/logrus v1.4.2
github.com/stretchr/testify v1.4.0
gopkg.in/alecthomas/kingpin.v2 v2.2.6
gopkg.in/satori/go.uuid.v1 v1.2.0
gopkg.in/yaml.v2 v2.2.2
k8s.io/api v0.0.0-20190409092523-d687e77c8ae9
k8s.io/apimachinery v0.0.0-20190409092423-760d1845f48b
k8s.io/client-go v0.0.0-20190411052641-7a6b4715b709
k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7
sigs.k8s.io/yaml v1.1.0
)

replace github.com/go-openapi/validate => github.com/flant/go-openapi-validate v0.19.4-0.20190926112101-38fbca4ac77f // branch: fix_in_body
157 changes: 113 additions & 44 deletions go.sum

Large diffs are not rendered by default.

Loading