Move operator into integrations/ (gravitational#22618)

* Move operator into `integrations/` * fixup! Move operator into `integrations/` * fixup! fixup! Move operator into `integrations/` * fixup! fixup! fixup! Move operator into `integrations/` * fixup! fixup! fixup! fixup! Move operator into `integrations/`
xiv · Mar 6, 2023 · 9e1f53d · 9e1f53d
1 parent 793210e
commit 9e1f53d
Show file tree

Hide file tree

Showing 68 changed files with 189 additions and 95 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -8867,7 +8867,7 @@ steps:
     public.ecr.aws
   - docker buildx build --push --builder "teleport-operator-v13-amd64-builder" --platform
     "linux/amd64" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-amd64
-    --file "/go/src/github.com/gravitational/teleport/operator/Dockerfile" --build-arg
+    --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg
     BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox:teleport13 --build-arg
     COMPILER_NAME=x86_64-linux-gnu-gcc /go/src/github.com/gravitational/teleport
   - docker logout "public.ecr.aws"
@@ -8904,7 +8904,7 @@ steps:
     public.ecr.aws
   - docker buildx build --push --builder "teleport-operator-v13-arm-builder" --platform
     "linux/arm" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-arm
-    --file "/go/src/github.com/gravitational/teleport/operator/Dockerfile" --build-arg
+    --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg
     BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox-arm:teleport13 --build-arg
     COMPILER_NAME=arm-linux-gnueabihf-gcc /go/src/github.com/gravitational/teleport
   - docker logout "public.ecr.aws"
@@ -8941,7 +8941,7 @@ steps:
     public.ecr.aws
   - docker buildx build --push --builder "teleport-operator-v13-arm64-builder" --platform
     "linux/arm64" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-arm64
-    --file "/go/src/github.com/gravitational/teleport/operator/Dockerfile" --build-arg
+    --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg
     BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox-arm:teleport13 --build-arg
     COMPILER_NAME=aarch64-linux-gnu-gcc /go/src/github.com/gravitational/teleport
   - docker logout "public.ecr.aws"
@@ -12785,7 +12785,7 @@ steps:
     public.ecr.aws
   - docker buildx build --push --builder "teleport-operator-v12-amd64-builder" --platform
     "linux/amd64" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-amd64
-    --file "/go/src/github.com/gravitational/teleport/operator/Dockerfile" --build-arg
+    --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg
     BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox:teleport13 --build-arg
     COMPILER_NAME=x86_64-linux-gnu-gcc /go/src/github.com/gravitational/teleport
   - docker logout "public.ecr.aws"
@@ -12824,7 +12824,7 @@ steps:
     public.ecr.aws
   - docker buildx build --push --builder "teleport-operator-v12-arm-builder" --platform
     "linux/arm" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-arm
-    --file "/go/src/github.com/gravitational/teleport/operator/Dockerfile" --build-arg
+    --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg
     BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox-arm:teleport13 --build-arg
     COMPILER_NAME=arm-linux-gnueabihf-gcc /go/src/github.com/gravitational/teleport
   - docker logout "public.ecr.aws"
@@ -12863,7 +12863,7 @@ steps:
     public.ecr.aws
   - docker buildx build --push --builder "teleport-operator-v12-arm64-builder" --platform
     "linux/arm64" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-arm64
-    --file "/go/src/github.com/gravitational/teleport/operator/Dockerfile" --build-arg
+    --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg
     BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox-arm:teleport13 --build-arg
     COMPILER_NAME=aarch64-linux-gnu-gcc /go/src/github.com/gravitational/teleport
   - docker logout "public.ecr.aws"
@@ -15478,7 +15478,7 @@ steps:
     public.ecr.aws
   - docker buildx build --push --builder "teleport-operator-v11-amd64-builder" --platform
     "linux/amd64" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-amd64
-    --file "/go/src/github.com/gravitational/teleport/operator/Dockerfile" --build-arg
+    --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg
     BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox:teleport13 --build-arg
     COMPILER_NAME=x86_64-linux-gnu-gcc /go/src/github.com/gravitational/teleport
   - docker logout "public.ecr.aws"
@@ -15517,7 +15517,7 @@ steps:
     public.ecr.aws
   - docker buildx build --push --builder "teleport-operator-v11-arm-builder" --platform
     "linux/arm" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-arm
-    --file "/go/src/github.com/gravitational/teleport/operator/Dockerfile" --build-arg
+    --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg
     BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox-arm:teleport13 --build-arg
     COMPILER_NAME=arm-linux-gnueabihf-gcc /go/src/github.com/gravitational/teleport
   - docker logout "public.ecr.aws"
@@ -15556,7 +15556,7 @@ steps:
     public.ecr.aws
   - docker buildx build --push --builder "teleport-operator-v11-arm64-builder" --platform
     "linux/arm64" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-arm64
-    --file "/go/src/github.com/gravitational/teleport/operator/Dockerfile" --build-arg
+    --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg
     BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox-arm:teleport13 --build-arg
     COMPILER_NAME=aarch64-linux-gnu-gcc /go/src/github.com/gravitational/teleport
   - docker logout "public.ecr.aws"
@@ -18171,7 +18171,7 @@ steps:
     public.ecr.aws
   - docker buildx build --push --builder "teleport-operator-v10-amd64-builder" --platform
     "linux/amd64" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-amd64
-    --file "/go/src/github.com/gravitational/teleport/operator/Dockerfile" --build-arg
+    --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg
     BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox:teleport13 --build-arg
     COMPILER_NAME=x86_64-linux-gnu-gcc /go/src/github.com/gravitational/teleport
   - docker logout "public.ecr.aws"
@@ -18210,7 +18210,7 @@ steps:
     public.ecr.aws
   - docker buildx build --push --builder "teleport-operator-v10-arm-builder" --platform
     "linux/arm" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-arm
-    --file "/go/src/github.com/gravitational/teleport/operator/Dockerfile" --build-arg
+    --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg
     BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox-arm:teleport13 --build-arg
     COMPILER_NAME=arm-linux-gnueabihf-gcc /go/src/github.com/gravitational/teleport
   - docker logout "public.ecr.aws"
@@ -18249,7 +18249,7 @@ steps:
     public.ecr.aws
   - docker buildx build --push --builder "teleport-operator-v10-arm64-builder" --platform
     "linux/arm64" --tag drone-docker-registry:5000/teleport-operator:$(cat "/go/var/full-version")-arm64
-    --file "/go/src/github.com/gravitational/teleport/operator/Dockerfile" --build-arg
+    --file "/go/src/github.com/gravitational/teleport/integrations/operator/Dockerfile" --build-arg
     BUILDBOX=public.ecr.aws/gravitational/teleport-buildbox-arm:teleport13 --build-arg
     COMPILER_NAME=aarch64-linux-gnu-gcc /go/src/github.com/gravitational/teleport
   - docker logout "public.ecr.aws"
@@ -18925,6 +18925,6 @@ volumes:
   temp: {}
 ---
 kind: signature
-hmac: bc40ded3c6c520d2f5f3578625115b2acb610f79565ec98abab420b955c0737b
+hmac: d1bdc3a6fca1cc561c8be7eefb9c5bd3b222b83a486ed6e3c01f4ee9a191873d
 
 ...
diff --git a/.github/workflows/flaky-tests.yaml b/.github/workflows/flaky-tests.yaml
@@ -59,7 +59,7 @@ jobs:
       - name: Run base difftest
         uses: ./.github/actions/difftest
         with:
-          flags: -e "operator/**/*" -e "tool/tsh/**/*" -e "integration/**/*" -e "build.assets/**/*" -e "lib/auth/webauthncli/**/*" -e "lib/auth/touchid/**/*" -e "api/**/*"
+          flags: -e "integrations/operator/**/*" -e "tool/tsh/**/*" -e "integration/**/*" -e "build.assets/**/*" -e "lib/auth/webauthncli/**/*" -e "lib/auth/touchid/**/*" -e "api/**/*"
           target: test-go-unit
 
       - name: Run libfido2 difftest

diff --git a/.github/workflows/unit-tests-operator-bypass.yaml b/.github/workflows/unit-tests-operator-bypass.yaml
@@ -16,7 +16,7 @@ on:
     paths-ignore:
       - '/go.mod'
       - '/go.sum'
-      - 'operator/**'
+      - 'integrations/operator/**'
       - 'api/types/**'
       - 'lib/tbot/**'
       - 'build.assets/Makefile'
@@ -25,7 +25,7 @@ on:
     paths-ignore:
       - '/go.mod'
       - '/go.sum'
-      - 'operator/**'
+      - 'integrations/operator/**'
       - 'api/types/**'
       - 'lib/tbot/**'
       - 'build.assets/Makefile'

diff --git a/.github/workflows/unit-tests-operator.yaml b/.github/workflows/unit-tests-operator.yaml
@@ -9,7 +9,7 @@ on:
     paths:
       - '/go.mod'
       - '/go.sum'
-      - 'operator/**'
+      - 'integrations/operator/**'
       - 'api/types/**'
       - 'gen/**'
       - 'lib/tbot/**'
@@ -19,7 +19,7 @@ on:
     paths:
       - '/go.mod'
       - '/go.sum'
-      - 'operator/**'
+      - 'integrations/operator/**'
       - 'api/types/**'
       - 'gen/**'
       - 'lib/tbot/**'

diff --git a/.golangci.yml b/.golangci.yml
@@ -9,7 +9,7 @@ issues:
     # TODO(hugoShaka): Remove once https://github.com/dominikh/go-tools/issues/1294 is fixed
     - linters:
       - unused
-      path: 'operator/controllers/resources/(.+)_controller_test\.go'
+      path: 'integrations/operator/controllers/resources/(.+)_controller_test\.go'
   exclude-use-default: true
   max-same-issues: 0
   max-issues-per-linter: 0

diff --git a/Makefile b/Makefile
@@ -588,7 +588,7 @@ test-go-prepare: ensure-webassets bpf-bytecode rdpclient $(TEST_LOG_DIR) $(RENDE
 # Runs base unit tests
 .PHONY: test-go-unit
 test-go-unit: FLAGS ?= -race -shuffle on
-test-go-unit: SUBJECT ?= $(shell go list ./... | grep -v -e integration -e tool/tsh -e operator )
+test-go-unit: SUBJECT ?= $(shell go list ./... | grep -v -e integration -e tool/tsh -e integrations/operator )
 test-go-unit:
 	$(CGOFLAG) go test -cover -json -tags "$(PAM_TAG) $(FIPS_TAG) $(BPF_TAG) $(RDPCLIENT_TAG) $(TOUCHID_TAG) $(PIV_TEST_TAG)" $(PACKAGES) $(SUBJECT) $(FLAGS) $(ADDFLAGS) \
 		| tee $(TEST_LOG_DIR)/unit.json \
@@ -643,7 +643,7 @@ UNIT_ROOT_REGEX := ^TestRoot
 .PHONY: test-go-root
 test-go-root: ensure-webassets bpf-bytecode rdpclient $(TEST_LOG_DIR) $(RENDER_TESTS)
 test-go-root: FLAGS ?= -race -shuffle on
-test-go-root: PACKAGES = $(shell go list $(ADDFLAGS) ./... | grep -v -e integration -e operator)
+test-go-root: PACKAGES = $(shell go list $(ADDFLAGS) ./... | grep -v -e integration -e integrations/operator)
 test-go-root: $(VERSRC)
 	$(CGOFLAG) go test -json -run "$(UNIT_ROOT_REGEX)" -tags "$(PAM_TAG) $(FIPS_TAG) $(BPF_TAG) $(RDPCLIENT_TAG)" $(PACKAGES) $(FLAGS) $(ADDFLAGS) \
 		| tee $(TEST_LOG_DIR)/unit-root.json \
@@ -667,7 +667,7 @@ test-api:
 #
 .PHONY: test-operator
 test-operator:
-	make -C operator test
+	make -C integrations/operator test
 
 #
 # Runs cargo test on our Rust modules.
@@ -704,7 +704,7 @@ run-etcd:
 #
 .PHONY: integration
 integration: FLAGS ?= -v -race
-integration: PACKAGES = $(shell go list ./... | grep integration)
+integration: PACKAGES = $(shell go list ./... | grep 'integration\([^s]\|$$\)')
 integration:  $(TEST_LOG_DIR) $(RENDER_TESTS)
 	@echo KUBECONFIG is: $(KUBECONFIG), TEST_KUBE: $(TEST_KUBE)
 	$(CGOFLAG) go test -timeout 30m -json -tags "$(PAM_TAG) $(FIPS_TAG) $(BPF_TAG) $(RDPCLIENT_TAG)" $(PACKAGES) $(FLAGS) \
@@ -718,7 +718,7 @@ integration:  $(TEST_LOG_DIR) $(RENDER_TESTS)
 INTEGRATION_ROOT_REGEX := ^TestRoot
 .PHONY: integration-root
 integration-root: FLAGS ?= -v -race
-integration-root: PACKAGES = $(shell go list ./... | grep integration)
+integration-root: PACKAGES = $(shell go list ./... | grep 'integration\([^s]\|$$\)')
 integration-root: $(TEST_LOG_DIR) $(RENDER_TESTS)
 	$(CGOFLAG) go test -json -run "$(INTEGRATION_ROOT_REGEX)" $(PACKAGES) $(FLAGS) \
 		| tee $(TEST_LOG_DIR)/integration-root.json \

diff --git a/dronegen/container_image_products.go b/dronegen/container_image_products.go
@@ -94,7 +94,7 @@ func NewTeleportOperatorProduct(cloneDirectory string) *Product {
 	name := "teleport-operator"
 	return &Product{
 		Name:             name,
-		DockerfilePath:   path.Join(cloneDirectory, "operator", "Dockerfile"),
+		DockerfilePath:   path.Join(cloneDirectory, "integrations", "operator", "Dockerfile"),
 		WorkingDirectory: cloneDirectory,
 		SupportedArchs:   []string{"amd64", "arm", "arm64"},
 		ImageBuilder: func(repo *ContainerRepo, tag *ImageTag) *Image {

diff --git a/operator/.dockerignore → integrations/operator/.dockerignore b/operator/.dockerignore → integrations/operator/.dockerignore
diff --git a/operator/.gitignore → integrations/operator/.gitignore b/operator/.gitignore → integrations/operator/.gitignore
diff --git a/operator/Dockerfile → integrations/operator/Dockerfile b/operator/Dockerfile → integrations/operator/Dockerfile
@@ -19,11 +19,11 @@ RUN go mod download
 COPY *.go ./
 COPY lib/ lib/
 COPY gen/ gen/
-COPY operator/apis/ operator/apis/
-COPY operator/controllers/ operator/controllers/
-COPY operator/sidecar/ operator/sidecar/
-COPY operator/main.go operator/main.go
-COPY operator/namespace.go operator/namespace.go
+COPY integrations/operator/apis/ integrations/operator/apis/
+COPY integrations/operator/controllers/ integrations/operator/controllers/
+COPY integrations/operator/sidecar/ integrations/operator/sidecar/
+COPY integrations/operator/main.go integrations/operator/main.go
+COPY integrations/operator/namespace.go integrations/operator/namespace.go
 
 # Compiler package should use host-triplet-agnostic name (i.e. "x86-64-linux-gnu-gcc" instead of "gcc")
 #  in most cases, to avoid issues on systems with multiple versions of gcc (i.e. buildboxes)
@@ -34,7 +34,7 @@ ARG COMPILER_NAME TARGETOS TARGETARCH
 # CGO is required for github.com/gravitational/teleport/lib/system
 RUN echo "Targeting $TARGETOS/$TARGETARCH with CC=$COMPILER_NAME" && \
     CGO_ENABLED=1 CC=$COMPILER_NAME GOOS=$TARGETOS GOARCH=$TARGETARCH \
-    go build -a -o /go/bin/teleport-operator github.com/gravitational/teleport/operator
+    go build -a -o /go/bin/teleport-operator github.com/gravitational/teleport/integrations/operator
 
 # Create the image with the build operator on the $TARGETPLATFORM
 # TARGETPLATFORM is provided by Docker/buildx

diff --git a/operator/Makefile → integrations/operator/Makefile b/operator/Makefile → integrations/operator/Makefile
@@ -18,7 +18,7 @@ SHELL = /usr/bin/env bash -o pipefail
 .SHELLFLAGS = -ec
 
 # include BUILDBOX_VERSION, BUILDBOX and BUILDBOX_variant variables
-include ../build.assets/images.mk
+include ../../build.assets/images.mk
 
 # Configure which compiler and buildbox to use
 OS ?= $(shell go env GOOS)
@@ -74,20 +74,20 @@ manifests: crdgen controller-gen ## Generate WebhookConfiguration, ClusterRole a
 	$(eval PROTOBUF_MOD_PATH := $(shell go mod download --json github.com/gogo/protobuf | awk -F: '/"Dir"/ { print $$2 }' | tr -d ' ",'))
 	$(eval CUSTOM_IMPORTS_TMP_DIR := $(shell mktemp -d))
 	mkdir -p $(CUSTOM_IMPORTS_TMP_DIR)/github.com/gravitational/teleport/api/proto/teleport/legacy/types/wrappers
-	cp ../api/proto/teleport/legacy/types/wrappers/wrappers.proto $(CUSTOM_IMPORTS_TMP_DIR)/github.com/gravitational/teleport/api/proto/teleport/legacy/types/wrappers
+	cp ../../api/proto/teleport/legacy/types/wrappers/wrappers.proto $(CUSTOM_IMPORTS_TMP_DIR)/github.com/gravitational/teleport/api/proto/teleport/legacy/types/wrappers
 	protoc \
-		-I=../api/proto \
+		-I=../../api/proto \
 		-I=$(PROTOBUF_MOD_PATH) \
 		-I=$(CUSTOM_IMPORTS_TMP_DIR) \
 		--plugin=./crdgen/protoc-gen-crd \
 		--crd_out=:./config/crd/bases \
-		../api/proto/teleport/legacy/types/types.proto
+		../../api/proto/teleport/legacy/types/types.proto
 	rm -rf $(CUSTOM_IMPORTS_TMP_DIR)
 
 # Some comments have `{{xyz}}` which triggers the golang templating engine when installing the chart.
 # We don't want that, so we escape them.
 	$(foreach file, $(wildcard $(CURDIR)/config/crd/bases/*), \
-		$(shell sed 's/`{{/{{ `{{/g;s/}}`/}}` }}/g' $(file) > $(CURDIR)/../examples/chart/teleport-cluster/charts/teleport-operator/templates/$(notdir $(file))))
+		$(shell sed 's/`{{/{{ `{{/g;s/}}`/}}` }}/g' $(file) > $(CURDIR)/../../examples/chart/teleport-cluster/charts/teleport-operator/templates/$(notdir $(file))))
 
 .PHONY: generate
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
@@ -122,7 +122,7 @@ run: manifests generate fmt vet ## Run a controller from your host.
 .PHONY: docker-build
 docker-build: ## Build docker image with the manager.
 	docker buildx build --platform="$(OS)/$(ARCH)" --build-arg BUILDBOX=$(PLATFORM_BUILDBOX) \
-		--build-arg COMPILER_NAME=$(COMPILER) -t ${IMG} --load .. -f ./Dockerfile
+		--build-arg COMPILER_NAME=$(COMPILER) -t ${IMG} --load ../.. -f ./Dockerfile
 
 .PHONY: docker-push
 docker-push: ## Push docker image with the manager.

diff --git a/operator/PROJECT → integrations/operator/PROJECT b/operator/PROJECT → integrations/operator/PROJECT
diff --git a/operator/README.md → integrations/operator/README.md b/operator/README.md → integrations/operator/README.md
@@ -85,7 +85,7 @@ If you don't have a cluster yet, you can start one by using the [minikube](https
 You can obtain the docker image by pulling from `public.ecr.aws/gravitational/teleport`
 
 #### HELM chart from Teleport with the operator
-The [teleport-cluster Helm chart](../examples/chart/teleport-cluster) supports deploying the operator alongside teleport.
+The [teleport-cluster Helm chart](../../examples/chart/teleport-cluster) supports deploying the operator alongside teleport.
 
 #### Other tools
 We also need the following tools: `helm`, `kubectl` and `docker`
@@ -152,4 +152,4 @@ And now check if the role was created in Teleport and K8S (`teleport-cluster` na
 ```bash
 PROXY_POD=$(kubectl get po -l app=teleport-cluster -o jsonpath='{.items[0].metadata.name}')
 kubectl exec $PROXY_POD teleport -- tctl get roles/myrole
-```
+```
diff --git a/operator/apis/resources/constants.go → ...ions/operator/apis/resources/constants.go b/operator/apis/resources/constants.go → ...ions/operator/apis/resources/constants.go
diff --git a/...or/apis/resources/v2/groupversion_info.go → ...or/apis/resources/v2/groupversion_info.go b/...or/apis/resources/v2/groupversion_info.go → ...or/apis/resources/v2/groupversion_info.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 
-	"github.com/gravitational/teleport/operator/apis/resources"
+	"github.com/gravitational/teleport/integrations/operator/apis/resources"
 )
 
 var (

diff --git a/.../apis/resources/v2/samlconnector_types.go → .../apis/resources/v2/samlconnector_types.go b/.../apis/resources/v2/samlconnector_types.go → .../apis/resources/v2/samlconnector_types.go
@@ -20,7 +20,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/gravitational/teleport/api/types"
-	"github.com/gravitational/teleport/operator/apis/resources"
+	"github.com/gravitational/teleport/integrations/operator/apis/resources"
 )
 
 func init() {

diff --git a/operator/apis/resources/v2/user_types.go → .../operator/apis/resources/v2/user_types.go b/operator/apis/resources/v2/user_types.go → .../operator/apis/resources/v2/user_types.go
@@ -20,7 +20,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/gravitational/teleport/api/types"
-	"github.com/gravitational/teleport/operator/apis/resources"
+	"github.com/gravitational/teleport/integrations/operator/apis/resources"
 )
 
 func init() {

diff --git a/...pis/resources/v2/zz_generated.deepcopy.go → ...pis/resources/v2/zz_generated.deepcopy.go b/...pis/resources/v2/zz_generated.deepcopy.go → ...pis/resources/v2/zz_generated.deepcopy.go
diff --git a/...pis/resources/v3/githubconnector_types.go → ...pis/resources/v3/githubconnector_types.go b/...pis/resources/v3/githubconnector_types.go → ...pis/resources/v3/githubconnector_types.go
@@ -20,7 +20,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/gravitational/teleport/api/types"
-	"github.com/gravitational/teleport/operator/apis/resources"
+	"github.com/gravitational/teleport/integrations/operator/apis/resources"
 )
 
 func init() {

diff --git a/...or/apis/resources/v3/groupversion_info.go → ...or/apis/resources/v3/groupversion_info.go b/...or/apis/resources/v3/groupversion_info.go → ...or/apis/resources/v3/groupversion_info.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 
-	"github.com/gravitational/teleport/operator/apis/resources"
+	"github.com/gravitational/teleport/integrations/operator/apis/resources"
 )
 
 var (

diff --git a/.../apis/resources/v3/oidcconnector_types.go → .../apis/resources/v3/oidcconnector_types.go b/.../apis/resources/v3/oidcconnector_types.go → .../apis/resources/v3/oidcconnector_types.go
@@ -22,7 +22,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/gravitational/teleport/api/types"
-	"github.com/gravitational/teleport/operator/apis/resources"
+	"github.com/gravitational/teleport/integrations/operator/apis/resources"
 )
 
 func init() {

diff --git a/.../resources/v3/oidcconnector_types_test.go → .../resources/v3/oidcconnector_types_test.go b/.../resources/v3/oidcconnector_types_test.go → .../resources/v3/oidcconnector_types_test.go
diff --git a/...pis/resources/v3/zz_generated.deepcopy.go → ...pis/resources/v3/zz_generated.deepcopy.go b/...pis/resources/v3/zz_generated.deepcopy.go → ...pis/resources/v3/zz_generated.deepcopy.go
diff --git a/...or/apis/resources/v5/groupversion_info.go → ...or/apis/resources/v5/groupversion_info.go b/...or/apis/resources/v5/groupversion_info.go → ...or/apis/resources/v5/groupversion_info.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 
-	"github.com/gravitational/teleport/operator/apis/resources"
+	"github.com/gravitational/teleport/integrations/operator/apis/resources"
 )
 
 var (

diff --git a/operator/apis/resources/v5/role_types.go → .../operator/apis/resources/v5/role_types.go b/operator/apis/resources/v5/role_types.go → .../operator/apis/resources/v5/role_types.go
@@ -20,7 +20,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/gravitational/teleport/api/types"
-	"github.com/gravitational/teleport/operator/apis/resources"
+	"github.com/gravitational/teleport/integrations/operator/apis/resources"
 )
 
 func init() {

diff --git a/...pis/resources/v5/zz_generated.deepcopy.go → ...pis/resources/v5/zz_generated.deepcopy.go b/...pis/resources/v5/zz_generated.deepcopy.go → ...pis/resources/v5/zz_generated.deepcopy.go
diff --git a/...or/apis/resources/v6/groupversion_info.go → ...or/apis/resources/v6/groupversion_info.go b/...or/apis/resources/v6/groupversion_info.go → ...or/apis/resources/v6/groupversion_info.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/scheme"
 
-	"github.com/gravitational/teleport/operator/apis/resources"
+	"github.com/gravitational/teleport/integrations/operator/apis/resources"
 )
 
 var (

diff --git a/operator/apis/resources/v6/role_types.go → .../operator/apis/resources/v6/role_types.go b/operator/apis/resources/v6/role_types.go → .../operator/apis/resources/v6/role_types.go
@@ -20,7 +20,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/gravitational/teleport/api/types"
-	"github.com/gravitational/teleport/operator/apis/resources"
+	"github.com/gravitational/teleport/integrations/operator/apis/resources"
 )
 
 func init() {

diff --git a/...pis/resources/v6/zz_generated.deepcopy.go → ...pis/resources/v6/zz_generated.deepcopy.go b/...pis/resources/v6/zz_generated.deepcopy.go → ...pis/resources/v6/zz_generated.deepcopy.go
diff --git a/...ources.teleport.dev_githubconnectors.yaml → ...ources.teleport.dev_githubconnectors.yaml b/...ources.teleport.dev_githubconnectors.yaml → ...ources.teleport.dev_githubconnectors.yaml
diff --git a/...esources.teleport.dev_oidcconnectors.yaml → ...esources.teleport.dev_oidcconnectors.yaml b/...esources.teleport.dev_oidcconnectors.yaml → ...esources.teleport.dev_oidcconnectors.yaml