Skip to content

Commit 2f25bd1

Browse files
alexandreLamarrealexandreLamarre
authored
Merge pull request #155 from rancher/internal-update
move dependencies into internal package
2 parents 008ee48 + 33f8461 commit 2f25bd1

File tree

85 files changed

+97
-97
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+97
-97
lines changed

‎.github/workflows/hl-e2e.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
- 'crds/helm-locker/**'
1212
- 'package/Dockerfile-helm-locker'
1313
- 'cmd/helm-locker/**'
14-
- 'pkg/helm-locker/**'
14+
- 'internal/helm-locker/**'
1515

1616
env:
1717
CLUSTER_NAME : e2e-ci-helm-locker

‎cmd/helm-locker/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"net/http"
77
_ "net/http/pprof"
88

9-
"github.com/rancher/prometheus-federator/pkg/helm-locker/controllers"
10-
"github.com/rancher/prometheus-federator/pkg/helm-locker/crd"
9+
"github.com/rancher/prometheus-federator/internal/helm-locker/controllers"
10+
"github.com/rancher/prometheus-federator/internal/helm-locker/crd"
1111
"github.com/rancher/prometheus-federator/pkg/version"
1212
command "github.com/rancher/wrangler-cli"
1313
_ "github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io"

‎cmd/helm-project-operator/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
_ "net/http/pprof"
88
"os"
99

10-
"github.com/rancher/prometheus-federator/pkg/helm-project-operator/controllers/common"
11-
"github.com/rancher/prometheus-federator/pkg/helm-project-operator/operator"
10+
"github.com/rancher/prometheus-federator/internal/helm-project-operator/controllers/common"
11+
"github.com/rancher/prometheus-federator/internal/helm-project-operator/operator"
1212

1313
"github.com/rancher/prometheus-federator/pkg/version"
1414
command "github.com/rancher/wrangler-cli"

‎cmd/prometheus-federator/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
_ "net/http/pprof"
88
"os"
99

10+
"github.com/rancher/prometheus-federator/internal/helm-project-operator/controllers/common"
11+
"github.com/rancher/prometheus-federator/internal/helm-project-operator/operator"
1012
"github.com/rancher/prometheus-federator/pkg/debug"
11-
"github.com/rancher/prometheus-federator/pkg/helm-project-operator/controllers/common"
12-
"github.com/rancher/prometheus-federator/pkg/helm-project-operator/operator"
1313
"github.com/rancher/prometheus-federator/pkg/version"
1414
command "github.com/rancher/wrangler-cli"
1515
_ "github.com/rancher/wrangler/pkg/generated/controllers/apiextensions.k8s.io"

‎generate.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
//go:generate go run pkg/codegen/buildconfig/writer.go pkg/codegen/buildconfig/main.go
22

3-
//go:generate go run pkg/helm-locker/codegen/cleanup/main.go
4-
//go:generate go run pkg/helm-locker/codegen/main.go
5-
//go:generate go run ./pkg/helm-locker/codegen crds ./crds/helm-locker/crds.yaml
3+
//go:generate go run internal/helm-locker/codegen/cleanup/main.go
4+
//go:generate go run internal/helm-locker/codegen/main.go
5+
//go:generate go run ./internal/helm-locker/codegen crds ./crds/helm-locker/crds.yaml
66

7-
//go:generate go run pkg/helm-project-operator/codegen/cleanup/main.go
8-
//go:generate go run pkg/helm-project-operator/codegen/main.go
9-
//go:generate go run ./pkg/helm-project-operator/codegen crds ./crds/helm-project-operator ./crds/helm-project-operator
7+
//go:generate go run internal/helm-project-operator/codegen/cleanup/main.go
8+
//go:generate go run internal/helm-project-operator/codegen/main.go
9+
//go:generate go run ./internal/helm-project-operator/codegen crds ./crds/helm-project-operator ./crds/helm-project-operator
1010

1111
package main

‎pkg/helm-locker/apis/helm.cattle.io/v1alpha1/doc.go‎ renamed to ‎internal/helm-locker/apis/helm.cattle.io/v1alpha1/doc.go‎

File renamed without changes.

‎pkg/helm-locker/apis/helm.cattle.io/v1alpha1/release.go‎ renamed to ‎internal/helm-locker/apis/helm.cattle.io/v1alpha1/release.go‎

File renamed without changes.

‎pkg/helm-locker/apis/helm.cattle.io/v1alpha1/zz_generated_deepcopy.go‎ renamed to ‎internal/helm-locker/apis/helm.cattle.io/v1alpha1/zz_generated_deepcopy.go‎

File renamed without changes.

‎pkg/helm-locker/apis/helm.cattle.io/v1alpha1/zz_generated_list_types.go‎ renamed to ‎internal/helm-locker/apis/helm.cattle.io/v1alpha1/zz_generated_list_types.go‎

File renamed without changes.

‎pkg/helm-locker/apis/helm.cattle.io/v1alpha1/zz_generated_register.go‎ renamed to ‎internal/helm-locker/apis/helm.cattle.io/v1alpha1/zz_generated_register.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)