Merge pull request #1076 from fluxcd/internal-controller

Move controllers to internal/controller

Author: darkowlzz

Dockerfile

@@ -40,7 +40,6 @@ RUN go mod download
 
 # Copy source code
 COPY main.go main.go
-COPY controllers/ controllers/
 COPY pkg/ pkg/
 COPY internal/ internal/
 

Makefile

@@ -82,7 +82,7 @@ test-ctrl: install-envtest test-api check-deps ## Run controller tests
 	GIT_CONFIG_GLOBAL=/dev/null \
 	go test $(GO_STATIC_FLAGS) \
 	  -run "^$(GO_TEST_PREFIX).*" \
-	  -v ./controllers \
+	  -v ./internal/controller \
 	  -coverprofile cover.out
 
 check-deps:

hack/ci/e2e.sh

@@ -133,7 +133,7 @@ kubectl -n source-system wait bucket/podinfo --for=condition=ready --timeout=1m
 
 echo "Run HelmChart from Bucket tests"
 "${BUILD_DIR}/mc" mb minio/charts
-"${BUILD_DIR}/mc" mirror "${ROOT_DIR}/controllers/testdata/charts/helmchart/" minio/charts/helmchart
+"${BUILD_DIR}/mc" mirror "${ROOT_DIR}/internal/controller/testdata/charts/helmchart/" minio/charts/helmchart
 
 kubectl -n source-system apply -f "${ROOT_DIR}/config/testdata/helmchart-from-bucket/source.yaml"
 kubectl -n source-system wait bucket/charts --for=condition=ready --timeout=1m

controllers/artifact.go internal/controller/artifact.gocontrollers/artifact.go renamed to internal/controller/artifact.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import sourcev1 "github.com/fluxcd/source-controller/api/v1"
 

controllers/artifact_matchers_test.go …nal/controller/artifact_matchers_test.gocontrollers/artifact_matchers_test.go renamed to internal/controller/artifact_matchers_test.go controllers/artifact_matchers_test.go renamed to internal/controller/artifact_matchers_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"fmt"

controllers/artifact_test.go internal/controller/artifact_test.gocontrollers/artifact_test.go renamed to internal/controller/artifact_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"testing"

controllers/bucket_controller.go internal/controller/bucket_controller.gocontrollers/bucket_controller.go renamed to internal/controller/bucket_controller.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

…trollers/bucket_controller_fetch_test.go …ntroller/bucket_controller_fetch_test.gocontrollers/bucket_controller_fetch_test.go renamed to internal/controller/bucket_controller_fetch_test.go controllers/bucket_controller_fetch_test.go renamed to internal/controller/bucket_controller_fetch_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/bucket_controller_test.go …nal/controller/bucket_controller_test.gocontrollers/bucket_controller_test.go renamed to internal/controller/bucket_controller_test.go controllers/bucket_controller_test.go renamed to internal/controller/bucket_controller_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/common_test.go internal/controller/common_test.gocontrollers/common_test.go renamed to internal/controller/common_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"