Skip to content

Commit c473311

Browse files
toughnoahtoughnoah
authored
Merge pull request #69 from toughnoah/qa
Qa
2 parents 5add766 + fd84ed6 commit c473311

20 files changed

+143
-348
lines changed

‎.github/workflows/test-coverage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
go-version: 1.15
2020

2121
- name: Test
22-
run: go test $(go list ./... | grep -v elastalert/controllers/test/e2e) -race -coverprofile=coverage.txt -covermode=atomic -gcflags=-l
22+
run: go test $(go list ./... | grep -v github.com/toughnoah/elastalert-operator/controllers/test/e2e) -race -coverprofile=coverage.txt -covermode=atomic -gcflags=-l
2323
- name: "upload test coverage report"
2424
env:
2525
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

‎PROJECT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ resources:
1414
domain: noah.domain
1515
group: es
1616
kind: Elastalert
17-
path: elastalert/api/v1alpha1
17+
path: github.com/toughnoah/elastalert-operator/api/v1alpha1
1818
version: v1alpha1
1919
version: "3"

‎controllers/deployment_controller_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package controllers
22

33
import (
44
"context"
5-
"elastalert/api/v1alpha1"
6-
"elastalert/controllers/observer"
7-
"elastalert/controllers/podspec"
85
"errors"
96
"github.com/bouk/monkey"
107
"github.com/stretchr/testify/assert"
118
"github.com/stretchr/testify/require"
9+
"github.com/toughnoah/elastalert-operator/api/v1alpha1"
10+
"github.com/toughnoah/elastalert-operator/controllers/observer"
11+
"github.com/toughnoah/elastalert-operator/controllers/podspec"
1212
appsv1 "k8s.io/api/apps/v1"
1313
corev1 "k8s.io/api/core/v1"
1414
k8serrors "k8s.io/apimachinery/pkg/api/errors"

‎controllers/deployment_controllers.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package controllers
22

33
import (
44
"context"
5-
esv1alpha1 "elastalert/api/v1alpha1"
6-
ob "elastalert/controllers/observer"
7-
"elastalert/controllers/podspec"
5+
esv1alpha1 "github.com/toughnoah/elastalert-operator/api/v1alpha1"
6+
ob "github.com/toughnoah/elastalert-operator/controllers/observer"
7+
"github.com/toughnoah/elastalert-operator/controllers/podspec"
88
appsv1 "k8s.io/api/apps/v1"
99
k8serrors "k8s.io/apimachinery/pkg/api/errors"
1010
"k8s.io/apimachinery/pkg/runtime"

‎controllers/elastalert_controller.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ package controllers
1818

1919
import (
2020
"context"
21-
esv1alpha1 "elastalert/api/v1alpha1"
22-
"elastalert/controllers/event"
23-
ob "elastalert/controllers/observer"
24-
"elastalert/controllers/podspec"
21+
esv1alpha1 "github.com/toughnoah/elastalert-operator/api/v1alpha1"
22+
"github.com/toughnoah/elastalert-operator/controllers/event"
23+
ob "github.com/toughnoah/elastalert-operator/controllers/observer"
24+
"github.com/toughnoah/elastalert-operator/controllers/podspec"
2525
appsv1 "k8s.io/api/apps/v1"
2626
corev1 "k8s.io/api/core/v1"
2727
k8serrors "k8s.io/apimachinery/pkg/api/errors"

‎controllers/elastalert_controller_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ package controllers
22

33
import (
44
"context"
5-
"elastalert/api/v1alpha1"
6-
ob "elastalert/controllers/observer"
7-
"elastalert/controllers/podspec"
85
"errors"
96
"fmt"
107
"github.com/bouk/monkey"
118
"github.com/stretchr/testify/assert"
129
"github.com/stretchr/testify/require"
10+
"github.com/toughnoah/elastalert-operator/api/v1alpha1"
11+
ob "github.com/toughnoah/elastalert-operator/controllers/observer"
12+
"github.com/toughnoah/elastalert-operator/controllers/podspec"
1313
appsv1 "k8s.io/api/apps/v1"
1414
corev1 "k8s.io/api/core/v1"
1515
k8serrors "k8s.io/apimachinery/pkg/api/errors"

‎controllers/observer/observer.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package observer
22

33
import (
44
"context"
5-
esv1alpha1 "elastalert/api/v1alpha1"
6-
"elastalert/controllers/event"
7-
"elastalert/controllers/podspec"
85
"fmt"
6+
esv1alpha1 "github.com/toughnoah/elastalert-operator/api/v1alpha1"
7+
"github.com/toughnoah/elastalert-operator/controllers/event"
8+
"github.com/toughnoah/elastalert-operator/controllers/podspec"
99
appsv1 "k8s.io/api/apps/v1"
1010
corev1 "k8s.io/api/core/v1"
1111
"k8s.io/apimachinery/pkg/api/meta"

‎controllers/observer/observer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package observer
22

33
import (
44
"context"
5-
"elastalert/api/v1alpha1"
65
. "github.com/onsi/ginkgo"
76
. "github.com/onsi/gomega"
7+
"github.com/toughnoah/elastalert-operator/api/v1alpha1"
88
appsv1 "k8s.io/api/apps/v1"
99
corev1 "k8s.io/api/core/v1"
1010
"k8s.io/apimachinery/pkg/api/resource"

‎controllers/podspec/configmap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package podspec
22

33
import (
4-
esv1alpha1 "elastalert/api/v1alpha1"
54
"errors"
65
"fmt"
6+
esv1alpha1 "github.com/toughnoah/elastalert-operator/api/v1alpha1"
77
"gopkg.in/yaml.v2"
88
corev1 "k8s.io/api/core/v1"
99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎controllers/podspec/configmap_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package podspec
22

33
import (
4-
esv1alpha1 "elastalert/api/v1alpha1"
54
"github.com/stretchr/testify/require"
5+
esv1alpha1 "github.com/toughnoah/elastalert-operator/api/v1alpha1"
66
"gopkg.in/yaml.v2"
77
corev1 "k8s.io/api/core/v1"
88
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎controllers/podspec/deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package podspec
22

33
import (
4-
"elastalert/api/v1alpha1"
4+
"github.com/toughnoah/elastalert-operator/api/v1alpha1"
55
appsv1 "k8s.io/api/apps/v1"
66
corev1 "k8s.io/api/core/v1"
77
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎controllers/podspec/deployment_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package podspec
22

33
import (
4-
"elastalert/api/v1alpha1"
54
"github.com/bouk/monkey"
65
"github.com/stretchr/testify/require"
6+
"github.com/toughnoah/elastalert-operator/api/v1alpha1"
77
appsv1 "k8s.io/api/apps/v1"
88
v1 "k8s.io/api/core/v1"
99
"k8s.io/apimachinery/pkg/api/resource"

‎controllers/podspec/podtemplate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package podspec
22

33
import (
4-
"elastalert/api/v1alpha1"
4+
"github.com/toughnoah/elastalert-operator/api/v1alpha1"
55
corev1 "k8s.io/api/core/v1"
66
"time"
77
)

‎controllers/podspec/secert_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package podspec
22

33
import (
4-
"elastalert/api/v1alpha1"
54
"github.com/stretchr/testify/require"
5+
"github.com/toughnoah/elastalert-operator/api/v1alpha1"
66
v1 "k8s.io/api/core/v1"
77
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
88
"k8s.io/client-go/kubernetes/scheme"

‎controllers/podspec/secret.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package podspec
22

33
import (
4-
esv1alpha1 "elastalert/api/v1alpha1"
4+
esv1alpha1 "github.com/toughnoah/elastalert-operator/api/v1alpha1"
55
corev1 "k8s.io/api/core/v1"
66
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
77
"k8s.io/apimachinery/pkg/runtime"

‎controllers/test/e2e/deploy_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package e2e
33
import (
44
"bytes"
55
"context"
6-
"elastalert/api/v1alpha1"
76
. "github.com/onsi/ginkgo"
87
. "github.com/onsi/gomega"
8+
"github.com/toughnoah/elastalert-operator/api/v1alpha1"
99
"gopkg.in/yaml.v2"
1010
appsv1 "k8s.io/api/apps/v1"
1111
v1 "k8s.io/api/core/v1"

‎controllers/test/e2e/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232
logf "sigs.k8s.io/controller-runtime/pkg/log"
3333
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3434

35-
esv1alpha1 "elastalert/api/v1alpha1"
35+
esv1alpha1 "github.com/toughnoah/elastalert-operator/api/v1alpha1"
3636
//+kubebuilder:scaffold:imports
3737
)
3838

‎go.mod

Lines changed: 10 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,17 @@
1-
module elastalert
1+
module github.com/toughnoah/elastalert-operator
22

3-
go 1.15
3+
go 1.16
4+
5+
replace github.com/bouk/monkey v1.0.2 => bou.ke/monkey v1.0.0
46

57
require (
68
github.com/bouk/monkey v1.0.2
7-
github.com/go-logr/zapr v0.4.0 // indirect
8-
github.com/gogo/protobuf v1.3.2 // indirect
9-
github.com/google/go-cmp v0.5.5 // indirect
10-
github.com/google/gofuzz v1.2.0 // indirect
11-
github.com/google/uuid v1.2.0 // indirect
12-
github.com/googleapis/gnostic v0.5.3 // indirect
13-
github.com/imdario/mergo v0.3.12 // indirect
14-
github.com/onsi/ginkgo v1.14.1
15-
github.com/onsi/gomega v1.10.2
16-
github.com/prometheus/client_golang v1.9.0 // indirect
17-
github.com/prometheus/procfs v0.3.0 // indirect
9+
github.com/onsi/ginkgo v1.16.4
10+
github.com/onsi/gomega v1.14.0
1811
github.com/stretchr/testify v1.7.0
19-
go.uber.org/multierr v1.6.0 // indirect
20-
go.uber.org/zap v1.16.0 // indirect
21-
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
22-
golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect
23-
golang.org/x/oauth2 v0.0.0-20210113205817-d3ed898aa8a3 // indirect
24-
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect
25-
golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect
26-
golang.org/x/text v0.3.5 // indirect
27-
golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
28-
google.golang.org/appengine v1.6.7 // indirect
2912
gopkg.in/yaml.v2 v2.4.0
30-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
31-
k8s.io/api v0.20.2
32-
k8s.io/apiextensions-apiserver v0.20.2 // indirect
33-
k8s.io/apimachinery v0.20.2
34-
k8s.io/client-go v0.20.2
35-
k8s.io/klog/v2 v2.8.0 // indirect
36-
k8s.io/kube-openapi v0.0.0-20210113233702-8566a335510f // indirect
37-
sigs.k8s.io/controller-runtime v0.8.3
13+
k8s.io/api v0.21.3
14+
k8s.io/apimachinery v0.21.3
15+
k8s.io/client-go v0.21.3
16+
sigs.k8s.io/controller-runtime v0.9.5
3817
)
39-
40-
replace github.com/bouk/monkey v1.0.2 => bou.ke/monkey v1.0.0

0 commit comments

Comments
 (0)