everettraven · Sep 27, 2023 · Sep 26, 2023 · Sep 26, 2023 · Sep 27, 2023 · Sep 27, 2023
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,9 +1,5 @@
 version: 2
 updates:
-  - package-ecosystem: docker
-    directory: "/images/ansible-operator"
-    schedule:
-      interval: daily
   - package-ecosystem: docker
     directory: "/images/custom-scorecard-tests"
     schedule:

diff --git a/.github/workflows/deploy-manual.yml b/.github/workflows/deploy-manual.yml
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -73,7 +73,7 @@ jobs:
     environment: deploy
     strategy:
       matrix:
-        id: ["operator-sdk", "helm-operator", "scorecard-test", "ansible-operator"]
+        id: ["operator-sdk", "helm-operator", "scorecard-test"]
     steps:
 
     - name: set up qemu

diff --git a/.github/workflows/freshen-images.yml b/.github/workflows/freshen-images.yml
@@ -32,7 +32,7 @@ jobs:
     strategy:
       matrix:
         # TODO(estroz): support scorecard-test-kuttl rebuilds.
-        id: ["operator-sdk", "ansible-operator", "helm-operator", "scorecard-test"]
+        id: ["operator-sdk", "helm-operator", "scorecard-test"]
     steps:
     - name: set up qemu
       uses: docker/setup-qemu-action@v2

diff --git a/.github/workflows/freshen-images/build.sh b/.github/workflows/freshen-images/build.sh
@@ -22,7 +22,7 @@ IMAGE_DO=--load
 # Space-separated list of git tags.
 # The --tags arg can be comma-separated.
 TAGS=
-# ID of the image, ex. operator-sdk, ansible-operator.
+# ID of the image, ex. operator-sdk.
 IMAGE_ID=
 # Update all images.
 FORCE=0
@@ -78,20 +78,6 @@ git clone https://github.com/operator-framework/operator-sdk.git $tmp
 trap "rm -rf $tmp" EXIT
 pushd $tmp
 
-case $IMAGE_ID in
-ansible-operator)
-  # ansible-operator has a base image that must be rebuilt in advance if necessary.
-  # This script will detect that the base is fresh when inspecting ansible-operator's
-  # Dockerfile and build it.
-  for i in ${!TAGS[*]}; do
-    if (($i=0)); then
-      build_ansible_base ${TAGS[$i]} "$PLATFORMS" true
-    else
-      build_ansible_base ${TAGS[$i]} "$PLATFORMS" false
-    fi
-  done
-;;
-esac
 
 # Build the image defined by IMAGE_ID for each tag for a set of platforms.
 for i in ${!TAGS[*]}; do

diff --git a/.github/workflows/freshen-images/lib.sh b/.github/workflows/freshen-images/lib.sh
@@ -48,38 +48,6 @@ function is_dockerfile_fresh() {
   done
 }
 
