Skip to content

pkg/scaffold: move to internal/pkg/scaffold #1182

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
merged 11 commits into from
Mar 28, 2019
Merged

pkg/scaffold: move to internal/pkg/scaffold #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b4180c2
pkg/scaffold: move to internal/scaffold
joelanford Mar 6, 2019
e899c74
release.sh,doc/dev/release.md: update scaffold references to new pack…
joelanford Mar 7, 2019
212163c
Merge branch 'master' into v1-scaffold
joelanford Mar 19, 2019
6d77db0
internal/scaffold/ansible: moving ao_logs.go
joelanford Mar 19, 2019
97946c5
Merge branch 'master' into v1-scaffold
joelanford Mar 19, 2019
4d66be4
internal/scaffold: move to internal/pkg/scaffold
joelanford Mar 19, 2019
d0fc752
doc/user/logging.md: update link referencing cmd/manager/main.go scaf…
joelanford Mar 21, 2019
fac856e
Merge branch 'master' into v1-scaffold
joelanford Mar 27, 2019
66294ed
Merge branch 'master' into v1-scaffold
joelanford Mar 28, 2019
cb4ff63
*: fix paths and imports
joelanford Mar 28, 2019
96d412c
Merge branch 'master' into v1-scaffold
joelanford Mar 28, 2019
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
4 changes: 2 additions & 2 deletions cmd/operator-sdk/add/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"fmt"

"github.com/operator-framework/operator-sdk/cmd/operator-sdk/internal/genutil"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
"github.com/operator-framework/operator-sdk/internal/util/projutil"
"github.com/operator-framework/operator-sdk/pkg/scaffold"
"github.com/operator-framework/operator-sdk/pkg/scaffold/input"

