Skip to content

Commit

Permalink
Update operator-sdk to 0.17.0 and fix issues for Kube 1.18
Browse files Browse the repository at this point in the history
  • Loading branch information
vboulineau authored and clamoriniere committed May 26, 2020
1 parent 04f8786 commit f808ba5
Show file tree
Hide file tree
Showing 618 changed files with 60,030 additions and 34,636 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.13
- name: Set up Go
uses: actions/setup-go@v1
with:
go-version: 1.13
go-version: 1.14
id: go
- name: install requiere packages
uses: mstksg/get-package@v1
Expand All @@ -31,9 +31,9 @@ jobs:
run: |
make validate
- name: setup kind
uses: engineerd/setup-kind@v0.1.0
uses: engineerd/setup-kind@v0.3.0
with:
version: "v0.7.0"
version: "v0.8.1"
config: test/cluster-kind.yaml
- name: Run E2E
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
name: Set up Go
uses: actions/setup-go@v1
with:
go-version: 1.13.x
go-version: 1.14
-
name: Get tag
uses: olegtarasov/get-tag@v2
Expand Down
30 changes: 14 additions & 16 deletions LICENSE-3rdparty.csv
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ core,"github.com/PuerkitoBio/purell",NewBSD
core,"github.com/PuerkitoBio/urlesc",NewBSD
core,"github.com/beorn7/perks/quantile",MIT
core,"github.com/cenkalti/backoff",MIT
core,"github.com/cespare/xxhash/v2",MIT
core,"github.com/davecgh/go-spew/spew",ISC
core,"github.com/dgrijalva/jwt-go",MIT
core,"github.com/docker/spdystream",Apache-2.0
Expand All @@ -33,7 +34,6 @@ core,"github.com/go-openapi/jsonreference",Apache-2.0
core,"github.com/go-openapi/spec",Apache-2.0
core,"github.com/go-openapi/swag",Apache-2.0
core,"github.com/gobuffalo/envy",MIT
core,"github.com/gobuffalo/flect",MIT
core,"github.com/goccy/go-yaml/ast",MIT
core,"github.com/goccy/go-yaml/lexer",MIT
core,"github.com/goccy/go-yaml/printer",MIT
Expand Down Expand Up @@ -78,6 +78,7 @@ core,"github.com/joho/godotenv",MIT
core,"github.com/json-iterator/go",MIT
core,"github.com/konsorten/go-windows-terminal-sequences",MIT
core,"github.com/kylelemons/godebug/diff",Apache-2.0
core,"github.com/liggitt/tabwriter",NewBSD
core,"github.com/mailru/easyjson/buffer",MIT
core,"github.com/mailru/easyjson/jlexer",MIT
core,"github.com/mailru/easyjson/jwriter",MIT
Expand All @@ -101,14 +102,13 @@ core,"github.com/operator-framework/operator-sdk/internal/scaffold/internal/deps
core,"github.com/operator-framework/operator-sdk/internal/util/fileutil",Apache-2.0
core,"github.com/operator-framework/operator-sdk/internal/util/k8sutil",Apache-2.0
core,"github.com/operator-framework/operator-sdk/internal/util/projutil",Apache-2.0
core,"github.com/operator-framework/operator-sdk/internal/util/yamlutil",Apache-2.0
core,"github.com/operator-framework/operator-sdk/pkg/k8sutil",Apache-2.0
core,"github.com/operator-framework/operator-sdk/pkg/leader",Apache-2.0
core,"github.com/operator-framework/operator-sdk/pkg/log/zap",Apache-2.0
core,"github.com/operator-framework/operator-sdk/pkg/restmapper",Apache-2.0
core,"github.com/operator-framework/operator-sdk/pkg/test",Apache-2.0
core,"github.com/operator-framework/operator-sdk/pkg/test/e2eutil",Apache-2.0
core,"github.com/operator-framework/operator-sdk/version",Apache-2.0
core,"github.com/pborman/uuid",NewBSD
core,"github.com/peterbourgon/diskv",MIT
core,"github.com/pierrec/lz4",NewBSD
core,"github.com/pierrec/lz4/internal/xxh32",NewBSD
Expand All @@ -123,6 +123,7 @@ core,"github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg",Apache-2
core,"github.com/prometheus/common/model",Apache-2.0
core,"github.com/prometheus/procfs",Apache-2.0
core,"github.com/prometheus/procfs/internal/fs",Apache-2.0
core,"github.com/prometheus/procfs/internal/util",Apache-2.0
core,"github.com/rogpeppe/go-internal/modfile",NewBSD
core,"github.com/rogpeppe/go-internal/module",NewBSD
core,"github.com/rogpeppe/go-internal/semver",NewBSD
Expand All @@ -149,6 +150,8 @@ core,"go.uber.org/zap/internal/color",MIT
core,"go.uber.org/zap/internal/exit",MIT
core,"go.uber.org/zap/zapcore",MIT
core,"golang.org/x/crypto/ssh/terminal",NewBSD
core,"golang.org/x/mod/module",NewBSD
core,"golang.org/x/mod/semver",NewBSD
core,"golang.org/x/net/context",NewBSD
core,"golang.org/x/net/context/ctxhttp",NewBSD
core,"golang.org/x/net/http/httpguts",NewBSD
Expand All @@ -175,17 +178,11 @@ core,"golang.org/x/text/unicode/norm",NewBSD
core,"golang.org/x/text/width",NewBSD
core,"golang.org/x/time/rate",NewBSD
core,"golang.org/x/tools/go/ast/astutil",NewBSD
core,"golang.org/x/tools/go/gcexportdata",NewBSD
core,"golang.org/x/tools/go/internal/gcimporter",NewBSD
core,"golang.org/x/tools/go/internal/packagesdriver",NewBSD
core,"golang.org/x/tools/go/packages",NewBSD
core,"golang.org/x/tools/imports",NewBSD
core,"golang.org/x/tools/internal/fastwalk",NewBSD
core,"golang.org/x/tools/internal/gocommand",NewBSD
core,"golang.org/x/tools/internal/gopathwalk",NewBSD
core,"golang.org/x/tools/internal/imports",NewBSD
core,"golang.org/x/tools/internal/module",NewBSD
core,"golang.org/x/tools/internal/semver",NewBSD
core,"golang.org/x/tools/internal/span",NewBSD
core,"golang.org/x/xerrors",NewBSD
core,"golang.org/x/xerrors/internal",NewBSD
core,"gomodules.xyz/jsonpatch/v2",Apache-2.0
Expand Down Expand Up @@ -226,8 +223,10 @@ core,"k8s.io/api/coordination/v1",Apache-2.0
core,"k8s.io/api/coordination/v1beta1",Apache-2.0
core,"k8s.io/api/core/v1",Apache-2.0
core,"k8s.io/api/discovery/v1alpha1",Apache-2.0
core,"k8s.io/api/discovery/v1beta1",Apache-2.0
core,"k8s.io/api/events/v1beta1",Apache-2.0
core,"k8s.io/api/extensions/v1beta1",Apache-2.0
core,"k8s.io/api/flowcontrol/v1alpha1",Apache-2.0
core,"k8s.io/api/networking/v1",Apache-2.0
core,"k8s.io/api/networking/v1beta1",Apache-2.0
core,"k8s.io/api/node/v1alpha1",Apache-2.0
Expand Down Expand Up @@ -275,6 +274,7 @@ core,"k8s.io/apimachinery/pkg/types",Apache-2.0
core,"k8s.io/apimachinery/pkg/util/cache",Apache-2.0
core,"k8s.io/apimachinery/pkg/util/clock",Apache-2.0
core,"k8s.io/apimachinery/pkg/util/diff",Apache-2.0
core,"k8s.io/apimachinery/pkg/util/duration",Apache-2.0
core,"k8s.io/apimachinery/pkg/util/errors",Apache-2.0
core,"k8s.io/apimachinery/pkg/util/framer",Apache-2.0
core,"k8s.io/apimachinery/pkg/util/httpstream",Apache-2.0
Expand All @@ -284,6 +284,7 @@ core,"k8s.io/apimachinery/pkg/util/json",Apache-2.0
core,"k8s.io/apimachinery/pkg/util/mergepatch",Apache-2.0
core,"k8s.io/apimachinery/pkg/util/naming",Apache-2.0
core,"k8s.io/apimachinery/pkg/util/net",Apache-2.0
core,"k8s.io/apimachinery/pkg/util/rand",Apache-2.0
core,"k8s.io/apimachinery/pkg/util/remotecommand",Apache-2.0
core,"k8s.io/apimachinery/pkg/util/runtime",Apache-2.0
core,"k8s.io/apimachinery/pkg/util/sets",Apache-2.0
Expand Down Expand Up @@ -339,8 +340,10 @@ core,"k8s.io/client-go/kubernetes/typed/coordination/v1",Apache-2.0
core,"k8s.io/client-go/kubernetes/typed/coordination/v1beta1",Apache-2.0
core,"k8s.io/client-go/kubernetes/typed/core/v1",Apache-2.0
core,"k8s.io/client-go/kubernetes/typed/discovery/v1alpha1",Apache-2.0
core,"k8s.io/client-go/kubernetes/typed/discovery/v1beta1",Apache-2.0
core,"k8s.io/client-go/kubernetes/typed/events/v1beta1",Apache-2.0
core,"k8s.io/client-go/kubernetes/typed/extensions/v1beta1",Apache-2.0
core,"k8s.io/client-go/kubernetes/typed/flowcontrol/v1alpha1",Apache-2.0
core,"k8s.io/client-go/kubernetes/typed/networking/v1",Apache-2.0
core,"k8s.io/client-go/kubernetes/typed/networking/v1beta1",Apache-2.0
core,"k8s.io/client-go/kubernetes/typed/node/v1alpha1",Apache-2.0
Expand Down Expand Up @@ -459,6 +462,7 @@ core,"sigs.k8s.io/controller-runtime/pkg/manager",Apache-2.0
core,"sigs.k8s.io/controller-runtime/pkg/manager/signals",Apache-2.0
core,"sigs.k8s.io/controller-runtime/pkg/metrics",Apache-2.0
core,"sigs.k8s.io/controller-runtime/pkg/predicate",Apache-2.0
core,"sigs.k8s.io/controller-runtime/pkg/ratelimiter",Apache-2.0
core,"sigs.k8s.io/controller-runtime/pkg/reconcile",Apache-2.0
core,"sigs.k8s.io/controller-runtime/pkg/recorder",Apache-2.0
core,"sigs.k8s.io/controller-runtime/pkg/runtime/inject",Apache-2.0
Expand All @@ -472,12 +476,6 @@ core,"sigs.k8s.io/controller-runtime/pkg/webhook",Apache-2.0
core,"sigs.k8s.io/controller-runtime/pkg/webhook/admission",Apache-2.0
core,"sigs.k8s.io/controller-runtime/pkg/webhook/internal/certwatcher",Apache-2.0
core,"sigs.k8s.io/controller-runtime/pkg/webhook/internal/metrics",Apache-2.0
core,"sigs.k8s.io/controller-tools/pkg/crd",Apache-2.0
core,"sigs.k8s.io/controller-tools/pkg/crd/markers",Apache-2.0
core,"sigs.k8s.io/controller-tools/pkg/genall",Apache-2.0
core,"sigs.k8s.io/controller-tools/pkg/loader",Apache-2.0
core,"sigs.k8s.io/controller-tools/pkg/markers",Apache-2.0
core,"sigs.k8s.io/controller-tools/pkg/version",Apache-2.0
core,"sigs.k8s.io/kustomize/pkg/commands/build",Apache-2.0
core,"sigs.k8s.io/kustomize/pkg/constants",Apache-2.0
core,"sigs.k8s.io/kustomize/pkg/expansion",Apache-2.0
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ test:

