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.

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

*: move pkg/ansible to internal/ansible #3560

Merged
merged 1 commit into from
Jul 27, 2020
Merged

*: move pkg/ansible to internal/ansible #3560

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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ images/scorecard-test/scorecard-test
images/scorecard-test-kuttl/scorecard-test-kuttl

# Test artifacts
pkg/ansible/runner/testdata/valid.yaml
internal/ansible/runner/testdata/valid.yaml
/bin
internal/scorecard/examples/custom-scorecard-tests/go.sum

Expand Down
11 changes: 11 additions & 0 deletions changelog/fragments/mv-ansible-internal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
entries:
- description: >
The ansible operator implementation in `pkg/ansible` was moved to
`internal/ansible`.

kind: change
breaking: true
migration:
header: Hybrid Go/Ansible operator use cases are not supported in 1.0.0
body: >
There is no migration path that enables continued use of the Ansible-based operator Go libraries
12 changes: 6 additions & 6 deletions 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/ansible/controller"
"github.com/operator-framework/operator-sdk/internal/ansible/flags"
"github.com/operator-framework/operator-sdk/internal/ansible/proxy"
"github.com/operator-framework/operator-sdk/internal/ansible/proxy/controllermap"
"github.com/operator-framework/operator-sdk/internal/ansible/runner"
"github.com/operator-framework/operator-sdk/internal/ansible/watches"
"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"
sdkVersion "github.com/operator-framework/operator-sdk/version"
)

Expand Down
2 changes: 1 addition & 1 deletion hack/tests/e2e-ansible.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ source hack/lib/image_lib.sh
source ./hack/lib/common.sh

# ansible proxy test require a running cluster; run during e2e instead
go test -count=1 ./pkg/ansible/proxy/...
go test -count=1 ./internal/ansible/proxy/...

DEST_IMAGE="quay.io/example/memcached-operator:v0.0.2"
ROOTDIR="$(pwd)"
Expand Down
0 pkg/ansible/OWNERS → internal/ansible/OWNERS
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions pkg/ansible/controller/controller.go → internal/ansible/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ import (
ctrlpredicate "sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/source"

"github.com/operator-framework/operator-sdk/pkg/ansible/events"
"github.com/operator-framework/operator-sdk/pkg/ansible/predicate"
"github.com/operator-framework/operator-sdk/pkg/ansible/runner"
"github.com/operator-framework/operator-sdk/internal/ansible/events"
"github.com/operator-framework/operator-sdk/internal/ansible/predicate"
"github.com/operator-framework/operator-sdk/internal/ansible/runner"
)

var log = logf.Log.WithName("ansible-controller")
Expand Down
14 changes: 7 additions & 7 deletions pkg/ansible/controller/reconcile.go → internal/ansible/controller/reconcile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,6 @@ import (
"strings"
"time"

ansiblestatus "github.com/operator-framework/operator-sdk/pkg/ansible/controller/status"
"github.com/operator-framework/operator-sdk/pkg/ansible/events"
"github.com/operator-framework/operator-sdk/pkg/ansible/metrics"
"github.com/operator-framework/operator-sdk/pkg/ansible/proxy/kubeconfig"
"github.com/operator-framework/operator-sdk/pkg/ansible/runner"
"github.com/operator-framework/operator-sdk/pkg/ansible/runner/eventapi"

v1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -41,6 +34,13 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

ansiblestatus "github.com/operator-framework/operator-sdk/internal/ansible/controller/status"
"github.com/operator-framework/operator-sdk/internal/ansible/events"
"github.com/operator-framework/operator-sdk/internal/ansible/metrics"
"github.com/operator-framework/operator-sdk/internal/ansible/proxy/kubeconfig"
"github.com/operator-framework/operator-sdk/internal/ansible/runner"
"github.com/operator-framework/operator-sdk/internal/ansible/runner/eventapi"
)