-# Build an image at path ./images/ansible-operator/base.Dockerfile checked out at git tag $1
-# for all platforms in $2. Semantics are otherwise the same as build_generic.
-function build_ansible_base() {
-  local tag=$1
-  local platforms=$2
-  local buildlatest=$3
-  local dockerfile=./images/ansible-operator/base.Dockerfile
-
-
-  git checkout refs/tags/$tag
-  local ansible_base_image_tag=$(grep -oP 'FROM \K(quay\.io/operator-framework/ansible-operator-base:.+)' ./images/ansible-operator/Dockerfile)
-  # Attempt to get the git ref that built this image from the git_commit image label,
-  # falling back to parsing it from the image tag, which typically contains a git ref
-  # as the last hyphen-delimit element.
-  local ansible_base_git_ref=$(docker inspect --format '{{ index .Config.Labels "git_commit" }}' $ansible_base_image_tag)
-  if [[ $ansible_base_git_ref == "devel" || $ansible_base_git_ref == "" ]]; then
-    ansible_base_git_ref=$(echo $ansible_base_image_tag | sed -E 's|.+:.+-(.+)|\1|')
-  fi
-  git checkout $ansible_base_git_ref
-  if is_dockerfile_fresh "$dockerfile"; then
-    echo "Skipping build of $dockerfile, it is FRESH!"
-  else
-    # dockerfile is not fresh, rebuildng image
-    if $buildlatest; then
-      echo "Rebuilding image [$ansible_base_image_tag] and latest for [$platforms]"
-      _buildx --tag $ansible_base_image_tag --tag quay.io/operator-framework/ansible-operator-base:latest --platform "$platforms" --file "$dockerfile" $IMAGE_DO --build-arg GIT_COMMIT=$ansible_base_git_ref ./images/ansible-operator
-    else
-      echo "Rebuilding image [$ansible_base_image_tag] for [$platforms]"
-      _buildx --tag $ansible_base_image_tag --platform "$platforms" --file "$dockerfile" $IMAGE_DO --build-arg GIT_COMMIT=$ansible_base_git_ref ./images/ansible-operator
-    fi
-  fi
-}
 
 # Build an image at path ./images/$2/Dockerfile checked out at git tag $1
 # for all platforms in $3. Tag is assumed to be "v"+semver; the image is tagged

diff --git a/.github/workflows/test-ansible.yml b/.github/workflows/test-ansible.yml
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -36,16 +36,6 @@ builds:
       - linux_ppc64le
       - linux_s390x
 
-  # ansible-operator build steps
-  - id: ansible-operator
-    main: ./cmd/ansible-operator
-    binary: ansible-operator
-    mod_timestamp: "{{ .CommitTimestamp }}"
-    asmflags: *build-asmflags
-    gcflags: *build-gcflags
-    ldflags: *build-ldflags
-    targets: *build-targets
-
   # helm-operator build steps
   - id: helm-operator
     main: ./cmd/helm-operator

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 SHELL = /bin/bash
 
-# IMAGE_VERSION represents the ansible-operator, helm-operator, and scorecard subproject versions.
+# IMAGE_VERSION represents the helm-operator, and scorecard subproject versions.
 # This value must be updated to the release tag of the most recent release, a change that must
 # occur in the release commit. IMAGE_VERSION will be removed once each subproject that uses this
 # version is moved to a separate repo and release process.
@@ -71,16 +71,16 @@ clean: ## Cleanup build artifacts and tool binaries.
 ##@ Build
 
 .PHONY: install
-install: ## Install operator-sdk, ansible-operator, and helm-operator.
-	go install $(GO_BUILD_ARGS) ./cmd/{operator-sdk,ansible-operator,helm-operator}
+install: ## Install operator-sdk and helm-operator.
+	go install $(GO_BUILD_ARGS) ./cmd/{operator-sdk,helm-operator}
 
 .PHONY: build
-build: ## Build operator-sdk, ansible-operator, and helm-operator.
+build: ## Build operator-sdk and helm-operator.
 	@mkdir -p $(BUILD_DIR)
-	go build $(GO_BUILD_ARGS) -o $(BUILD_DIR) ./cmd/{operator-sdk,ansible-operator,helm-operator}
+	go build $(GO_BUILD_ARGS) -o $(BUILD_DIR) ./cmd/{operator-sdk,helm-operator}
 
-.PHONY: build/operator-sdk build/ansible-operator build/helm-operator
-build/operator-sdk build/ansible-operator build/helm-operator:
+.PHONY: build/operator-sdk build/helm-operator
+build/operator-sdk build/helm-operator:
 	go build $(GO_BUILD_ARGS) -o $(BUILD_DIR)/$(@F) ./cmd/$(@F)
 
 # Build scorecard binaries.
@@ -92,13 +92,9 @@ build/scorecard-test build/scorecard-test-kuttl build/custom-scorecard-tests:
 
 # Convenience wrapper for building all remotely hosted images.
 .PHONY: image-build
