Skip to content

move zap flags internally #3525

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.

Sign up for GitHub

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

Merged
joelanford merged 1 commit into from
Jul 24, 2020
Merged

move zap flags internally #3525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 34 additions & 0 deletions changelog/fragments/move-log-internally.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# entries is a list of entries to include in
# release notes and/or the migration guide
entries:
- description: >
Moved `pkg/log/zap` to `internal/log/zap`, therefore it is no
longer a public API.

# kind is one of:
# - addition
# - change
# - deprecation
# - removal
# - bugfix
kind: "removal"

# Is this a breaking change?
breaking: true

# NOTE: ONLY USE `pull_request_override` WHEN ADDING THIS
# FILE FOR A PREVIOUSLY MERGED PULL_REQUEST!
#
# The generator auto-detects the PR number from the commit
# message in which this file was originally added.
#
# What is the pull request number (without the "#")?
# pull_request_override: 0


# Migration can be defined to automatically add a section to
# the migration guide. This is required for breaking changes.
migration:
header: pkg/log/zap is no longer a public API
body: >
TBD
2 changes: 1 addition & 1 deletion cmd/ansible-operator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ import (
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/manager/signals"

"github.com/operator-framework/operator-sdk/internal/log/zap"
"github.com/operator-framework/operator-sdk/internal/util/k8sutil"
"github.com/operator-framework/operator-sdk/pkg/ansible/controller"
"github.com/operator-framework/operator-sdk/pkg/ansible/flags"
"github.com/operator-framework/operator-sdk/pkg/ansible/proxy"
"github.com/operator-framework/operator-sdk/pkg/ansible/proxy/controllermap"
"github.com/operator-framework/operator-sdk/pkg/ansible/runner"
"github.com/operator-framework/operator-sdk/pkg/ansible/watches"
"github.com/operator-framework/operator-sdk/pkg/log/zap"
sdkVersion "github.com/operator-framework/operator-sdk/version"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/helm-operator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ import (
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/manager/signals"

"github.com/operator-framework/operator-sdk/internal/log/zap"
"github.com/operator-framework/operator-sdk/internal/util/k8sutil"
"github.com/operator-framework/operator-sdk/pkg/helm/controller"
"github.com/operator-framework/operator-sdk/pkg/helm/flags"
"github.com/operator-framework/operator-sdk/pkg/helm/release"
"github.com/operator-framework/operator-sdk/pkg/helm/watches"
"github.com/operator-framework/operator-sdk/pkg/log/zap"
sdkVersion "github.com/operator-framework/operator-sdk/version"
)

Expand Down
0 pkg/log/zap/flags.go → internal/log/zap/flags.go
View file
Open in desktop
File renamed without changes.
0 pkg/log/zap/flags_test.go → internal/log/zap/flags_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/log/zap/logger.go → internal/log/zap/logger.go
View file
Open in desktop
File renamed without changes.
0 pkg/log/zap/logger_test.go → internal/log/zap/logger_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/ansible/flags/flag.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/spf13/pflag"

"github.com/operator-framework/operator-sdk/pkg/log/zap"
"github.com/operator-framework/operator-sdk/internal/log/zap"
)

// Flags - Options to be used by an ansible operator
Expand Down
2 changes: 1 addition & 1 deletion pkg/helm/flags/flag.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/spf13/pflag"

"github.com/operator-framework/operator-sdk/pkg/log/zap"
"github.com/operator-framework/operator-sdk/internal/log/zap"
)

// Flags - Options to be used by a helm operator
Expand Down