Skip to content

Commit

Permalink
Merge pull request #30 from wandera/maintenance
Browse files Browse the repository at this point in the history
Regular project maintenance
  • Loading branch information
coufalja authored Jun 18, 2020
2 parents 8f5336b + 10addcc commit 5d62ddb
Show file tree
Hide file tree
Showing 19 changed files with 369 additions and 129 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: go
go:
- "1.12.5"
- "1.14.3"
- "master"

notifications:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Builder image
FROM golang:1.12.5 AS builder
FROM golang:1.14.3 AS builder

WORKDIR /build

Expand All @@ -11,7 +11,7 @@ COPY . .
RUN CGO_ENABLED=0 GOOS=linux go build -v -ldflags '-w -s -X 'github.com/wandera/git2kube/cmd.Version=${CACHE_TAG}

# Runtime image
FROM alpine:3.8
FROM alpine:3.12
RUN apk --no-cache add ca-certificates

RUN apk --no-cache --virtual .openssh add openssh \
Expand Down
3 changes: 2 additions & 1 deletion docs/git2kube.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ Commandline tool for loading files from git repository into K8s ConfigMap

```
-h, --help help for git2kube
-l, --log-level string command log level (options: [panic fatal error warning info debug]) (default "info")
-l, --log-level string command log level (options: [panic fatal error warning info debug trace]) (default "info")
```

### SEE ALSO

* [git2kube gendoc](git2kube_gendoc.md) - Generates documentation for this tool in Markdown format
* [git2kube load](git2kube_load.md) - Loads files from git repository into target
* [git2kube version](git2kube_version.md) - Print the version information
* [git2kube watch](git2kube_watch.md) - Runs watcher that periodically check the provided repository

2 changes: 1 addition & 1 deletion docs/git2kube_gendoc.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ git2kube gendoc [flags]
### Options inherited from parent commands

```
-l, --log-level string command log level (options: [panic fatal error warning info debug]) (default "info")
-l, --log-level string command log level (options: [panic fatal error warning info debug trace]) (default "info")
```

### SEE ALSO
Expand Down
2 changes: 1 addition & 1 deletion docs/git2kube_load.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Loads files from git repository into target
### Options inherited from parent commands

```
-l, --log-level string command log level (options: [panic fatal error warning info debug]) (default "info")
-l, --log-level string command log level (options: [panic fatal error warning info debug trace]) (default "info")
```

### SEE ALSO
Expand Down
2 changes: 1 addition & 1 deletion docs/git2kube_load_configmap.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ git2kube load configmap [flags]
--exclude strings regex that if is a match excludes the file from the upload, example: '*.yaml' or 'folder/*' if you want to match a folder (default [^\..*])
-g, --git string git repository address, either http(s) or ssh protocol has to be specified
--include strings regex that if is a match includes the file in the upload, example: '*.yaml' or 'folder/*' if you want to match a folder (default [.*])
-l, --log-level string command log level (options: [panic fatal error warning info debug]) (default "info")
-l, --log-level string command log level (options: [panic fatal error warning info debug trace]) (default "info")
-p, --ssh-key string path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:wandera/git2kube.git)
```

Expand Down
2 changes: 1 addition & 1 deletion docs/git2kube_load_folder.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ git2kube load folder [flags]
--exclude strings regex that if is a match excludes the file from the upload, example: '*.yaml' or 'folder/*' if you want to match a folder (default [^\..*])
-g, --git string git repository address, either http(s) or ssh protocol has to be specified
--include strings regex that if is a match includes the file in the upload, example: '*.yaml' or 'folder/*' if you want to match a folder (default [.*])
-l, --log-level string command log level (options: [panic fatal error warning info debug]) (default "info")
-l, --log-level string command log level (options: [panic fatal error warning info debug trace]) (default "info")
-p, --ssh-key string path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:wandera/git2kube.git)
```