-IMAGE_TARGET_LIST = operator-sdk helm-operator ansible-operator scorecard-test scorecard-test-kuttl
+IMAGE_TARGET_LIST = operator-sdk helm-operator scorecard-test scorecard-test-kuttl
 image-build: $(foreach i,$(IMAGE_TARGET_LIST),image/$(i)) ## Build all images.
 
-# Convenience wrapper for building dependency base images.
-.PHONY: image-build-base
-IMAGE_BASE_TARGET_LIST = ansible-operator
-image-build-base: $(foreach i,$(IMAGE_BASE_TARGET_LIST),image-base/$(i)) ## Build all images.
 
 # Build an image.
 BUILD_IMAGE_REPO = quay.io/operator-framework
@@ -159,7 +155,7 @@ TEST_PKGS = $(shell go list ./... | grep -v -E 'github.com/operator-framework/op
 test-unit: ## Run unit tests
 	go test -coverprofile=coverage.out -covermode=count -short $(TEST_PKGS)
 
-e2e_tests := test-e2e-go test-e2e-ansible test-e2e-ansible-molecule test-e2e-helm test-e2e-integration
+e2e_tests := test-e2e-go test-e2e-helm test-e2e-integration
 e2e_targets := test-e2e $(e2e_tests)
 .PHONY: $(e2e_targets)
 
@@ -193,12 +189,6 @@ test-e2e-sample-go:: dev-install cluster-create ## Run Memcached Operator Sample
 	make test-e2e -C ./testdata/go/v3/memcached-operator/
 test-e2e-go:: image/custom-scorecard-tests ## Run Go e2e tests
 	go test ./test/e2e/go -v -ginkgo.v
-test-e2e-ansible:: image/ansible-operator ## Run Ansible e2e tests
-	go test -count=1 ./internal/ansible/proxy/...
-	go test ./test/e2e/ansible -v -ginkgo.v
-test-e2e-ansible-molecule:: install dev-install image/ansible-operator ## Run molecule-based Ansible e2e tests
-	go run ./hack/generate/samples/molecule/generate.go
-	./hack/tests/e2e-ansible-molecule.sh
 test-e2e-helm:: image/helm-operator ## Run Helm e2e tests
 	go test ./test/e2e/helm -v -ginkgo.v
 test-e2e-integration:: ## Run integration tests

diff --git a/cmd/ansible-operator/main.go b/cmd/ansible-operator/main.go
diff --git a/go.mod b/go.mod
@@ -13,14 +13,14 @@ require (
 	github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2
 	github.com/onsi/ginkgo/v2 v2.7.0
 	github.com/onsi/gomega v1.24.2
+	github.com/operator-framework/ansible-operator-plugins v1.32.0
 	github.com/operator-framework/api v0.17.4-0.20230223191600-0131a6301e42
 	github.com/operator-framework/helm-operator-plugins v0.0.12-0.20230413193425-4632388adc61
 	github.com/operator-framework/java-operator-plugins v0.7.1-0.20230306190439-0eed476d2b75
 	github.com/operator-framework/operator-lib v0.11.1-0.20230306195046-28cadc6b6055
 	github.com/operator-framework/operator-manifest-tools v0.2.3-0.20230227155221-caa8b9e1ab12
 	github.com/operator-framework/operator-registry v1.28.0
 	github.com/prometheus/client_golang v1.14.0
-	github.com/prometheus/client_model v0.3.0
 	github.com/sergi/go-diff v1.2.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/afero v1.9.3
@@ -166,7 +166,6 @@ require (
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
 	github.com/otiai10/copy v1.2.0 // indirect
@@ -175,6 +174,7 @@ require (
 	github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
 	github.com/prometheus/common v0.37.0 // indirect
 	github.com/prometheus/procfs v0.8.0 // indirect
 	github.com/rivo/uniseg v0.4.2 // indirect