log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
Expand Down
4 changes: 2 additions & 2 deletions cmd/operator-sdk/add/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ package add
import (
"fmt"

"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
"github.com/operator-framework/operator-sdk/internal/util/projutil"
"github.com/operator-framework/operator-sdk/pkg/scaffold"
"github.com/operator-framework/operator-sdk/pkg/scaffold/input"

log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
Expand Down
4 changes: 2 additions & 2 deletions cmd/operator-sdk/add/crd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"path/filepath"
"strings"

"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
"github.com/operator-framework/operator-sdk/internal/util/projutil"
"github.com/operator-framework/operator-sdk/pkg/scaffold"
"github.com/operator-framework/operator-sdk/pkg/scaffold/input"

log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
Expand Down
4 changes: 2 additions & 2 deletions cmd/operator-sdk/build/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
"path/filepath"
"strings"

"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
"github.com/operator-framework/operator-sdk/internal/util/projutil"
"github.com/operator-framework/operator-sdk/internal/util/yamlutil"
"github.com/operator-framework/operator-sdk/pkg/scaffold"
"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
"github.com/operator-framework/operator-sdk/pkg/test"

"github.com/ghodss/yaml"
Expand Down
2 changes: 1 addition & 1 deletion cmd/operator-sdk/internal/genutil/genutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"path/filepath"
"strings"

"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
"github.com/operator-framework/operator-sdk/internal/util/projutil"
"github.com/operator-framework/operator-sdk/pkg/scaffold"

log "github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/operator-sdk/internal/genutil/k8s.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"path/filepath"
"strings"

"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
"github.com/operator-framework/operator-sdk/internal/util/projutil"
"github.com/operator-framework/operator-sdk/pkg/scaffold"

log "github.com/sirupsen/logrus"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/operator-sdk/internal/genutil/openapi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
"path/filepath"
"strings"

"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
"github.com/operator-framework/operator-sdk/internal/util/k8sutil"
"github.com/operator-framework/operator-sdk/internal/util/projutil"
"github.com/operator-framework/operator-sdk/pkg/scaffold"
"github.com/operator-framework/operator-sdk/pkg/scaffold/input"

log "github.com/sirupsen/logrus"
)
Expand Down
8 changes: 4 additions & 4 deletions cmd/operator-sdk/migrate/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import (
"os"
"path/filepath"

"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/ansible"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/helm"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
"github.com/operator-framework/operator-sdk/internal/util/projutil"
"github.com/operator-framework/operator-sdk/pkg/scaffold"
"github.com/operator-framework/operator-sdk/pkg/scaffold/ansible"
"github.com/operator-framework/operator-sdk/pkg/scaffold/helm"
"github.com/operator-framework/operator-sdk/pkg/scaffold/input"

log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
Expand Down
8 changes: 4 additions & 4 deletions cmd/operator-sdk/new/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (
"path/filepath"
"strings"

"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/ansible"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/helm"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
"github.com/operator-framework/operator-sdk/internal/util/projutil"
"github.com/operator-framework/operator-sdk/pkg/scaffold"
"github.com/operator-framework/operator-sdk/pkg/scaffold/ansible"
"github.com/operator-framework/operator-sdk/pkg/scaffold/helm"
"github.com/operator-framework/operator-sdk/pkg/scaffold/input"

log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
Expand Down
6 changes: 3 additions & 3 deletions cmd/operator-sdk/olmcatalog/gen-csv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import (
"path/filepath"
"strings"

"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
catalog "github.com/operator-framework/operator-sdk/internal/pkg/scaffold/olm-catalog"
"github.com/operator-framework/operator-sdk/internal/util/fileutil"
"github.com/operator-framework/operator-sdk/internal/util/projutil"
"github.com/operator-framework/operator-sdk/pkg/scaffold"
"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
catalog "github.com/operator-framework/operator-sdk/pkg/scaffold/olm-catalog"

"github.com/coreos/go-semver/semver"
log "github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion cmd/operator-sdk/printdeps/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package printdeps
import (
"fmt"

"github.com/operator-framework/operator-sdk/pkg/scaffold"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"

"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/operator-sdk/scorecard/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"fmt"
"strings"

"github.com/operator-framework/operator-sdk/pkg/scaffold"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
"github.com/operator-framework/operator-sdk/version"

log "github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion cmd/operator-sdk/scorecard/scorecard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"io/ioutil"
"os"

"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
k8sInternal "github.com/operator-framework/operator-sdk/internal/util/k8sutil"
"github.com/operator-framework/operator-sdk/internal/util/projutil"
"github.com/operator-framework/operator-sdk/internal/util/yamlutil"
"github.com/operator-framework/operator-sdk/pkg/scaffold"

"github.com/ghodss/yaml"
olmapiv1alpha1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
Expand Down
4 changes: 2 additions & 2 deletions cmd/operator-sdk/test/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import (
"strings"
"time"

"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/ansible"
"github.com/operator-framework/operator-sdk/internal/util/fileutil"
k8sInternal "github.com/operator-framework/operator-sdk/internal/util/k8sutil"
"github.com/operator-framework/operator-sdk/internal/util/projutil"
"github.com/operator-framework/operator-sdk/pkg/k8sutil"
"github.com/operator-framework/operator-sdk/pkg/scaffold"
"github.com/operator-framework/operator-sdk/pkg/scaffold/ansible"
"github.com/operator-framework/operator-sdk/pkg/test"

log "github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion cmd/operator-sdk/test/local.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"path/filepath"
"strings"

"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
"github.com/operator-framework/operator-sdk/internal/util/fileutil"
"github.com/operator-framework/operator-sdk/internal/util/projutil"
"github.com/operator-framework/operator-sdk/internal/util/yamlutil"
"github.com/operator-framework/operator-sdk/pkg/scaffold"
"github.com/operator-framework/operator-sdk/pkg/test"

"github.com/ghodss/yaml"
Expand Down
2 changes: 1 addition & 1 deletion cmd/operator-sdk/up/local.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"strings"
"syscall"

"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
k8sInternal "github.com/operator-framework/operator-sdk/internal/util/k8sutil"
"github.com/operator-framework/operator-sdk/internal/util/projutil"
"github.com/operator-framework/operator-sdk/pkg/ansible"
Expand All @@ -32,7 +33,6 @@ import (
hoflags "github.com/operator-framework/operator-sdk/pkg/helm/flags"
"github.com/operator-framework/operator-sdk/pkg/k8sutil"
"github.com/operator-framework/operator-sdk/pkg/log/zap"
"github.com/operator-framework/operator-sdk/pkg/scaffold"
sdkVersion "github.com/operator-framework/operator-sdk/version"

log "github.com/sirupsen/logrus"
Expand Down
16 changes: 8 additions & 8 deletions doc/dev/release.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,13 @@ $ git checkout -b release-v1.3.0
Commit changes to the following six files:

- `version/version.go`: update `Version` to `v1.3.0`.
- `pkg/scaffold/gopkgtoml.go`, under the `[[constraint]]` for `github.com/operator-framework/operator-sdk`:
- `internal/pkg/scaffold/gopkgtoml.go`, under the `[[constraint]]` for `github.com/operator-framework/operator-sdk`:
- Comment out `branch = "master"`
- Un-comment `version = "v1.2.0"`
- Change `v1.2.0` to `v1.3.0`
- `pkg/scaffold/gopkgtoml_test.go`: same as for `pkg/scaffold/gopkgtoml.go`.
- `pkg/scaffold/ansible/gopkgtoml.go`: same as for `pkg/scaffold/gopkgtoml.go`.
- `pkg/scaffold/helm/gopkgtoml.go`: same as for `pkg/scaffold/gopkgtoml.go`.
- `internal/pkg/scaffold/gopkgtoml_test.go`: same as for `internal/pkg/scaffold/gopkgtoml.go`.
- `internal/pkg/scaffold/ansible/gopkgtoml.go`: same as for `internal/pkg/scaffold/gopkgtoml.go`.
- `internal/pkg/scaffold/helm/gopkgtoml.go`: same as for `internal/pkg/scaffold/gopkgtoml.go`.
- `CHANGELOG.md`: update the `## Unreleased` header to `## v1.3.0`.

Create a new PR for `release-v1.3.0`.
Expand Down Expand Up @@ -214,12 +214,12 @@ Once this tag passes CI, go to step 3. For more info on tagging, see the [releas
Check out a new branch from master (or use your `release-v1.3.0`) and commit the following changes:

- `version/version.go`: update `Version` to `v1.3.0+git`.
- `pkg/scaffold/gopkgtoml.go`, under the `[[constraint]]` for `github.com/operator-framework/operator-sdk`:
- `internal/pkg/scaffold/gopkgtoml.go`, under the `[[constraint]]` for `github.com/operator-framework/operator-sdk`:
- Comment out `version = "v1.3.0"`
- Un-comment `branch = "master"`
- `pkg/scaffold/gopkgtoml_test.go`: same as for `pkg/scaffold/gopkgtoml.go`.
- `pkg/scaffold/ansible/gopkgtoml.go`: same as for `pkg/scaffold/gopkgtoml.go`.
- `pkg/scaffold/helm/gopkgtoml.go`: same as for `pkg/scaffold/gopkgtoml.go`.
- `internal/pkg/scaffold/gopkgtoml_test.go`: same as for `internal/pkg/scaffold/gopkgtoml.go`.
- `internal/pkg/scaffold/ansible/gopkgtoml.go`: same as for `internal/pkg/scaffold/gopkgtoml.go`.
- `internal/pkg/scaffold/helm/gopkgtoml.go`: same as for `internal/pkg/scaffold/gopkgtoml.go`.
- `CHANGELOG.md`: add the following as a new set of headers above `## v1.3.0`:

```markdown
Expand Down
2 changes: 1 addition & 1 deletion doc/user/logging.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,5 +117,5 @@ If you do not want to use `logr` as your logging tool, you can remove `logr`-spe
[godoc_logr_logger]:https://godoc.org/github.com/go-logr/logr#Logger
[site_struct_logging]:https://www.client9.com/structured-logging-in-golang/
[code_memcached_controller]:../../example/memcached-operator/memcached_controller.go.tmpl
[code_set_logger]:https://github.com/operator-framework/operator-sdk/blob/ecd02000616f11303f1adecd3d4ceb4a8561a9ec/pkg/scaffold/cmd.go#L90-L94
[code_set_logger]:https://github.com/operator-framework/operator-sdk/blob/4d66be409a69d169aaa29d470242a1defbaf08bb/internal/pkg/scaffold/cmd.go#L92-L96
[zap_sampling]:https://github.com/uber-go/zap/blob/master/FAQ.md#why-sample-application-logs
6 changes: 3 additions & 3 deletions hack/image/ansible/scaffold-ansible-image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
package main

import (
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/ansible"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
"github.com/operator-framework/operator-sdk/internal/util/projutil"
"github.com/operator-framework/operator-sdk/pkg/scaffold"
"github.com/operator-framework/operator-sdk/pkg/scaffold/ansible"
"github.com/operator-framework/operator-sdk/pkg/scaffold/input"

log "github.com/sirupsen/logrus"
)
Expand Down
6 changes: 3 additions & 3 deletions hack/image/helm/scaffold-helm-image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ package main
import (
"log"

"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/helm"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
"github.com/operator-framework/operator-sdk/internal/util/projutil"
"github.com/operator-framework/operator-sdk/pkg/scaffold"
"github.com/operator-framework/operator-sdk/pkg/scaffold/helm"
"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
)

// main renders scaffolds that are required to build the helm operator base
Expand Down
2 changes: 1 addition & 1 deletion pkg/scaffold/add_controller.go → internal/pkg/scaffold/add_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package scaffold
import (
"path/filepath"

"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
)

// AddController is the input needed to generate a pkg/controller/add_<kind>.go file
Expand Down
0 pkg/scaffold/add_controller_test.go → internal/pkg/scaffold/add_controller_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/scaffold/addtoscheme.go → internal/pkg/scaffold/addtoscheme.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"path/filepath"
"strings"

"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
)

// AddToScheme is the input needed to generate an addtoscheme_<group>_<version>.go file
Expand Down
0 pkg/scaffold/addtoscheme_test.go → internal/pkg/scaffold/addtoscheme_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/scaffold/ansible/OWNERS → internal/pkg/scaffold/ansible/OWNERS
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/scaffold/ansible/ao_logs.go → internal/pkg/scaffold/ansible/ao_logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package ansible
import (
"path/filepath"

"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
)

//DockerfileHybrid - Dockerfile for a hybrid operator
Expand Down
4 changes: 2 additions & 2 deletions pkg/scaffold/ansible/build_dockerfile.go → .../pkg/scaffold/ansible/build_dockerfile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"path/filepath"
"strings"

"github.com/operator-framework/operator-sdk/pkg/scaffold"
"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
"github.com/operator-framework/operator-sdk/version"
)

Expand Down
4 changes: 2 additions & 2 deletions ...ild_test_framework_ansible_test_script.go → ...ild_test_framework_ansible_test_script.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package ansible
import (
"path/filepath"

"github.com/operator-framework/operator-sdk/pkg/scaffold"
"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
)

const BuildTestFrameworkAnsibleTestScriptFile = "ansible-test.sh"
Expand Down
4 changes: 2 additions & 2 deletions ...nsible/build_test_framework_dockerfile.go → ...nsible/build_test_framework_dockerfile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package ansible
import (
"path/filepath"

"github.com/operator-framework/operator-sdk/pkg/scaffold"
"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
)

const BuildTestFrameworkDockerfileFile = "Dockerfile"
Expand Down
0 pkg/scaffold/ansible/constants.go → internal/pkg/scaffold/ansible/constants.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions pkg/scaffold/ansible/deploy_operator.go → ...l/pkg/scaffold/ansible/deploy_operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package ansible
import (
"path/filepath"

"github.com/operator-framework/operator-sdk/pkg/scaffold"
"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
)

const DeployOperatorFile = "operator.yaml"
Expand Down
4 changes: 2 additions & 2 deletions pkg/scaffold/ansible/dockerfilehybrid.go → .../pkg/scaffold/ansible/dockerfilehybrid.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package ansible
import (
"path/filepath"

"github.com/operator-framework/operator-sdk/pkg/scaffold"
"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
)

//DockerfileHybrid - Dockerfile for a hybrid operator
Expand Down
2 changes: 1 addition & 1 deletion pkg/scaffold/ansible/entrypoint.go → internal/pkg/scaffold/ansible/entrypoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package ansible
import (
"path/filepath"

"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
)

// Entrypoint - entrypoint script
Expand Down
4 changes: 2 additions & 2 deletions pkg/scaffold/ansible/gopkgtoml.go → internal/pkg/scaffold/ansible/gopkgtoml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
package ansible

import (
"github.com/operator-framework/operator-sdk/pkg/scaffold"
"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
)

// GopkgToml - the Gopkg.toml file for a hybrid operator
Expand Down
2 changes: 1 addition & 1 deletion pkg/scaffold/ansible/k8s_status.go → internal/pkg/scaffold/ansible/k8s_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package ansible

import (
"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"

"github.com/spf13/afero"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/scaffold/ansible/main.go → internal/pkg/scaffold/ansible/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package ansible
import (
"path/filepath"

"github.com/operator-framework/operator-sdk/pkg/scaffold/input"
"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
)

// Main - main source file for ansible operator
Expand Down
Loading