const (
Expand Down
14 changes: 7 additions & 7 deletions pkg/ansible/controller/reconcile_test.go → ...rnal/ansible/controller/reconcile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ import (
"testing"
"time"

"github.com/operator-framework/operator-sdk/pkg/ansible/controller"
ansiblestatus "github.com/operator-framework/operator-sdk/pkg/ansible/controller/status"
"github.com/operator-framework/operator-sdk/pkg/ansible/events"
"github.com/operator-framework/operator-sdk/pkg/ansible/runner"
"github.com/operator-framework/operator-sdk/pkg/ansible/runner/eventapi"
"github.com/operator-framework/operator-sdk/pkg/ansible/runner/fake"

"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"
fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

"github.com/operator-framework/operator-sdk/internal/ansible/controller"
ansiblestatus "github.com/operator-framework/operator-sdk/internal/ansible/controller/status"
"github.com/operator-framework/operator-sdk/internal/ansible/events"
"github.com/operator-framework/operator-sdk/internal/ansible/runner"
"github.com/operator-framework/operator-sdk/internal/ansible/runner/eventapi"
"github.com/operator-framework/operator-sdk/internal/ansible/runner/fake"
)

func TestReconcile(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/ansible/controller/status/types.go → internal/ansible/controller/status/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ import (
"encoding/json"
"time"

"github.com/operator-framework/operator-sdk/pkg/ansible/runner/eventapi"

v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
logf "sigs.k8s.io/controller-runtime/pkg/log"

"github.com/operator-framework/operator-sdk/internal/ansible/runner/eventapi"
)

var log = logf.Log.WithName("controller.status")
Expand Down
0 pkg/ansible/controller/status/utils.go → internal/ansible/controller/status/utils.go
View file
Open in desktop
File renamed without changes.
0 pkg/ansible/controller/status/utils_test.go → ...l/ansible/controller/status/utils_test.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions pkg/ansible/events/log_events.go → internal/ansible/events/log_events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import (
"errors"
"fmt"

"github.com/operator-framework/operator-sdk/pkg/ansible/runner/eventapi"

"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
logf "sigs.k8s.io/controller-runtime/pkg/log"

"github.com/operator-framework/operator-sdk/internal/ansible/runner/eventapi"
)

// LogLevel - Levelt for the logging to take place.
Expand Down
0 pkg/ansible/flags/flag.go → internal/ansible/flags/flag.go
View file
Open in desktop
File renamed without changes.
0 pkg/ansible/metrics/metrics.go → internal/ansible/metrics/metrics.go
View file
Open in desktop
File renamed without changes.
0 pkg/ansible/paramconv/paramconv.go → internal/ansible/paramconv/paramconv.go
View file
Open in desktop
File renamed without changes.
0 pkg/ansible/paramconv/paramconv_test.go → internal/ansible/paramconv/paramconv_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/ansible/predicate/predicate.go → internal/ansible/predicate/predicate.go
View file
Open in desktop
File renamed without changes.
13 changes: 6 additions & 7 deletions pkg/ansible/proxy/cache_response.go → internal/ansible/proxy/cache_response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ import (
"strings"

libhandler "github.com/operator-framework/operator-lib/handler"
"github.com/operator-framework/operator-sdk/pkg/ansible/proxy/controllermap"
"github.com/operator-framework/operator-sdk/pkg/ansible/proxy/requestfactory"
k8sRequest "github.com/operator-framework/operator-sdk/pkg/ansible/proxy/requestfactory"

"k8s.io/apimachinery/pkg/api/meta"
metainternalscheme "k8s.io/apimachinery/pkg/apis/meta/internalversion/scheme"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -38,6 +34,9 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
"sigs.k8s.io/controller-runtime/pkg/cache"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/operator-framework/operator-sdk/internal/ansible/proxy/controllermap"
k8sRequest "github.com/operator-framework/operator-sdk/internal/ansible/proxy/requestfactory"
)

type marshaler interface {
Expand Down Expand Up @@ -150,7 +149,7 @@ func (c *cacheResponseHandler) ServeHTTP(w http.ResponseWriter, req *http.Reques
}

// skipCacheLookup - determine if we should skip the cache lookup
func (c *cacheResponseHandler) skipCacheLookup(r *requestfactory.RequestInfo, gvk schema.GroupVersionKind,
func (c *cacheResponseHandler) skipCacheLookup(r *k8sRequest.RequestInfo, gvk schema.GroupVersionKind,
req *http.Request) bool {

skip := matchesRegexp(req.URL.String(), c.skipPathRegexp)
Expand Down Expand Up @@ -241,7 +240,7 @@ func (c *cacheResponseHandler) recoverDependentWatches(req *http.Request, un *un
}
}

func (c *cacheResponseHandler) getListFromCache(r *requestfactory.RequestInfo, req *http.Request,
func (c *cacheResponseHandler) getListFromCache(r *k8sRequest.RequestInfo, req *http.Request,
k schema.GroupVersionKind) (marshaler, error) {
k8sListOpts := &metav1.ListOptions{}
if err := metainternalscheme.ParameterCodec.DecodeParameters(req.URL.Query(), metav1.SchemeGroupVersion,
Expand Down Expand Up @@ -283,7 +282,7 @@ func (c *cacheResponseHandler) getListFromCache(r *requestfactory.RequestInfo, r
return &un, nil
}

func (c *cacheResponseHandler) getObjectFromCache(r *requestfactory.RequestInfo, req *http.Request,
func (c *cacheResponseHandler) getObjectFromCache(r *k8sRequest.RequestInfo, req *http.Request,
k schema.GroupVersionKind) (marshaler, error) {
un := &unstructured.Unstructured{}
un.SetGroupVersionKind(k)
Expand Down
0 ...ible/proxy/controllermap/controllermap.go → ...ible/proxy/controllermap/controllermap.go
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions pkg/ansible/proxy/inject_owner.go → internal/ansible/proxy/inject_owner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ import (
"net/http/httputil"

"github.com/operator-framework/operator-lib/handler"
"github.com/operator-framework/operator-sdk/internal/util/k8sutil"
"github.com/operator-framework/operator-sdk/pkg/ansible/proxy/controllermap"
k8sRequest "github.com/operator-framework/operator-sdk/pkg/ansible/proxy/requestfactory"

"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/sets"

"github.com/operator-framework/operator-sdk/internal/ansible/proxy/controllermap"
k8sRequest "github.com/operator-framework/operator-sdk/internal/ansible/proxy/requestfactory"
"github.com/operator-framework/operator-sdk/internal/util/k8sutil"
)

// injectOwnerReferenceHandler will handle proxied requests and inject the
Expand Down
0 pkg/ansible/proxy/kubeconfig/kubeconfig.go → ...al/ansible/proxy/kubeconfig/kubeconfig.go
View file
Open in desktop
File renamed without changes.
0 pkg/ansible/proxy/kubectl.go → internal/ansible/proxy/kubectl.go
View file
Open in desktop
File renamed without changes.
10 changes: 4 additions & 6 deletions pkg/ansible/proxy/proxy.go → internal/ansible/proxy/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@

package proxy

// This file contains this project's custom code, as opposed to kubectl.go
// which contains code retrieved from the kubernetes project.

import (
"bytes"
"encoding/base64"
Expand All @@ -31,9 +28,6 @@ import (

libhandler "github.com/operator-framework/operator-lib/handler"
"github.com/operator-framework/operator-lib/predicate"
"github.com/operator-framework/operator-sdk/pkg/ansible/proxy/controllermap"
"github.com/operator-framework/operator-sdk/pkg/ansible/proxy/kubeconfig"
k8sRequest "github.com/operator-framework/operator-sdk/pkg/ansible/proxy/requestfactory"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand All @@ -43,6 +37,10 @@ import (
"sigs.k8s.io/controller-runtime/pkg/cache"
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/source"

"github.com/operator-framework/operator-sdk/internal/ansible/proxy/controllermap"
"github.com/operator-framework/operator-sdk/internal/ansible/proxy/kubeconfig"
k8sRequest "github.com/operator-framework/operator-sdk/internal/ansible/proxy/requestfactory"
)

// This is the default timeout to wait for the cache to respond
Expand Down
4 changes: 2 additions & 2 deletions pkg/ansible/proxy/proxy_test.go → internal/ansible/proxy/proxy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ import (
"os"
"testing"

"github.com/operator-framework/operator-sdk/pkg/ansible/proxy/controllermap"

kcorev1 "k8s.io/api/core/v1"
kmetav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/config"
"sigs.k8s.io/controller-runtime/pkg/manager"

"github.com/operator-framework/operator-sdk/internal/ansible/proxy/controllermap"
)

func TestHandler(t *testing.T) {
Expand Down
0 ...sible/proxy/requestfactory/requestinfo.go → ...sible/proxy/requestfactory/requestinfo.go
View file
Open in desktop
File renamed without changes.
0 pkg/ansible/runner/eventapi/eventapi.go → internal/ansible/runner/eventapi/eventapi.go
View file
Open in desktop
File renamed without changes.
0 pkg/ansible/runner/eventapi/types.go → internal/ansible/runner/eventapi/types.go
View file
Open in desktop
File renamed without changes.
5 changes: 3 additions & 2 deletions pkg/ansible/runner/fake/runner.go → internal/ansible/runner/fake/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ import (
"fmt"
"time"

"github.com/operator-framework/operator-sdk/pkg/ansible/runner"
"github.com/operator-framework/operator-sdk/pkg/ansible/runner/eventapi"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

"github.com/operator-framework/operator-sdk/internal/ansible/runner"
"github.com/operator-framework/operator-sdk/internal/ansible/runner/eventapi"
)

// Runner - implements the Runner interface for a GVK that's being watched.
Expand Down
0 ...ible/runner/internal/inputdir/inputdir.go → ...ible/runner/internal/inputdir/inputdir.go
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions pkg/ansible/runner/runner.go → internal/ansible/runner/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ import (
"strconv"
"strings"

"github.com/operator-framework/operator-sdk/pkg/ansible/metrics"
"github.com/operator-framework/operator-sdk/pkg/ansible/paramconv"
"github.com/operator-framework/operator-sdk/pkg/ansible/runner/eventapi"
"github.com/operator-framework/operator-sdk/pkg/ansible/runner/internal/inputdir"
"github.com/operator-framework/operator-sdk/pkg/ansible/watches"

"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
logf "sigs.k8s.io/controller-runtime/pkg/log"

"github.com/operator-framework/operator-sdk/internal/ansible/metrics"
"github.com/operator-framework/operator-sdk/internal/ansible/paramconv"
"github.com/operator-framework/operator-sdk/internal/ansible/runner/eventapi"
"github.com/operator-framework/operator-sdk/internal/ansible/runner/internal/inputdir"
"github.com/operator-framework/operator-sdk/internal/ansible/watches"
)

var log = logf.Log.WithName("runner")
Expand Down
2 changes: 1 addition & 1 deletion pkg/ansible/runner/runner_test.go → internal/ansible/runner/runner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"

"github.com/operator-framework/operator-sdk/pkg/ansible/watches"
"github.com/operator-framework/operator-sdk/internal/ansible/watches"
)

func checkCmdFunc(t *testing.T, cmdFunc cmdFuncType, playbook, role string, verbosity int) {
Expand Down
0 pkg/ansible/runner/testdata/playbook.yml → ...rnal/ansible/runner/testdata/playbook.yml
View file
Open in desktop
File renamed without changes.
0 ...ble/runner/testdata/roles/role/tasks.yaml → ...ble/runner/testdata/roles/role/tasks.yaml
View file
Open in desktop
File renamed without changes.
0 ...pace/collection/roles/someRole/empty_file → ...pace/collection/roles/someRole/empty_file
View file
Open in desktop
File renamed without changes.
0 ...sible/watches/testdata/duplicate_gvk.yaml → ...sible/watches/testdata/duplicate_gvk.yaml
View file
Open in desktop
File renamed without changes.
0 pkg/ansible/watches/testdata/invalid.yaml → ...nal/ansible/watches/testdata/invalid.yaml
View file
Open in desktop
File renamed without changes.
0 .../watches/testdata/invalid_collection.yaml → .../watches/testdata/invalid_collection.yaml
View file
Open in desktop
File renamed without changes.
0 ...le/watches/testdata/invalid_duration.yaml → ...le/watches/testdata/invalid_duration.yaml
View file
Open in desktop
File renamed without changes.
0 ...s/testdata/invalid_finalizer_no_vars.yaml → ...s/testdata/invalid_finalizer_no_vars.yaml
View file
Open in desktop
File renamed without changes.
0 ...data/invalid_finalizer_playbook_path.yaml → ...data/invalid_finalizer_playbook_path.yaml
View file
Open in desktop
File renamed without changes.
0 ...testdata/invalid_finalizer_role_path.yaml → ...testdata/invalid_finalizer_role_path.yaml
View file
Open in desktop
File renamed without changes.
0 ...data/invalid_finalizer_whithout_name.yaml → ...data/invalid_finalizer_whithout_name.yaml
View file
Open in desktop
File renamed without changes.
0 ...tches/testdata/invalid_playbook_path.yaml → ...tches/testdata/invalid_playbook_path.yaml
View file
Open in desktop
File renamed without changes.
0 ...e/watches/testdata/invalid_role_path.yaml → ...e/watches/testdata/invalid_role_path.yaml
View file
Open in desktop
File renamed without changes.
0 ...ible/watches/testdata/invalid_status.yaml → ...ible/watches/testdata/invalid_status.yaml
View file
Open in desktop
File renamed without changes.
0 ...e/watches/testdata/invalid_yaml_file.yaml → ...e/watches/testdata/invalid_yaml_file.yaml
View file
Open in desktop
File renamed without changes.
0 pkg/ansible/watches/testdata/playbook.yml → ...nal/ansible/watches/testdata/playbook.yml
View file
Open in desktop
File renamed without changes.
0 ...le/watches/testdata/roles/role/tasks.yaml → ...le/watches/testdata/roles/role/tasks.yaml
View file
Open in desktop
File renamed without changes.
0 pkg/ansible/watches/testdata/valid.yaml.tmpl → .../ansible/watches/testdata/valid.yaml.tmpl
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/ansible/watches/watches.go → internal/ansible/watches/watches.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
yaml "sigs.k8s.io/yaml"

"github.com/operator-framework/operator-sdk/pkg/ansible/flags"
"github.com/operator-framework/operator-sdk/internal/ansible/flags"
)

var log = logf.Log.WithName("watches")
Expand Down
0 pkg/ansible/watches/watches_test.go → internal/ansible/watches/watches_test.go
View file
Open in desktop
File renamed without changes.