Expand Down
2 changes: 1 addition & 1 deletion docs/git2kube_load_secret.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ git2kube load secret [flags]
--exclude strings regex that if is a match excludes the file from the upload, example: '*.yaml' or 'folder/*' if you want to match a folder (default [^\..*])
-g, --git string git repository address, either http(s) or ssh protocol has to be specified
--include strings regex that if is a match includes the file in the upload, example: '*.yaml' or 'folder/*' if you want to match a folder (default [.*])
-l, --log-level string command log level (options: [panic fatal error warning info debug]) (default "info")
-l, --log-level string command log level (options: [panic fatal error warning info debug trace]) (default "info")
-p, --ssh-key string path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:wandera/git2kube.git)
```

Expand Down
28 changes: 28 additions & 0 deletions docs/git2kube_version.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
## git2kube version

Print the version information

### Synopsis

Print the version information

```
git2kube version [flags]
```

### Options

```
-h, --help help for version
```

### Options inherited from parent commands

```
-l, --log-level string command log level (options: [panic fatal error warning info debug trace]) (default "info")
```

### SEE ALSO

* [git2kube](git2kube.md) - Git to ConfigMap conversion tool

2 changes: 1 addition & 1 deletion docs/git2kube_watch.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Runs watcher that periodically check the provided repository
### Options inherited from parent commands

```
-l, --log-level string command log level (options: [panic fatal error warning info debug]) (default "info")
-l, --log-level string command log level (options: [panic fatal error warning info debug trace]) (default "info")
```

### SEE ALSO
Expand Down
2 changes: 1 addition & 1 deletion docs/git2kube_watch_configmap.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ git2kube watch configmap [flags]
--healthcheck-file string path to file where each refresh writes if it was successful or not, useful for K8s liveness/readiness probe
--include strings regex that if is a match includes the file in the upload, example: '*.yaml' or 'folder/*' if you want to match a folder (default [.*])
-i, --interval int interval in seconds in which to try refreshing ConfigMap from git (default 10)
-l, --log-level string command log level (options: [panic fatal error warning info debug]) (default "info")
-l, --log-level string command log level (options: [panic fatal error warning info debug trace]) (default "info")
-p, --ssh-key string path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:wandera/git2kube.git)
```

Expand Down
2 changes: 1 addition & 1 deletion docs/git2kube_watch_folder.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ git2kube watch folder [flags]
--healthcheck-file string path to file where each refresh writes if it was successful or not, useful for K8s liveness/readiness probe
--include strings regex that if is a match includes the file in the upload, example: '*.yaml' or 'folder/*' if you want to match a folder (default [.*])
-i, --interval int interval in seconds in which to try refreshing ConfigMap from git (default 10)
-l, --log-level string command log level (options: [panic fatal error warning info debug]) (default "info")
-l, --log-level string command log level (options: [panic fatal error warning info debug trace]) (default "info")
-p, --ssh-key string path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:wandera/git2kube.git)
```

Expand Down
2 changes: 1 addition & 1 deletion docs/git2kube_watch_secret.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ git2kube watch secret [flags]
--healthcheck-file string path to file where each refresh writes if it was successful or not, useful for K8s liveness/readiness probe
--include strings regex that if is a match includes the file in the upload, example: '*.yaml' or 'folder/*' if you want to match a folder (default [.*])
-i, --interval int interval in seconds in which to try refreshing ConfigMap from git (default 10)
-l, --log-level string command log level (options: [panic fatal error warning info debug]) (default "info")
-l, --log-level string command log level (options: [panic fatal error warning info debug trace]) (default "info")
-p, --ssh-key string path to the SSH private key (git repository address should be 'git@<address>', example: git@github.com:wandera/git2kube.git)
```

Expand Down
49 changes: 12 additions & 37 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,42 +1,17 @@
module github.com/wandera/git2kube

go 1.14

require (
github.com/cpuguy83/go-md2man v1.0.8 // indirect
github.com/fsnotify/fsnotify v1.4.7 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/gogo/protobuf v1.1.0 // indirect
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a // indirect
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
github.com/go-git/go-git/v5 v5.1.0
github.com/googleapis/gnostic v0.2.0 // indirect
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
github.com/hpcloud/tail v1.0.0 // indirect
github.com/imdario/mergo v0.3.5
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
github.com/onsi/ginkgo v1.6.0 // indirect
github.com/onsi/gomega v1.4.1 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/russross/blackfriday v1.5.1 // indirect
github.com/sirupsen/logrus v1.0.5
github.com/spf13/cobra v0.0.3
github.com/spf13/pflag v1.0.1 // indirect
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793
golang.org/x/oauth2 v0.0.0-20181105165119-ca4130e427c7 // indirect
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f // indirect
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 // indirect
google.golang.org/appengine v1.3.0 // indirect
gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
gopkg.in/fsnotify.v1 v1.4.7 // indirect
gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/src-d/go-git.v4 v4.7.1
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.2.1 // indirect
k8s.io/api v0.0.0-20181102122915-de5c567eef5c
k8s.io/apimachinery v0.0.0-20181101131016-0aa9751e8aaf
k8s.io/client-go v9.0.0+incompatible
k8s.io/kube-openapi v0.0.0-20181031203759-72693cb1fadd // indirect
github.com/imdario/mergo v0.3.9
github.com/sirupsen/logrus v1.6.0
github.com/spf13/cobra v1.0.0
golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9
golang.org/x/net v0.0.0-20200602114024-627f9648deb9 // indirect
golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1 // indirect
k8s.io/api v0.17.3
k8s.io/apimachinery v0.17.3
k8s.io/client-go v0.17.3
)
Loading

0 comments on commit 5d62ddb

Please sign in to comment.