e2e:
kubectl apply -f deploy/datadoghq_v1alpha1_extendeddaemonset_crd.yaml
./bin/operator-sdk test local --verbose ./test/e2e --image $(PREFIX):$(TAG)
./bin/operator-sdk test local ./test/e2e --go-test-flags '-v' --image $(PREFIX):$(TAG)

push: container
docker push $(PREFIX):$(TAG)
Expand Down
2 changes: 2 additions & 0 deletions chart/datadog-operator/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ spec:
value: {{ .Chart.Name }}
args:
- --zap-level={{ .Values.logLevel }}
- --zap-encoder=console
- --zap-stacktrace-level=error
- "--supportExtendedDaemonset={{ .Values.supportExtendedDaemonset}}"
- "--probesPort={{ .Values.probesPort }}"
- "--metricsPort={{ .Values.metricsPort }}"
Expand Down
4 changes: 2 additions & 2 deletions cmd/manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"github.com/operator-framework/operator-sdk/pkg/k8sutil"
"github.com/operator-framework/operator-sdk/pkg/leader"
"github.com/operator-framework/operator-sdk/pkg/log/zap"
"github.com/operator-framework/operator-sdk/pkg/restmapper"
"github.com/spf13/pflag"
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
"sigs.k8s.io/controller-runtime/pkg/client/config"
"sigs.k8s.io/controller-runtime/pkg/manager"
logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
Expand Down Expand Up @@ -107,7 +107,7 @@ func main() {
// Create a new Cmd to provide shared dependencies and start components
mgr, err := manager.New(cfg, manager.Options{
Namespace: namespace,
MapperProvider: restmapper.NewDynamicRESTMapper,
MapperProvider: apiutil.NewDiscoveryRESTMapper,
MetricsBindAddress: fmt.Sprintf("%s:%d", metricsHost, metricsPort),
})
if err != nil {
Expand Down

0 comments on commit f808ba5

Please sign in to comment.