Add crds for connect, 1password items and permissions

operator-sdk create api --group onepassword --version v1 --kind OnePasswordItem --resource --controller

.VERSION

@@ -1 +1 @@
-1.9.1
+1.4.0

.devcontainer/devcontainer.json

@@ -1,25 +0,0 @@
-{
-  "name": "Kubebuilder DevContainer",
-  "image": "docker.io/golang:1.24",
-  "features": {
-    "ghcr.io/devcontainers/features/docker-in-docker:2": {},
-    "ghcr.io/devcontainers/features/git:1": {}
-  },
-
-  "runArgs": ["--network=host"],
-
-  "customizations": {
-    "vscode": {
-      "settings": {
-        "terminal.integrated.shell.linux": "/bin/bash"
-      },
-      "extensions": [
-        "ms-kubernetes-tools.vscode-kubernetes-tools",
-        "ms-azuretools.vscode-docker"
-      ]
-    }
-  },
-
-  "onCreateCommand": "bash .devcontainer/post-install.sh"
-}
-

.devcontainer/post-install.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-set -x
-
-curl -Lo ./kind https://kind.sigs.k8s.io/dl/latest/kind-linux-amd64
-chmod +x ./kind
-mv ./kind /usr/local/bin/kind
-
-curl -L -o kubebuilder https://go.kubebuilder.io/dl/latest/linux/amd64
-chmod +x kubebuilder
-mv kubebuilder /usr/local/bin/
-
-KUBECTL_VERSION=$(curl -L -s https://dl.k8s.io/release/stable.txt)
-curl -LO "https://dl.k8s.io/release/$KUBECTL_VERSION/bin/linux/amd64/kubectl"
-chmod +x kubectl
-mv kubectl /usr/local/bin/kubectl
-
-docker network create -d=bridge --subnet=172.19.0.0/24 kind
-
-kind version
-kubebuilder version
-docker --version
-go version
-kubectl version --client

.github/workflows/build.yml

@@ -1,22 +1,21 @@
-name: Build
-
-on:
-  push:
-    branches: [main]
-  pull_request:
+name: Build and Test
+on: [push, pull_request]
 
 jobs:
   build:
-    name: Run on Ubuntu
+    name: Build
     runs-on: ubuntu-latest
     steps:
-    - name: Clone the code
-      uses: actions/checkout@v4
-
-    - name: Setup Go
-      uses: actions/setup-go@v5
+    - name: Set up Go 1.x
+      uses: actions/setup-go@v2
       with:
-        go-version-file: go.mod
+        go-version: ^1.15
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v2
 
     - name: Build
       run: go build -v ./...
+
+    - name: Test
+      run: go test -v ./... -cover

.github/workflows/lint.yml

@@ -1,24 +0,0 @@
-name: Lint
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-
-jobs:
-  lint:
-    name: Run on Ubuntu
-    runs-on: ubuntu-latest
-    steps:
-      - name: Clone the code
-        uses: actions/checkout@v4
-
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: go.mod
-
-      - name: Run linter
-        uses: golangci/golangci-lint-action@v8
-        with:
-          version: v2.2

.github/workflows/pr-check-signed-commits.yml

@@ -1,13 +0,0 @@
-name: Check signed commits in PR
-on: pull_request_target
-
-jobs:
-  build:
-    name: Check signed commits in PR
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check signed commits in PR
-        uses: 1Password/check-signed-commits-action@v1

.github/workflows/release-pr.yml

@@ -14,10 +14,9 @@ jobs:
     outputs:
       result: ${{ steps.is_release_branch_without_pr.outputs.result }}
     steps:
-      -
-        id: is_release_branch_without_pr
+      - id: is_release_branch_without_pr
         name: Find matching PR
-        uses: actions/github-script@v7
+        uses: actions/github-script@v3
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
@@ -28,7 +27,7 @@ jobs:
 
             if(!releaseBranchName) { return false }
 
-            const {data: prs} = await github.rest.pulls.list({
+            const {data: prs} = await github.pulls.list({
                 ...context.repo,
                 state: 'open',
                 head: `1Password:${releaseBranchName}`,
@@ -43,20 +42,19 @@ jobs:
     name: Create Release Pull Request
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
 
       - name: Parse release version
         id: get_version
-        run: echo "version=$(echo "$GITHUB_REF" | sed 's|^refs/heads/release/v?*||g')" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=version::$(echo $GITHUB_REF | sed 's|^refs/heads/release/v?*||g')"
 
       - name: Prepare Pull Request
         id: prep_pr
         run: |
           CHANGELOG_PATH=$(printf "%s/CHANGELOG.md" "${GITHUB_WORKSPACE}")
-          LOG_ENTRY=$(awk '/START\/v[0-9]+\.[0-9]+\.[0-9]+*/{f=1; next} /---/{if (f == 1) exit} f' "${CHANGELOG_PATH}")
-          DELIMITER="$(openssl rand -hex 8)" # DELIMITER is randomly generated and unique for each run. For more information, see https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#understanding-the-risk-of-script-injections.
 
-          PR_BODY_CONTENT="
+          LOG_ENTRY=$(awk '/START\/v[0-9]+\.[0-9]+\.[0-9]+*/{f=1; next} /---/{if (f == 1) exit} f' "${CHANGELOG_PATH}")
+          export PR_BODY=$(cat <<EOF
           This is an automated PR for a new release.
 
           Please check the following before approving:
@@ -65,9 +63,14 @@ jobs:
           ---
           ## Release Changelog Preview
           ${LOG_ENTRY}
-          "
+          EOF
+          )
 
-          echo "pr_body<<${DELIMITER}${PR_BODY_CONTENT}${DELIMITER}" >> "${GITHUB_OUTPUT}"
+          # Sanitizes multiline strings for action outputs (https://medium.com/agorapulse-stories/23f56447d209)
+          PR_BODY="${PR_BODY//'%'/'%25'}"
+          PR_BODY="${PR_BODY//$'\n'/'%0A'}"
+          PR_BODY="${PR_BODY//$'\r'/'%0D'}"
+          echo "::set-output name=pr_body::$(echo "$PR_BODY")"
 
       - name: Create Pull Request via API
         id: post_pr

.github/workflows/release.yml

@@ -11,14 +11,15 @@ jobs:
     env:
       DOCKER_CLI_EXPERIMENTAL: "enabled"
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
+      -
+        name: Checkout
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0
-
-      - name: Docker meta
+      -
+        name: Docker meta
         id: meta
-        uses: docker/metadata-action@v5
+        uses: crazy-max/ghaction-docker-meta@v2
         with:
           images: |
             1password/onepassword-operator
@@ -27,25 +28,24 @@ jobs:
           tags: |
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
-
       - name: Get the version from tag
         id: get_version
         run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/v}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Docker Login
-        uses: docker/login-action@v3
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      -
+        name: Docker Login
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v5
+      -
+        name: Build and push
+        uses: docker/build-push-action@v2
         with:
           context: .
           file: Dockerfile

.github/workflows/test-e2e.yml

@@ -1,47 +0,0 @@
-name: Test E2E
-
-on:
-  pull_request:
-    types: [opened, synchronize, reopened]
-    branches: ['**']   # run for PRs targeting any branch (main and others)
-
-concurrency:
-  group: e2e-${{ github.event.pull_request.head.ref }}
-  cancel-in-progress: true # cancel previous job runs for the same branch
-
-jobs:
-  e2e-test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: go.mod
-
-      - name: Install dependencies
-        run: go mod tidy
-
-      - name: Create kind cluster
-        uses: helm/kind-action@v1
-        with:
-          cluster_name: onepassword-operator-test-e2e
-
-      - name: Install 1Password CLI
-        uses: 1password/install-cli-action@v2
-        with:
-          version: 2.32.0
-
-      - name: Create '1password-credentials.json' file
-        env:
-          OP_CONNECT_CREDENTIALS: ${{ secrets.OP_CONNECT_CREDENTIALS }}
-        run: |
-          echo "$OP_CONNECT_CREDENTIALS" > 1password-credentials.json
-
-      - name: Run E2E tests
-        run: make test-e2e
-        env:
-          OP_CONNECT_TOKEN: ${{ secrets.OP_CONNECT_TOKEN }}
-          OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}

.github/workflows/test.yml

@@ -1,24 +0,0 @@
-name: Tests
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-
-jobs:
-  test:
-    name: Run on Ubuntu
-    runs-on: ubuntu-latest
-    steps:
-      - name: Clone the code
-        uses: actions/checkout@v4
-
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: go.mod
-
-      - name: Running Tests
-        run: |
-          go mod tidy
-          make test

.gitignore

@@ -8,16 +8,14 @@
 bin
 testbin/*
 
-# Test binary, built with `go test -c`
+# Test binary, build with `go test -c`
 *.test
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
-# Go workspace file
-go.work
-
 # Kubernetes Generated files - skip generated files, except for vendored files
+
 !vendor/**/zz_generated.*
 
 # editor and IDE paraphernalia
@@ -25,6 +23,3 @@ go.work
 *.swp
 *.swo
 *~
-
-1password-credentials.json
-op-session

.golangci.yml

@@ -1,52 +0,0 @@
-version: "2"
-run:
-  allow-parallel-runners: true
-linters:
-  default: none
-  enable:
-    - copyloopvar
-    - dupl
-    - errcheck
-    - ginkgolinter
-    - goconst
-    - gocyclo
-    - govet
-    - ineffassign
-    - lll
-    - misspell
-    - nakedret
-    - prealloc
-    - revive
-    - staticcheck
-    - unconvert
-    - unparam
-    - unused
-  settings:
-    revive:
-      rules:
-        - name: comment-spacings
-        - name: import-shadowing
-  exclusions:
-    generated: lax
-    rules:
-      - linters:
-          - lll
-        path: api/*
-      - linters:
-          - dupl
-          - lll
-        path: internal/*
-    paths:
-      - third_party$
-      - builtin$
-      - examples$
-formatters:
-  enable:
-    - gofmt
-    - goimports
-  exclusions:
-    generated: lax
-    paths:
-      - third_party$
-      - builtin$
-      - examples$

CHANGELOG.md

@@ -12,94 +12,6 @@
 
 ---
 
-[//]: # (START/v1.9.1)
-# v1.9.1
-
-## Fixes
- * Operator no longer panics when handling 1Password items containing files. {#209}
-
-## Security
- * HTTP Proxy bypass using IPv6 Zone IDs in golang.org/x/net. {#210}
- * golang.org/x/net vulnerable to Cross-site Scripting. {#210}
-
----
-
-[//]: # (START/v1.9.0)
-# v1.9.0
-
-## Features
-  * Enable the Operator to authenticate to 1Password using service accounts. {#160}
-
-## Fixes
- * Update Operator to use SDK v1.34.1. {#185}
- * Pass Kubernetes context down to SDK/Connect. {#199}
-
----
-
-[//]: # (START/v1.8.1)
-# v1.8.1
-
-## Fixes
- * Upgrade operator to use Operator SDK v1.33.0. {#180}
-
----
-
-[//]: # (START/v1.8.0)
-# v1.8.0
-
-## Features
-  * Added volume projected detection. Credit to @mmorejon. {#168}
-
----
-
-[//]: # (START/v1.7.1)
-# v1.7.1
-
-## Fixes
- * Adjusting logging level on various logs to reduce unnecessary logging. {#164}
-
----
-
-[//]: # (START/v1.7.0)
-# v1.7.0
-
-## Features
-  * Upgraded operator to version 1.29.0. {#162}
-  * Upgraded Golang version to 1.20. {#161}
-  * Upgraded 1Password Connect version to 1.5.1. {#161}
-  * Added runAsNonRoot and allowPrivalegeEscalation to specs. {#151}
-  * Added code quality improvements. {#146}
-
----
-
-[//]: # (START/v1.6.0)
-# v1.6.0
-
-This version of the operator highlights the migration of the operator 
-to use the latest version of the `operator-sdk` (`1.25.0` at the time of this release).
-
-For the users, this shouldn't affect the functionality of the operator. 
-
-This migration enables us to use the new project structure, as well as updated packages that enables
-the team (as well as the contributors) to develop the operator more effective.
-
-## Features
-  * Migrate the operator to use the latest `operator-sdk` {#124}
-
----
-
-[//]: # (START/v1.5.0)
-# v1.5.0
-
-## Features
- * `OnePasswordItem` now contains a `status` which contains the status of creating the kubernetes secret for a OnePasswordItem. {#52}
-
-## Fixes
- * The operator no longer logs an error about changing the secret type if the secret type is not actually being changed.
- * Annotations on a deployment are no longer removed when the operator triggers a restart. {#112}
-
----
-
 [//]: # "START/v1.4.1"
 
 # v1.4.1

CONTRIBUTING.md

@@ -1,88 +0,0 @@
-# Contributing
-
-Thank you for your interest in contributing to the 1Password Kubernetes Operator project 👋! Before you start, please take a moment to read through this guide to understand our contribution process.
-
-## Testing
-
-All contributions must include tests where applicable.
-
-- **Unit tests** for pure Go logic.
-- **Integration tests** for controller/reconciler logic using envtest.
-- **E2E tests** for full cluster behavior with kind.
-
-👉 See the [Testing Guide](docs/testing.md) for details on when to use each, how to run them locally, and how they are run in CI. 
-
-----
-
-For functional testing, run the local version of the operator. From the project root:
-
-  ```sh
-  # Go to the K8s environment (e.g. minikube)
-  eval $(minikube docker-env)
-
-  # Build the local Docker image for the operator
-  make docker-build
-
-  # Deploy the operator
-  make deploy
-
-  # Remove the operator from K8s
-  make undeploy
-  ```
-
-- After making changes to the code:
-1. Rebuild the Docker image by running `make docker-build`
-2. Restart deployment `make restart`
-
-----
-
-- For testing the changes made to the `OnePasswordItem` Custom Resource Definition (CRD), you need to re-generate the object:
-  ```sh
-  make manifests
-  ```
-
-- Run tests for the operator:
-
-  ```sh
-  make test
-  ```
-
-You can check other available commands that may come in handy by running `make help`.
-
-## Debugging
-
-- Running `kubectl describe pod` will fetch details about pods. This includes configuration information about the container(s) and Pod (labels, resource requirements, etc) and status information about the container(s) and Pod (state, readiness, restart count, events, etc.).
-- Running `kubectl logs ${POD_NAME} ${CONTAINER_NAME}` will print the logs from the container(s) in a pod. This can help with debugging issues by inspection.
-- Running `kubectl exec ${POD_NAME} -c ${CONTAINER_NAME} -- ${CMD}` allows executing a command inside a specific container.
-
-For more debugging documentation, see: https://kubernetes.io/docs/tasks/debug/debug-application/debug-pods/
-
-## Documentation Updates
-
-If applicable, update the [USAGEGUIDE.md](./USAGEGUIDE.md) and [README.md](./README.md) to reflect any changes introduced by the new code.
-
-## Sign your commits
-
-To get your PR merged, we require you to sign your commits. There are three options you can choose from.
-
-### Sign commits with 1Password
-
-You can sign commits using 1Password, which lets you sign commits with biometrics without the signing key leaving the local 1Password process.
-
-Learn how to use [1Password to sign your commits](https://developer.1password.com/docs/ssh/git-commit-signing/).
-
-### Sign commits with ssh-agent
-
-Follow the steps below to set up commit signing with `ssh-agent`:
-
-1. [Generate an SSH key and add it to ssh-agent](https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent)
-2. [Add the SSH key to your GitHub account](https://docs.github.com/en/authentication/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account)
-3. [Configure git to use your SSH key for commits signing](https://docs.github.com/en/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key#telling-git-about-your-ssh-key)
-
-### Sign commits with gpg
-
-Follow the steps below to set up commit signing with `gpg`:
-
-1. [Generate a GPG key](https://docs.github.com/en/authentication/managing-commit-signature-verification/generating-a-new-gpg-key)
-2. [Add the GPG key to your GitHub account](https://docs.github.com/en/authentication/managing-commit-signature-verification/adding-a-gpg-key-to-your-github-account)
-3. [Configure git to use your GPG key for commits signing](https://docs.github.com/en/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key#telling-git-about-your-gpg-key)

Dockerfile

@@ -1,35 +1,21 @@
 # Build the manager binary
-FROM golang:1.24 AS builder
-ARG TARGETOS
-ARG TARGETARCH
+FROM golang:1.17 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
 COPY go.mod go.mod
 COPY go.sum go.sum
-
-# Download dependencies
+# cache deps before building and copying source so that we don't need to re-download as much
+# and so that source changes don't invalidate our downloaded layer
 RUN go mod download
 
 # Copy the go source
-COPY cmd/main.go cmd/main.go
+COPY main.go main.go
 COPY api/ api/
-COPY internal/controller/ internal/controller/
-COPY pkg/ pkg/
-COPY version/ version/
+COPY controllers/ controllers/
 
 # Build
-# the GOARCH has not a default value to allow the binary be built according to the host where the command
-# was called. For example, if we call make docker-build in a local env which has the Apple Silicon M1 SO
-# the docker BUILDPLATFORM arg will be linux/arm64 when for Apple x86 it will be linux/amd64. Therefore,
-# by leaving it empty we can ensure that the container and binary shipped on it will have the same platform.
-RUN --mount=type=cache,target=/go/pkg/mod \
-    --mount=type=cache,target=/root/.cache/go-build \
-    CGO_ENABLED=0 \
-    GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} \
-    go build \
-    -ldflags "-X \"github.com/1Password/onepassword-operator/version.Version=$operator_version\"" \
-    -o manager cmd/main.go
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager main.go
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
@@ -37,6 +23,5 @@ FROM gcr.io/distroless/static:nonroot
 WORKDIR /
 COPY --from=builder /workspace/manager .
 USER 65532:65532
-COPY config/connect/ config/connect/
 
 ENTRYPOINT ["/manager"]

Makefile

@@ -1,15 +1,9 @@
-export MAIN_BRANCH ?= main
-
 # VERSION defines the project version for the bundle.
 # Update this value when you upgrade the version of your project.
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 1.9.1
-
-# DEPLOYMENT_NAME defines Kubernetes deployment name for the operator.
-# It should be the same as in 'config/manager/manager.yaml'
-DEPLOYMENT_NAME ?= onepassword-connect-operator
+VERSION ?= 0.0.1
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
@@ -34,8 +28,8 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 # This variable is used to construct full image tags for bundle and catalog images.
 #
 # For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
-# onepassword.com/onepassword-operator-bundle:$VERSION and onepassword.com/onepassword-operator-catalog:$VERSION.
-IMAGE_TAG_BASE ?= onepassword.com/onepassword-operator
+# onepassword.com/onepassword-operator-new-bundle:$VERSION and onepassword.com/onepassword-operator-new-catalog:$VERSION.
+IMAGE_TAG_BASE ?= onepassword.com/onepassword-operator-new
 
 # BUNDLE_IMG defines the image:tag used for the bundle.
 # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
@@ -52,12 +46,10 @@ ifeq ($(USE_IMAGE_DIGESTS), true)
 	BUNDLE_GEN_FLAGS += --use-image-digests
 endif
 
-# Set the Operator SDK version to use. By default, what is installed on the system is used.
-# This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
-OPERATOR_SDK_VERSION ?= v1.41.1
-
 # Image URL to use all building/pushing image targets
-IMG ?= 1password/onepassword-operator:latest
+IMG ?= controller:latest
+# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
+ENVTEST_K8S_VERSION = 1.23
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -66,13 +58,8 @@ else
 GOBIN=$(shell go env GOBIN)
 endif
 
-# CONTAINER_TOOL defines the container tool to be used for building images.
-# Be aware that the target commands are only tested with Docker which is
-# scaffolded by default. However, you might want to replace it to use other
-# tools. (i.e. podman)
-CONTAINER_TOOL ?= docker
-
 # Setting SHELL to bash allows bash commands to be executed by recipes.
+# This is a requirement for 'setup-envtest.sh' in the test target.
 # Options are set to exit when a recipe line exits non-zero or a piped command fails.
 SHELL = /usr/bin/env bash -o pipefail
 .SHELLFLAGS = -ec
@@ -84,7 +71,7 @@ all: build
 
 # The help target prints out all targets with their descriptions organized
 # beneath their categories. The categories are represented by '##@' and the
-# target descriptions by '##'. The awk command is responsible for reading the
+# target descriptions by '##'. The awk commands is responsible for reading the
 # entire set of makefiles included in this invocation, looking for lines of the
 # file as xyz: ## something, and then pretty-format the target and help. Then,
 # if there's a line with ##@ something, that gets pretty-printed as a category.
@@ -116,93 +103,26 @@ vet: ## Run go vet against code.
 	go vet ./...
 
 .PHONY: test
-test: manifests generate fmt vet setup-envtest ## Run tests.
-	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test $(shell go list ./... | grep -v /test/e2e) -coverprofile cover.out
-
-# TODO(user): To use a different vendor for e2e tests, modify the setup under 'tests/e2e'.
-# The default setup assumes Kind is pre-installed and builds/loads the Manager Docker image locally.
-# CertManager is installed by default; skip with:
-# - CERT_MANAGER_INSTALL_SKIP=true
-KIND_CLUSTER ?= onepassword-operator-test-e2e
-
-.PHONY: setup-test-e2e
-setup-test-e2e: ## Set up a Kind cluster for e2e tests if it does not exist
-	@command -v $(KIND) >/dev/null 2>&1 || { \
-		echo "Kind is not installed. Please install Kind manually."; \
-		exit 1; \
-	}
-	@case "$$($(KIND) get clusters)" in \
-		*"$(KIND_CLUSTER)"*) \
-			echo "Kind cluster '$(KIND_CLUSTER)' already exists. Skipping creation." ;; \
-		*) \
-			echo "Creating Kind cluster '$(KIND_CLUSTER)'..."; \
-			$(KIND) create cluster --name $(KIND_CLUSTER) ;; \
-	esac
-
-.PHONY: test-e2e
-test-e2e: setup-test-e2e manifests generate fmt vet ## Run the e2e tests. Expected an isolated environment using Kind.
-	KIND_CLUSTER=$(KIND_CLUSTER) go test ./test/e2e/ -v -ginkgo.v
-	$(MAKE) cleanup-test-e2e
-
-.PHONY: cleanup-test-e2e
-cleanup-test-e2e: ## Tear down the Kind cluster used for e2e tests
-	@$(KIND) delete cluster --name $(KIND_CLUSTER)
-
-.PHONY: lint
-lint: golangci-lint ## Run golangci-lint linter
-	$(GOLANGCI_LINT) run
-
-.PHONY: lint-fix
-lint-fix: golangci-lint ## Run golangci-lint linter and perform fixes
-	$(GOLANGCI_LINT) run --fix
-
-.PHONY: lint-config
-lint-config: golangci-lint ## Verify golangci-lint linter configuration
-	$(GOLANGCI_LINT) config verify
+test: manifests generate fmt vet envtest ## Run tests.
+	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./... -coverprofile cover.out
 
 ##@ Build
 
 .PHONY: build
-build: manifests generate fmt vet ## Build manager binary.
-	go build -o bin/manager cmd/main.go
+build: generate fmt vet ## Build manager binary.
+	go build -o bin/manager main.go
 
 .PHONY: run
 run: manifests generate fmt vet ## Run a controller from your host.
-	go run ./cmd/main.go
+	go run ./main.go
 
-# If you wish to build the manager image targeting other platforms you can use the --platform flag.
-# (i.e. docker build --platform linux/arm64). However, you must enable docker buildKit for it.
-# More info: https://docs.docker.com/develop/develop-images/build_enhancements/
 .PHONY: docker-build
-docker-build: ## Build docker image with the manager.
-	DOCKER_BUILDKIT=1 $(CONTAINER_TOOL) build -t ${IMG} .
+docker-build: test ## Build docker image with the manager.
+	docker build -t ${IMG} .
 
 .PHONY: docker-push
 docker-push: ## Push docker image with the manager.
-	$(CONTAINER_TOOL) push ${IMG}
-
-# PLATFORMS defines the target platforms for the manager image be built to provide support to multiple
-# architectures. (i.e. make docker-buildx IMG=myregistry/mypoperator:0.0.1). To use this option you need to:
-# - be able to use docker buildx. More info: https://docs.docker.com/build/buildx/
-# - have enabled BuildKit. More info: https://docs.docker.com/develop/develop-images/build_enhancements/
-# - be able to push the image to your registry (i.e. if you do not set a valid value via IMG=<myregistry/image:<tag>> then the export will fail)
-# To adequately provide solutions that are compatible with multiple platforms, you should consider using this option.
-PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
-.PHONY: docker-buildx
-docker-buildx: ## Build and push docker image for the manager for cross-platform support
-	# copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile
-	sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross
-	- $(CONTAINER_TOOL) buildx create --name onepassword-operator-builder
-	$(CONTAINER_TOOL) buildx use onepassword-operator-builder
-	- $(CONTAINER_TOOL) buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross .
-	- $(CONTAINER_TOOL) buildx rm onepassword-operator-builder
-	rm Dockerfile.cross
-
-.PHONY: build-installer
-build-installer: manifests generate kustomize ## Generate a consolidated YAML with CRDs and deployment.
-	mkdir -p dist
-	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
-	$(KUSTOMIZE) build config/default > dist/install.yaml
+	docker push ${IMG}
 
 ##@ Deployment
 
@@ -212,131 +132,67 @@ endif
 
 .PHONY: install
 install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config.
-	$(KUSTOMIZE) build config/crd | $(KUBECTL) apply -f -
+	$(KUSTOMIZE) build config/crd | kubectl apply -f -
 
 .PHONY: uninstall
 uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
-	$(KUSTOMIZE) build config/crd | $(KUBECTL) delete --ignore-not-found=$(ignore-not-found) -f -
-
-.PHONY: set-namespace
-set-namespace:
-	cd config/default && $(KUSTOMIZE) edit set namespace $(shell $(KUBECTL) config view --minify -o jsonpath={..namespace})
+	$(KUSTOMIZE) build config/crd | kubectl delete --ignore-not-found=$(ignore-not-found) -f -
 
 .PHONY: deploy
-deploy: manifests kustomize set-namespace ## Deploy controller to the K8s cluster specified in ~/.kube/config.
+deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
-	$(KUSTOMIZE) build config/default | $(KUBECTL) apply -f -
+	$(KUSTOMIZE) build config/default | kubectl apply -f -
 
 .PHONY: undeploy
-undeploy: kustomize ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
-	$(KUSTOMIZE) build config/default | $(KUBECTL) delete --ignore-not-found=$(ignore-not-found) -f -
-
-.PHONY: restart
-restart: ## Restarts deployment so that the operator picks up changes in the deployment configuration.
-	$(KUBECTL) rollout restart deployment $(DEPLOYMENT_NAME)
-
-##@ Dependencies
-
-## Location to install dependencies to
-LOCALBIN ?= $(shell pwd)/bin
-$(LOCALBIN):
-	mkdir -p $(LOCALBIN)
-
-## Tool Binaries
-KUBECTL ?= kubectl
-KIND ?= kind
-KUSTOMIZE ?= $(LOCALBIN)/kustomize
-CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
-ENVTEST ?= $(LOCALBIN)/setup-envtest
-GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
-
-## Tool Versions
-KUSTOMIZE_VERSION ?= v5.6.0
-CONTROLLER_TOOLS_VERSION ?= v0.18.0
-# ENVTEST_VERSION is the version of controller-runtime release branch to fetch the envtest setup script (i.e. release-0.20)
-ENVTEST_VERSION := $(shell go list -m -f "{{ .Version }}" sigs.k8s.io/controller-runtime | awk -F'[v.]' '{printf "release-%d.%d", $$2, $$3}')
-# ENVTEST_K8S_VERSION is the version of Kubernetes to use for setting up ENVTEST binaries (i.e. 1.31)
-ENVTEST_K8S_VERSION := $(shell go list -m -f "{{ .Version }}" k8s.io/api | awk -F'[v.]' '{printf "1.%d", $$3}')
-GOLANGCI_LINT_VERSION ?= v2.2.0
-
-.PHONY: kustomize
-kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
-$(KUSTOMIZE): $(LOCALBIN)
-	$(call go-install-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v5,$(KUSTOMIZE_VERSION))
+undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
+	$(KUSTOMIZE) build config/default | kubectl delete --ignore-not-found=$(ignore-not-found) -f -
 
+CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
 .PHONY: controller-gen
-controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
-$(CONTROLLER_GEN): $(LOCALBIN)
-	$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen,$(CONTROLLER_TOOLS_VERSION))
+controller-gen: ## Download controller-gen locally if necessary.
+	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0)
 
-.PHONY: setup-envtest
-setup-envtest: envtest ## Download the binaries required for ENVTEST in the local bin directory.
-	@echo "Setting up envtest binaries for Kubernetes version $(ENVTEST_K8S_VERSION)..."
-	@$(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path || { \
-		echo "Error: Failed to set up envtest binaries for version $(ENVTEST_K8S_VERSION)."; \
-		exit 1; \
-	}
+KUSTOMIZE = $(shell pwd)/bin/kustomize
+.PHONY: kustomize
+kustomize: ## Download kustomize locally if necessary.
+	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v3@v3.8.7)
 
+ENVTEST = $(shell pwd)/bin/setup-envtest
 .PHONY: envtest
-envtest: $(ENVTEST) ## Download setup-envtest locally if necessary.
-$(ENVTEST): $(LOCALBIN)
-	$(call go-install-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest,$(ENVTEST_VERSION))
+envtest: ## Download envtest-setup locally if necessary.
+	$(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)
 
-.PHONY: golangci-lint
-golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
-$(GOLANGCI_LINT): $(LOCALBIN)
-	$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/v2/cmd/golangci-lint,$(GOLANGCI_LINT_VERSION))
-
-# go-install-tool will 'go install' any package with custom target and name of binary, if it doesn't exist
-# $1 - target path with name of binary
-# $2 - package url which can be installed
-# $3 - specific version of package
-define go-install-tool
-@[ -f "$(1)-$(3)" ] || { \
-set -e; \
-package=$(2)@$(3) ;\
-echo "Downloading $${package}" ;\
-rm -f $(1) || true ;\
-GOBIN=$(LOCALBIN) go install $${package} ;\
-mv $(1) $(1)-$(3) ;\
-} ;\
-ln -sf $(1)-$(3) $(1)
+# go-get-tool will 'go get' any package $2 and install it to $1.
+PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
+define go-get-tool
+@[ -f $(1) ] || { \
+set -e ;\
+TMP_DIR=$$(mktemp -d) ;\
+cd $$TMP_DIR ;\
+go mod init tmp ;\
+echo "Downloading $(2)" ;\
+GOBIN=$(PROJECT_DIR)/bin go get $(2) ;\
+rm -rf $$TMP_DIR ;\
+}
 endef
 
-.PHONY: operator-sdk
-OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk
-operator-sdk: ## Download operator-sdk locally if necessary.
-ifeq (,$(wildcard $(OPERATOR_SDK)))
-ifeq (, $(shell which operator-sdk 2>/dev/null))
-	@{ \
-	set -e ;\
-	mkdir -p $(dir $(OPERATOR_SDK)) ;\
-	OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \
-	curl -sSLo $(OPERATOR_SDK) https://github.com/operator-framework/operator-sdk/releases/download/$(OPERATOR_SDK_VERSION)/operator-sdk_$${OS}_$${ARCH} ;\
-	chmod +x $(OPERATOR_SDK) ;\
-	}
-else
-OPERATOR_SDK = $(shell which operator-sdk)
-endif
-endif
-
 .PHONY: bundle
-bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
-	$(OPERATOR_SDK) generate kustomize manifests -q
+bundle: manifests kustomize ## Generate bundle manifests and metadata, then validate generated files.
+	operator-sdk generate kustomize manifests -q
 	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
-	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)
-	$(OPERATOR_SDK) bundle validate ./bundle
+	$(KUSTOMIZE) build config/manifests | operator-sdk generate bundle $(BUNDLE_GEN_FLAGS)
+	operator-sdk bundle validate ./bundle
 
 .PHONY: bundle-build
 bundle-build: ## Build the bundle image.
-	$(CONTAINER_TOOL) build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
+	docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
 
 .PHONY: bundle-push
 bundle-push: ## Push the bundle image.
 	$(MAKE) docker-push IMG=$(BUNDLE_IMG)
 
 .PHONY: opm
-OPM = $(LOCALBIN)/opm
+OPM = ./bin/opm
 opm: ## Download opm locally if necessary.
 ifeq (,$(wildcard $(OPM)))
 ifeq (,$(shell which opm 2>/dev/null))
@@ -344,7 +200,7 @@ ifeq (,$(shell which opm 2>/dev/null))
 	set -e ;\
 	mkdir -p $(dir $(OPM)) ;\
 	OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \
-	curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.55.0/$${OS}-$${ARCH}-opm ;\
+	curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.19.1/$${OS}-$${ARCH}-opm ;\
 	chmod +x $(OPM) ;\
 	}
 else
@@ -369,43 +225,9 @@ endif
 # https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator
 .PHONY: catalog-build
 catalog-build: opm ## Build a catalog image.
-	$(OPM) index add --container-tool $(CONTAINER_TOOL) --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
+	$(OPM) index add --container-tool docker --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
 
 # Push the catalog image.
 .PHONY: catalog-push
 catalog-push: ## Push a catalog image.
 	$(MAKE) docker-push IMG=$(CATALOG_IMG)
-
-## Release functions =====================
-GIT_BRANCH := $(shell git symbolic-ref --short HEAD)
-WORKTREE_CLEAN := $(shell git status --porcelain 1>/dev/null 2>&1; echo $$?)
-SCRIPTS_DIR := $(CURDIR)/scripts
-
-versionFile = $(CURDIR)/.VERSION
-curVersion := $(shell cat $(versionFile) | sed 's/^v//')
-
-release/prepare: .check_git_clean	## Updates changelog and creates release branch (call with 'release/prepare version=<new_version_number>')
-
-	@test $(version) || (echo "[ERROR] version argument not set."; exit 1)
-	@git fetch --quiet origin $(MAIN_BRANCH)
-
-	@echo $(version) | tr -d '\n' | tee $(versionFile) &>/dev/null
-
-	@NEW_VERSION=$(version) $(SCRIPTS_DIR)/prepare-release.sh
-
-release/tag: .check_git_clean	## Creates git tag
-	@git pull --ff-only
-	@echo "Applying tag 'v$(curVersion)' to HEAD..."
-	@git tag --sign "v$(curVersion)" -m "Release v$(curVersion)"
-	@echo "[OK] Success!"
-	@echo "Remember to call 'git push --tags' to persist the tag."
-
-## Helper functions =====================
-
-.check_git_clean:
-ifneq ($(GIT_BRANCH), $(MAIN_BRANCH))
-	@echo "[ERROR] Please checkout default branch '$(MAIN_BRANCH)' and re-run this command."; exit 1;
-endif
-ifneq ($(WORKTREE_CLEAN), 0)
-	@echo "[ERROR] Uncommitted changes found in worktree. Address them and try again."; exit 1;
-endif

PROJECT

@@ -1,14 +1,10 @@
-# Code generated by tool. DO NOT EDIT.
-# This file is used to track the info used to scaffold your project
-# and allow the plugins properly work.
-# More info: https://book.kubebuilder.io/reference/project-config.html
 domain: onepassword.com
 layout:
-- go.kubebuilder.io/v4
+- go.kubebuilder.io/v3
 plugins:
   manifests.sdk.operatorframework.io/v2: {}
   scorecard.sdk.operatorframework.io/v2: {}
-projectName: onepassword-operator
+projectName: onepassword-operator-new
 repo: github.com/1Password/onepassword-operator
 resources:
 - api:
@@ -16,6 +12,7 @@ resources:
     namespaced: true
   controller: true
   domain: onepassword.com
+  group: onepassword
   kind: OnePasswordItem
   path: github.com/1Password/onepassword-operator/api/v1
   version: v1

README.md

@@ -1,33 +1,107 @@
-<!-- Image sourced from https://blog.1password.com/introducing-secrets-automation/ -->
-<img alt="" role="img" src="https://blog.1password.com/posts/2021/secrets-automation-launch/header.svg"/>
+// TODO: Update README.md
 
-<div align="center">
-  <h1>1Password Connect Kubernetes Operator</h1>
-  <p>Integrate <a href="https://developer.1password.com/docs/connect">1Password Connect</a> with your Kubernetes Infrastructure</p>
-  <a href="https://github.com/1Password/onepassword-operator#-get-started">
-    <img alt="Get started" src="https://user-images.githubusercontent.com/45081667/226940040-16d3684b-60f4-4d95-adb2-5757a8f1bc15.png" height="37"/>
-  </a>
-</div>
+# 1Password Connect Kubernetes Operator
 
----
+The 1Password Connect Kubernetes Operator provides the ability to integrate Kubernetes with 1Password. This Operator manages `OnePasswordItem` Custom Resource Definitions (CRDs) that define the location of an Item stored in 1Password. The `OnePasswordItem` CRD, when created, will be used to compose a Kubernetes Secret containing the contents of the specified item.
 
-The 1Password Connect Kubernetes Operator provides the ability to integrate Kubernetes Secrets with 1Password. The operator also handles autorestarting deployments when 1Password items are updated.
+The 1Password Connect Kubernetes Operator also allows for Kubernetes Secrets to be composed from a 1Password Item through annotation of an Item Path on a deployment.
 
-## ✨ Get started
+The 1Password Connect Kubernetes Operator will continually check for updates from 1Password for any Kubernetes Secret that it has generated. If a Kubernetes Secret is updated, any Deployment using that secret can be automatically restarted.
 
-### 🚀 Quickstart
+## Setup
 
-1. Add the [1Password Helm Chart](https://github.com/1Password/connect-helm-charts) to your repository.
+Prerequisites:
 
-2. Run the following command to install Connect and the 1Password Kubernetes Operator in your infrastructure:
+- [1Password Command Line Tool Installed](https://1password.com/downloads/command-line/)
+- [kubectl installed](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
+- [docker installed](https://docs.docker.com/get-docker/)
+- [Generated a 1password-credentials.json file and issued a 1Password Connect API Token for the K8s Operator integration](https://support.1password.com/secrets-automation/)
+- [1Password Connect deployed to Kubernetes](https://support.1password.com/connect-deploy-kubernetes/#step-2-deploy-a-1password-connect-server). **NOTE**: If customization of the 1Password Connect deployment is not required you can skip this prerequisite.
 
-```
-helm install connect 1password/connect --set-file connect.credentials=1password-credentials-demo.json --set operator.create=true --set operator.token.value = <your connect token>
+### Quickstart for Deploying 1Password Connect to Kubernetes
+
+
+#### Deploy with Helm
+The 1Password Connect Helm Chart helps to simplify the deployment of 1Password Connect and the 1Password Connect Kubernetes Operator to Kubernetes. 
+
+[The 1Password Connect Helm Chart can be found here.](https://github.com/1Password/connect-helm-charts)
+
+#### Deploy using the Connect Operator
+If 1Password Connect is already running, you can skip this step. This guide will provide a quickstart option for deploying a default configuration of 1Password Connect via starting the deploying the 1Password Connect Operator, however it is recommended that you instead deploy your own manifest file if customization of the 1Password Connect deployment is desired.
+
+Encode the 1password-credentials.json file you generated in the prerequisite steps and save it to a file named op-session:
+
+```bash
+cat 1password-credentials.json | base64 | \
+  tr '/+' '_-' | tr -d '=' | tr -d '\n' > op-session
 ```
 
-3. Create a Kubernetes Secret from a 1Password item:
-
+Create a Kubernetes secret from the op-session file:
+```bash
+kubectl create secret generic op-credentials --from-file=op-session
 ```
+
+Add the following environment variable to the onepassword-connect-operator container in `deploy/operator.yaml`:
+```yaml
+- name: MANAGE_CONNECT
+  value: "true"
+```
+Adding this environment variable will have the operator automatically deploy a default configuration of 1Password Connect to the `default` namespace.
+### Kubernetes Operator Deployment
+
+**Create Kubernetes Secret for OP_CONNECT_TOKEN**
+
+"Create a Connect token for the operator and save it as a Kubernetes Secret: 
+
+```bash
+kubectl create secret generic onepassword-token --from-literal=token=<OP_CONNECT_TOKEN>"
+```
+
+If you do not have a token for the operator, you can generate a token and save it to kubernetes with the following command:
+```bash
+kubectl create secret generic onepassword-token --from-literal=token=$(op create connect token <server> op-k8s-operator --vault <vault>)
+```
+
+[More information on generating a token can be found here](https://support.1password.com/secrets-automation/#appendix-issue-additional-access-tokens)
+
+**Set Permissions For Operator**
+
+We must create a service account, role, and role binding and Kubernetes. Examples can be found in the `/deploy` folder.
+
+```bash
+kubectl apply -f deploy/permissions.yaml
+```
+
+**Create Custom One Password Secret Resource**
+
+```bash
+kubectl apply -f deploy/crds/onepassword.com_onepassworditems_crd.yaml
+```
+
+**Deploying the Operator**
+
+An sample Deployment yaml can be found at `/deploy/operator.yaml`.
+
+
+To further configure the 1Password Kubernetes Operator the Following Environment variables can be set in the operator yaml:
+
+- **OP_CONNECT_HOST** (required): Specifies the host name within Kubernetes in which to access the 1Password Connect.
+- **WATCH_NAMESPACE:** (default: watch all namespaces): Comma separated list of what Namespaces to watch for changes.
+- **POLLING_INTERVAL** (default: 600): The number of seconds the 1Password Kubernetes Operator will wait before checking for updates from 1Password Connect.
+- **MANAGE_CONNECT** (default: false): If set to true, on deployment of the operator, a default configuration of the OnePassword Connect Service will be deployed to the `default` namespace.
+- **AUTO_RESTART** (default: false): If set to true, the operator will restart any deployment using a secret from 1Password Connect. This can be overwritten by namespace, deployment, or individual secret. More details on AUTO_RESTART can be found in the ["Configuring Automatic Rolling Restarts of Deployments"](#configuring-automatic-rolling-restarts-of-deployments) section.
+
+Apply the deployment file:
+
+```yaml
+kubectl apply -f deploy/operator.yaml
+```
+
+## Usage
+
+To create a Kubernetes Secret from a 1Password item, create a yaml file with the following
+
+```yaml
 apiVersion: onepassword.com/v1
 kind: OnePasswordItem
 metadata:
@@ -38,28 +112,130 @@ spec:
 
 Deploy the OnePasswordItem to Kubernetes:
 
-```
+```bash
 kubectl apply -f <your_item>.yaml
 ```
 
-Check that the Kubernetes Secret has been generated:
+To test that the Kubernetes Secret check that the following command returns a secret:
 
-```
+```bash
 kubectl get secret <secret_name>
 ```
 
-### 📄 Usage
+Note: Deleting the `OnePasswordItem` that you've created will automatically delete the created Kubernetes Secret.
 
-Refer to the [Usage Guide](USAGEGUIDE.md) for documentation on how to deploy and use the 1Password Operator.
+To create a single Kubernetes Secret for a deployment, add the following annotations to the deployment metadata:
 
-## 💙 Community & Support
+```yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: deployment-example
+  annotations:
+    operator.1password.io/item-path: "vaults/<vault_id_or_title>/items/<item_id_or_title>"
+    operator.1password.io/item-name: "<secret_name>"
+```
 
-- File an [issue](https://github.com/1Password/onepassword-operator/issues) for bugs and feature requests.
-- Join the [Developer Slack workspace](https://join.slack.com/t/1password-devs/shared_invite/zt-1halo11ps-6o9pEv96xZ3LtX_VE0fJQA).
-- Subscribe to the [Developer Newsletter](https://1password.com/dev-subscribe/).
+Applying this yaml file will create a Kubernetes Secret with the name `<secret_name>` and contents from the location specified at the specified Item Path.
 
-## 🔐 Security
+The contents of the Kubernetes secret will be key-value pairs in which the keys are the fields of the 1Password item and the values are the corresponding values stored in 1Password. 
+In case of fields that store files, the file's contents will be used as the value.
+
+Within an item, if both a field storing a file and a field of another type have the same name, the file field will be ignored and the other field will take precedence.
+
+Note: Deleting the Deployment that you've created will automatically delete the created Kubernetes Secret only if the deployment is still annotated with `operator.1password.io/item-path` and `operator.1password.io/item-name` and no other deployment is using the secret.
+
+If a 1Password Item that is linked to a Kubernetes Secret is updated within the POLLING_INTERVAL the associated Kubernetes Secret will be updated. However, if you do not want a specific secret to be updated you can add the tag `operator.1password.io:ignore-secret` to the item stored in 1Password. While this tag is in place, any updates made to an item will not trigger an update to the associated secret in Kubernetes.
+
+---
+**NOTE**
+
+If multiple 1Password vaults/items have the same `title` when using a title in the access path, the desired action will be performed on the oldest vault/item. 
+
+Titles and field names that include white space and other characters that are not a valid [DNS subdomain name](https://kubernetes.io/docs/concepts/configuration/secret/) will create Kubernetes secrets that have titles and fields in the following format:
+ - Invalid characters before the first alphanumeric character and after the last alphanumeric character will be removed
+ - All whitespaces between words will be replaced by `-`
+ - All the letters will be lower-cased.
+
+---
+
+### Configuring Automatic Rolling Restarts of Deployments
+
+If a 1Password Item that is linked to a Kubernetes Secret is updated, any deployments configured to `auto-restart` AND are using that secret will be given a rolling restart the next time 1Password Connect is polled for updates.
+
+There are many levels of granularity on which to configure auto restarts on deployments: at the operator level, per-namespace, or per-deployment.
+
+**On the operator**: This method allows for managing auto restarts on all deployments within the namespaces watched by operator. Auto restarts can be enabled by setting the environemnt variable  `AUTO_RESTART` to true. If the value is not set, the operator will default this value to false.
+
+**Per Namespace**: This method allows for managing auto restarts on all deployments within a namespace. Auto restarts can by managed by setting the annotation `operator.1password.io/auto-restart` to either `true` or `false` on the desired namespace. An example of this is shown below:
+```yaml
+# enabled auto restarts for all deployments within a namespace unless overwritten within a deployment
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: "example-namespace"
+  annotations:
+    operator.1password.io/auto-restart: "true"
+```
+If the value is not set, the auto restart settings on the operator will be used. This value can be overwritten by deployment.
+
+**Per Deployment**
+This method allows for managing auto restarts on a given deployment. Auto restarts can by managed by setting the annotation `operator.1password.io/auto-restart` to either `true` or `false` on the desired deployment. An example of this is shown below:
+```yaml
+# enabled auto restarts for the deployment
+apiVersion: v1
+kind: Deployment
+metadata:
+  name: "example-deployment"
+  annotations:
+    operator.1password.io/auto-restart: "true"
+```
+If the value is not set, the auto restart settings on the namespace will be used.
+
+**Per OnePasswordItem Custom Resource**
+This method allows for managing auto restarts on a given OnePasswordItem custom resource. Auto restarts can by managed by setting the annotation `operator.1password.io/auto_restart` to either `true` or `false` on the desired OnePasswordItem. An example of this is shown below:
+```yaml
+# enabled auto restarts for the OnePasswordItem
+apiVersion: onepassword.com/v1
+kind: OnePasswordItem
+metadata:
+  name: example
+  annotations:
+    operator.1password.io/auto-restart: "true"
+```
+If the value is not set, the auto restart settings on the deployment will be used.
+
+## Development
+
+### Creating a Docker image
+
+To create a local version of the Docker image for testing, use the following `Makefile` target:
+```shell
+make build/local
+```
+
+### Building the Operator binary
+```shell
+make build/binary
+```
+
+The binary will be placed inside a `dist` folder within this repository.
+
+### Running Tests
+
+```shell
+make test
+```
+
+With coverage:
+```shell
+make test/coverage
+```
+
+## Security
 
 1Password requests you practice responsible disclosure if you discover a vulnerability. 
 
-Please file requests by sending an email to bugbounty@agilebits.com.
+Please file requests via [**BugCrowd**](https://bugcrowd.com/agilebits). 
+
+For information about security practices, please visit our [Security homepage](https://bugcrowd.com/agilebits).

USAGEGUIDE.md

@@ -1,221 +0,0 @@
-<img alt="" role="img" src="https://blog.1password.com/posts/2021/secrets-automation-launch/header.svg"/>
-<div align="center">
-  <h1>Usage Guide</h1>
-</div>
-
-## Table of Contents
-
-1. [Configuration Options](#configuration-options)
-2. [Use Kubernetes Operator with Service Account](#use-kubernetes-operator-with-service-account)
-    - [Create a Service Account](#1-create-a-service-account)
-    - [Create a Kubernetes secret](#2-create-a-kubernetes-secret-for-the-service-account)
-    - [Deploy the Operator](#3-deploy-the-operator)
-3. [Use Kubernetes Operator with Connect](#use-kubernetes-operator-with-connect)
-    - [Deploy with Helm](#1-deploy-with-helm)
-    - [Deploy manually](#2-deploy-manually)
-4. [Logging level](#logging-level)
-5. [Usage examples](#usage-examples)
-6. [How 1Password Items Map to Kubernetes Secrets](#how-1password-items-map-to-kubernetes-secrets)
-7. [Configuring Automatic Rolling Restarts of Deployments](#configuring-automatic-rolling-restarts-of-deployments)
-8. [Development](#development)
-
-
----
-
-## Configuration options
-There are 2 ways 1Password Operator can talk to 1Password servers:
-- [1Password Service Accounts](https://developer.1password.com/docs/service-accounts)
-- [1Password Connect](https://developer.1password.com/docs/connect/)
-
----
-
-##  Use Kubernetes Operator with Service Account
-
-### 1. [Create a service account](https://developer.1password.com/docs/service-accounts/get-started#create-a-service-account)
-### 2. Create a Kubernetes secret for the Service Account
-- Set `OP_SERVICE_ACCOUNT_TOKEN` environment variable to the service account token you created in the previous step. This token will be used by the operator to access 1Password items.
-- Create Kubernetes secret:
-
-```bash
-kubectl create secret generic onepassword-service-account-token --from-literal=token="$OP_SERVICE_ACCOUNT_TOKEN"
-```
-
-### 3. Deploy the Operator
-
-An sample Deployment yaml can be found at `/config/manager/manager.yaml`.
-To use Operator with Service Account, you need to set the `OP_SERVICE_ACCOUNT_TOKEN` environment variable in the `/config/manager/manager.yaml`. And remove `OP_CONNECT_TOKEN` and `OP_CONNECT_HOST` environment variables.
-
-To further configure the 1Password Kubernetes Operator the following Environment variables can be set in the operator yaml:
-
-- **OP_SERVICE_ACCOUNT_TOKEN** *(required)*: Specifies Service Account token within Kubernetes to access the 1Password items.
-- **WATCH_NAMESPACE:** *(default: watch all namespaces)*: Comma separated list of what Namespaces to watch for changes.
-- **POLLING_INTERVAL** *(default: 600)*: The number of seconds the 1Password Kubernetes Operator will wait before checking for updates from 1Password.
-- **AUTO_RESTART** (default: false): If set to true, the operator will restart any deployment using a secret from 1Password. This can be overwritten by namespace, deployment, or individual secret. More details on AUTO_RESTART can be found in the ["Configuring Automatic Rolling Restarts of Deployments"](#configuring-automatic-rolling-restarts-of-deployments) section.
-
-To deploy the operator, simply run the following command:
-
-```shell
-make deploy
-```
-
-**Undeploy Operator**
-
-```
-make undeploy
-```
-
----
-
-## Use Kubernetes Operator with Connect
-
-### 1. [Deploy with Helm](https://developer.1password.com/docs/k8s/operator/?deployment-type=helm#helm-step-1)
-### 2. [Deploy manually](https://developer.1password.com/docs/k8s/operator/?deployment-type=manual#manual-step-1)
-
-To further configure the 1Password Kubernetes Operator the following Environment variables can be set in the operator yaml:
-
-- **OP_CONNECT_HOST** *(required)*: Specifies the host name within Kubernetes in which to access the 1Password Connect.
-- **WATCH_NAMESPACE:** *(default: watch all namespaces)*: Comma separated list of what Namespaces to watch for changes.
-- **POLLING_INTERVAL** *(default: 600)*: The number of seconds the 1Password Kubernetes Operator will wait before checking for updates from 1Password Connect.
-- **MANAGE_CONNECT** *(default: false)*: If set to true, on deployment of the operator, a default configuration of the OnePassword Connect Service will be deployed to the current namespace.
-- **AUTO_RESTART** (default: false): If set to true, the operator will restart any deployment using a secret from 1Password Connect. This can be overwritten by namespace, deployment, or individual secret. More details on AUTO_RESTART can be found in the ["Configuring Automatic Rolling Restarts of Deployments"](#configuring-automatic-rolling-restarts-of-deployments) section.
-
----
-
-## Logging level
-You can set the logging level by setting `--zap-log-level` as an arg on the containers to either `debug`, `info` or `error`. The default value is `debug`.
-
-Example:
-```yaml
-....
-containers:
-      - command:
-        - /manager
-        args:
-        - --leader-elect
-        - --zap-log-level=info
-        image: 1password/onepassword-operator:latest
-....
-```
-
----
-
-## Usage examples
-Find usage [examples](https://developer.1password.com/docs/k8s/operator/?deployment-type=manual#usage-examples) on 1Password developer documentation.
-
----
-
-## How 1Password Items Map to Kubernetes Secrets
-
-The contents of the Kubernetes secret will be key-value pairs in which the keys are the fields of the 1Password item and the values are the corresponding values stored in 1Password.
-In case of fields that store files, the file's contents will be used as the value.
-
-Within an item, if both a field storing a file and a field of another type have the same name, the file field will be ignored and the other field will take precedence.
-
-Deleting the Deployment that you've created will automatically delete the created Kubernetes Secret only if the deployment is still annotated with `operator.1password.io/item-path` and `operator.1password.io/item-name` and no other deployment is using the secret.
-
-If a 1Password Item that is linked to a Kubernetes Secret is updated within the POLLING_INTERVAL the associated Kubernetes Secret will be updated. However, if you do not want a specific secret to be updated you can add the tag `operator.1password.io:ignore-secret` to the item stored in 1Password. While this tag is in place, any updates made to an item will not trigger an update to the associated secret in Kubernetes.
-
-
-If multiple 1Password vaults/items have the same `title` when using a title in the access path, the desired action will be performed on the oldest vault/item.
-
-Titles and field names that include white space and other characters that are not a valid [DNS subdomain name](https://kubernetes.io/docs/concepts/configuration/secret/) will create Kubernetes secrets that have titles and fields in the following format:
-
-- Invalid characters before the first alphanumeric character and after the last alphanumeric character will be removed
-- All whitespaces between words will be replaced by `-`
-- All the letters will be lower-cased.
-
----
-
-## Configuring Automatic Rolling Restarts of Deployments
-
-If a 1Password Item that is linked to a Kubernetes Secret is updated, any deployments configured to `auto-restart` AND are using that secret will be given a rolling restart the next time 1Password Connect is polled for updates.
-
-There are many levels of granularity on which to configure auto restarts on deployments:
-- Operator level
-- Per-namespace
-- Per-deployment
-
-**Operator Level**: This method allows for managing auto restarts on all deployments within the namespaces watched by operator. Auto restarts can be enabled by setting the environment variable `AUTO_RESTART` to true. If the value is not set, the operator will default this value to false.
-
-**Per Namespace**: This method allows for managing auto restarts on all deployments within a namespace. Auto restarts can by managed by setting the annotation `operator.1password.io/auto-restart` to either `true` or `false` on the desired namespace. An example of this is shown below:
-
-```yaml
-# enabled auto restarts for all deployments within a namespace unless overwritten within a deployment
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: "example-namespace"
-  annotations:
-    operator.1password.io/auto-restart: "true"
-```
-
-If the value is not set, the auto restart settings on the operator will be used. This value can be overwritten by deployment.
-
-**Per Deployment**
-This method allows for managing auto restarts on a given deployment. Auto restarts can by managed by setting the annotation `operator.1password.io/auto-restart` to either `true` or `false` on the desired deployment. An example of this is shown below:
-
-```yaml
-# enabled auto restarts for the deployment
-apiVersion: v1
-kind: Deployment
-metadata:
-  name: "example-deployment"
-  annotations:
-    operator.1password.io/auto-restart: "true"
-```
-
-If the value is not set, the auto restart settings on the namespace will be used.
-
-**Per OnePasswordItem Custom Resource**
-This method allows for managing auto restarts on a given OnePasswordItem custom resource. Auto restarts can by managed by setting the annotation `operator.1password.io/auto_restart` to either `true` or `false` on the desired OnePasswordItem. An example of this is shown below:
-
-```yaml
-# enabled auto restarts for the OnePasswordItem
-apiVersion: onepassword.com/v1
-kind: OnePasswordItem
-metadata:
-  name: example
-  annotations:
-    operator.1password.io/auto-restart: "true"
-```
-
-If the value is not set, the auto restart settings on the deployment will be used.
-
----
-
-## Development
-
-### How it works
-
-This project aims to follow the Kubernetes [Operator pattern](https://kubernetes.io/docs/concepts/extend-kubernetes/operator/)
-
-It uses [Controllers](https://kubernetes.io/docs/concepts/architecture/controller/)
-which provides a reconcile function responsible for synchronizing resources until the desired state is reached on the cluster
-
-### Test It Out
-
-1. Install the CRDs into the cluster:
-
-```sh
-make install
-```
-
-2. Run your controller (this will run in the foreground, so switch to a new terminal if you want to leave it running):
-
-```sh
-make run
-```
-
-**NOTE:** You can also run this in one step by running: `make install run`
-
-### Modifying the API definitions
-
-If you are editing the API definitions, generate the manifests such as CRs or CRDs using:
-
-```sh
-make manifests
-```
-
-**NOTE:** Run `make --help` for more information on all potential `make` targets
-
-More information can be found via the [Kubebuilder Documentation](https://book.kubebuilder.io/introduction.html)

api/v1/groupversion_info.go

@@ -1,30 +1,22 @@
 /*
-MIT License
+Copyright 2022.
 
-Copyright (c) 2020-2024 1Password
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+    http://www.apache.org/licenses/LICENSE-2.0
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
-// Package v1 contains API Schema definitions for the  v1 API group
-// +kubebuilder:object:generate=true
-// +groupName=onepassword.com
+// Package v1 contains API Schema definitions for the onepassword v1 API group
+//+kubebuilder:object:generate=true
+//+groupName=onepassword.onepassword.com
 package v1
 
 import (
@@ -34,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "onepassword.com", Version: "v1"}
+	GroupVersion = schema.GroupVersion{Group: "onepassword.onepassword.com", Version: "v1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

api/v1/onepassworditem_types.go

@@ -1,25 +1,17 @@
 /*
-MIT License
+Copyright 2022.
 
-Copyright (c) 2020-2024 1Password
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+    http://www.apache.org/licenses/LICENSE-2.0
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 package v1
@@ -36,52 +28,30 @@ type OnePasswordItemSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
+	// Foo is an example field of OnePasswordItem. Edit onepassworditem_types.go to remove/update
 	ItemPath string `json:"itemPath,omitempty"`
 }
 
-type OnePasswordItemConditionType string
-
-const (
-	// OnePasswordItemReady means the Kubernetes secret is ready for use.
-	OnePasswordItemReady OnePasswordItemConditionType = "Ready"
-)
-
-type OnePasswordItemCondition struct {
-	// Type of job condition, Completed.
-	Type OnePasswordItemConditionType `json:"type"`
-	// Status of the condition, one of True, False, Unknown.
-	Status metav1.ConditionStatus `json:"status"`
-	// Last time the condition transit from one status to another.
-	// +optional
-	LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"`
-	// Human-readable message indicating details about last transition.
-	// +optional
-	Message string `json:"message,omitempty"`
-}
-
 // OnePasswordItemStatus defines the observed state of OnePasswordItem
 type OnePasswordItemStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
-
-	Conditions []OnePasswordItemCondition `json:"conditions"`
 }
 
-// +kubebuilder:object:root=true
-// +kubebuilder:subresource:status
+//+kubebuilder:object:root=true
+//+kubebuilder:subresource:status
 
 // OnePasswordItem is the Schema for the onepassworditems API
 type OnePasswordItem struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
+	Type              string `json:"type,omitempty"`
 
-	// Kubernetes secret type. More info: https://kubernetes.io/docs/concepts/configuration/secret/#secret-types
-	Type   string                `json:"type,omitempty"`
 	Spec   OnePasswordItemSpec   `json:"spec,omitempty"`
 	Status OnePasswordItemStatus `json:"status,omitempty"`
 }
 
-// +kubebuilder:object:root=true
+//+kubebuilder:object:root=true
 
 // OnePasswordItemList contains a list of OnePasswordItem
 type OnePasswordItemList struct {

api/v1/zz_generated.deepcopy.go

@@ -1,27 +1,20 @@
 //go:build !ignore_autogenerated
+// +build !ignore_autogenerated
 
 /*
-MIT License
+Copyright 2022.
 
-Copyright (c) 2020-2024 1Password
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+    http://www.apache.org/licenses/LICENSE-2.0
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */
 
 // Code generated by controller-gen. DO NOT EDIT.
@@ -38,7 +31,7 @@ func (in *OnePasswordItem) DeepCopyInto(out *OnePasswordItem) {
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	out.Spec = in.Spec
-	in.Status.DeepCopyInto(&out.Status)
+	out.Status = in.Status
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OnePasswordItem.
@@ -59,22 +52,6 @@ func (in *OnePasswordItem) DeepCopyObject() runtime.Object {
 	return nil
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *OnePasswordItemCondition) DeepCopyInto(out *OnePasswordItemCondition) {
-	*out = *in
-	in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OnePasswordItemCondition.
-func (in *OnePasswordItemCondition) DeepCopy() *OnePasswordItemCondition {
-	if in == nil {
-		return nil
-	}
-	out := new(OnePasswordItemCondition)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *OnePasswordItemList) DeepCopyInto(out *OnePasswordItemList) {
 	*out = *in
@@ -125,13 +102,6 @@ func (in *OnePasswordItemSpec) DeepCopy() *OnePasswordItemSpec {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *OnePasswordItemStatus) DeepCopyInto(out *OnePasswordItemStatus) {
 	*out = *in
-	if in.Conditions != nil {
-		in, out := &in.Conditions, &out.Conditions
-		*out = make([]OnePasswordItemCondition, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OnePasswordItemStatus.

cmd/main.go

@@ -1,428 +0,0 @@
-/*
-MIT License
-
-Copyright (c) 2020-2024 1Password
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-package main
-
-import (
-	"context"
-	"crypto/tls"
-	"errors"
-	"flag"
-	"fmt"
-	"os"
-	"path/filepath"
-	"regexp"
-	"runtime"
-	"strconv"
-	"strings"
-	"time"
-
-	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
-	// to ensure that exec-entrypoint and run can make use of them.
-	_ "k8s.io/client-go/plugin/pkg/client/auth"
-
-	k8sruntime "k8s.io/apimachinery/pkg/runtime"
-	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
-	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/client-go/rest"
-	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/cache"
-	"sigs.k8s.io/controller-runtime/pkg/certwatcher"
-	"sigs.k8s.io/controller-runtime/pkg/healthz"
-	"sigs.k8s.io/controller-runtime/pkg/log/zap"
-	"sigs.k8s.io/controller-runtime/pkg/metrics/filters"
-	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
-	"sigs.k8s.io/controller-runtime/pkg/webhook"
-
-	onepasswordcomv1 "github.com/1Password/onepassword-operator/api/v1"
-	"github.com/1Password/onepassword-operator/internal/controller"
-	op "github.com/1Password/onepassword-operator/pkg/onepassword"
-	opclient "github.com/1Password/onepassword-operator/pkg/onepassword/client"
-	"github.com/1Password/onepassword-operator/pkg/utils"
-	"github.com/1Password/onepassword-operator/version"
-	// +kubebuilder:scaffold:imports
-)
-
-var (
-	scheme   = k8sruntime.NewScheme()
-	setupLog = ctrl.Log.WithName("setup")
-)
-
-const (
-	envPollingIntervalVariable    = "POLLING_INTERVAL"
-	manageConnect                 = "MANAGE_CONNECT"
-	restartDeploymentsEnvVariable = "AUTO_RESTART"
-	defaultPollingInterval        = 600
-
-	annotationRegExpString = "^operator.1password.io\\/[a-zA-Z\\.]+"
-)
-
-func printVersion() {
-	setupLog.Info(fmt.Sprintf("Operator Version: %s", version.OperatorVersion))
-	setupLog.Info(fmt.Sprintf("Go Version: %s", runtime.Version()))
-	setupLog.Info(fmt.Sprintf("Go OS/Arch: %s/%s", runtime.GOOS, runtime.GOARCH))
-	setupLog.Info(fmt.Sprintf("Version of operator-sdk: %v", version.OperatorSDKVersion))
-}
-
-func init() {
-	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
-
-	utilruntime.Must(onepasswordcomv1.AddToScheme(scheme))
-	// +kubebuilder:scaffold:scheme
-}
-
-func main() {
-	var metricsAddr string
-	var metricsCertPath, metricsCertName, metricsCertKey string
-	var webhookCertPath, webhookCertName, webhookCertKey string
-	var enableLeaderElection bool
-	var probeAddr string
-	var secureMetrics bool
-	var enableHTTP2 bool
-	var tlsOpts []func(*tls.Config)
-	flag.StringVar(&metricsAddr, "metrics-bind-address", "8080",
-		"The address the metrics endpoint binds to. "+
-			"Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.")
-	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081",
-		"The address the probe endpoint binds to.")
-	flag.BoolVar(&enableLeaderElection, "leader-elect", false,
-		"Enable leader election for controller manager. "+
-			"Enabling this will ensure there is only one active controller manager.")
-	flag.BoolVar(&secureMetrics, "metrics-secure", true,
-		"If set, the metrics endpoint is served securely via HTTPS. Use --metrics-secure=false to use HTTP instead.")
-	flag.StringVar(&metricsCertPath, "metrics-cert-path", "",
-		"The directory that contains the metrics server certificate.")
-	flag.StringVar(&metricsCertName, "metrics-cert-name", "tls.crt",
-		"The name of the metrics server certificate file.")
-	flag.StringVar(&metricsCertKey, "metrics-cert-key", "tls.key",
-		"The name of the metrics server key file.")
-	flag.BoolVar(&enableHTTP2, "enable-http2", false,
-		"If set, HTTP/2 will be enabled for the metrics")
-	opts := zap.Options{
-		Development: true,
-	}
-	opts.BindFlags(flag.CommandLine)
-	flag.Parse()
-
-	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
-
-	// if the enable-http2 flag is false (the default), http/2 should be disabled
-	// due to its vulnerabilities. More specifically, disabling http/2 will
-	// prevent from being vulnerable to the HTTP/2 Stream Cancelation and
-	// Rapid Reset CVEs. For more information see:
-	// - https://github.com/advisories/GHSA-qppj-fm5r-hxr3
-	// - https://github.com/advisories/GHSA-4374-p667-p6c8
-	disableHTTP2 := func(c *tls.Config) {
-		setupLog.Info("disabling http/2")
-		c.NextProtos = []string{"http/1.1"}
-	}
-
-	if !enableHTTP2 {
-		tlsOpts = append(tlsOpts, disableHTTP2)
-	}
-
-	printVersion()
-
-	// Create a root context that will be cancelled on termination signals
-	ctx := ctrl.SetupSignalHandler()
-
-	watchNamespace, err := getWatchNamespace()
-	if err != nil {
-		setupLog.Error(err, "unable to get WatchNamespace, "+
-			"the manager will watch and manage resources in all namespaces")
-	}
-
-	deploymentNamespace, err := utils.GetOperatorNamespace()
-	if err != nil {
-		setupLog.Error(err, "Failed to get namespace")
-		os.Exit(1)
-	}
-
-	// Create watchers for metrics and webhooks certificates
-	var metricsCertWatcher, webhookCertWatcher *certwatcher.CertWatcher
-
-	// Initial webhook TLS options
-	webhookTLSOpts := tlsOpts
-
-	if len(webhookCertPath) > 0 {
-		setupLog.Info("Initializing webhook certificate watcher using provided certificates",
-			"webhook-cert-path", webhookCertPath, "webhook-cert-name", webhookCertName, "webhook-cert-key", webhookCertKey)
-
-		var err error
-		webhookCertWatcher, err = certwatcher.New(
-			filepath.Join(webhookCertPath, webhookCertName),
-			filepath.Join(webhookCertPath, webhookCertKey),
-		)
-		if err != nil {
-			setupLog.Error(err, "Failed to initialize webhook certificate watcher")
-			os.Exit(1)
-		}
-
-		webhookTLSOpts = append(webhookTLSOpts, func(config *tls.Config) {
-			config.GetCertificate = webhookCertWatcher.GetCertificate
-		})
-	}
-
-	webhookServer := webhook.NewServer(webhook.Options{
-		TLSOpts: webhookTLSOpts,
-	})
-
-	// Metrics endpoint is enabled in 'config/default/kustomization.yaml'. The Metrics options configure the server.
-	// More info:
-	// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.21.0/pkg/metrics/server
-	// - https://book.kubebuilder.io/reference/metrics.html
-	metricsServerOptions := metricsserver.Options{
-		BindAddress:   metricsAddr,
-		SecureServing: secureMetrics,
-		// TODO(user): TLSOpts is used to allow configuring the TLS config used for the server. If certificates are
-		// not provided, self-signed certificates will be generated by default. This option is not recommended for
-		// production environments as self-signed certificates do not offer the same level of trust and security
-		// as certificates issued by a trusted Certificate Authority (CA). The primary risk is potentially allowing
-		// unauthorized access to sensitive metrics data. Consider replacing with CertDir, CertName, and KeyName
-		// to provide certificates, ensuring the server communicates using trusted and secure certificates.
-		TLSOpts: tlsOpts,
-	}
-
-	if secureMetrics {
-		// FilterProvider is used to protect the metrics endpoint with authn/authz.
-		// These configurations ensure that only authorized users and service accounts
-		// can access the metrics endpoint. The RBAC are configured in 'config/rbac/kustomization.yaml'. More info:
-		// https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.19.0/pkg/metrics/filters#WithAuthenticationAndAuthorization
-		metricsServerOptions.FilterProvider = filters.WithAuthenticationAndAuthorization
-	}
-
-	// If the certificate is not specified, controller-runtime will automatically
-	// generate self-signed certificates for the metrics server. While convenient for development and testing,
-	// this setup is not recommended for production.
-	//
-	// TODO(user): If you enable certManager, uncomment the following lines:
-	// - [METRICS-WITH-CERTS] at config/default/kustomization.yaml to generate and use certificates
-	// managed by cert-manager for the metrics server.
-	// - [PROMETHEUS-WITH-CERTS] at config/prometheus/kustomization.yaml for TLS certification.
-	if len(metricsCertPath) > 0 {
-		setupLog.Info("Initializing metrics certificate watcher using provided certificates",
-			"metrics-cert-path", metricsCertPath, "metrics-cert-name", metricsCertName, "metrics-cert-key", metricsCertKey)
-
-		var err error
-		metricsCertWatcher, err = certwatcher.New(
-			filepath.Join(metricsCertPath, metricsCertName),
-			filepath.Join(metricsCertPath, metricsCertKey),
-		)
-		if err != nil {
-			setupLog.Error(err, "Failed to initialize metrics certificate watcher")
-			os.Exit(1)
-		}
-
-		metricsServerOptions.TLSOpts = append(metricsServerOptions.TLSOpts, func(config *tls.Config) {
-			config.GetCertificate = metricsCertWatcher.GetCertificate
-		})
-	}
-
-	options := ctrl.Options{
-		Scheme:                 scheme,
-		Metrics:                metricsServerOptions,
-		WebhookServer:          webhookServer,
-		HealthProbeBindAddress: probeAddr,
-		LeaderElection:         enableLeaderElection,
-		LeaderElectionID:       "c26807fd.onepassword.com",
-		// LeaderElectionReleaseOnCancel defines if the leader should step down voluntarily
-		// when the Manager ends. This requires the binary to immediately end when the
-		// Manager is stopped, otherwise, this setting is unsafe. Setting this significantly
-		// speeds up voluntary leader transitions as the new leader don't have to wait
-		// LeaseDuration time first.
-		//
-		// In the default scaffold provided, the program ends immediately after
-		// the manager stops, so would be fine to enable this option. However,
-		// if you are doing or is intended to do any operation such as perform cleanups
-		// after the manager stops then its usage might be unsafe.
-		// LeaderElectionReleaseOnCancel: true,
-	}
-
-	// Add support for MultiNamespace set in WATCH_NAMESPACE (e.g ns1,ns2)
-	if watchNamespace != "" {
-		namespaces := strings.Split(watchNamespace, ",")
-		namespaceMap := make(map[string]cache.Config)
-		for _, namespace := range namespaces {
-			namespaceMap[namespace] = cache.Config{}
-		}
-		options.NewCache = func(config *rest.Config, opts cache.Options) (cache.Cache, error) {
-			opts.DefaultNamespaces = namespaceMap
-			return cache.New(config, opts)
-		}
-	}
-
-	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), options)
-	if err != nil {
-		setupLog.Error(err, "unable to start manager")
-		os.Exit(1)
-	}
-
-	// Setup One Password Client
-	opClient, err := opclient.NewFromEnvironment(ctx, opclient.Config{
-		Logger:  setupLog,
-		Version: version.OperatorVersion,
-	})
-	if err != nil {
-		setupLog.Error(err, "unable to create 1Password client")
-		os.Exit(1)
-	}
-
-	if err = (&controller.OnePasswordItemReconciler{
-		Client:   mgr.GetClient(),
-		Scheme:   mgr.GetScheme(),
-		OpClient: opClient,
-	}).SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "OnePasswordItem")
-		os.Exit(1)
-	}
-
-	r, _ := regexp.Compile(annotationRegExpString)
-	if err = (&controller.DeploymentReconciler{
-		Client:             mgr.GetClient(),
-		Scheme:             mgr.GetScheme(),
-		OpClient:           opClient,
-		OpAnnotationRegExp: r,
-	}).SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "Deployment")
-		os.Exit(1)
-	}
-	// +kubebuilder:scaffold:builder
-
-	// Setup 1PasswordConnect
-	if shouldManageConnect() {
-		setupLog.Info("Automated Connect Management Enabled")
-		go func(ctx context.Context) {
-			connectStarted := false
-			for !connectStarted {
-				err := op.SetupConnect(ctx, mgr.GetClient(), deploymentNamespace)
-				// Cache Not Started is an acceptable error. Retry until cache is started.
-				if err != nil && !errors.Is(err, &cache.ErrCacheNotStarted{}) {
-					setupLog.Error(err, "")
-					os.Exit(1)
-				}
-				if err == nil {
-					connectStarted = true
-				}
-			}
-		}(ctx)
-	} else {
-		setupLog.Info("Automated Connect Management Disabled")
-	}
-
-	// Setup update secrets task
-	updatedSecretsPoller := op.NewManager(mgr.GetClient(), opClient, shouldAutoRestartDeployments())
-	done := make(chan bool)
-	ticker := time.NewTicker(getPollingIntervalForUpdatingSecrets())
-	go func(ctx context.Context) {
-		for {
-			select {
-			case <-done:
-				ticker.Stop()
-				return
-			case <-ticker.C:
-				err := updatedSecretsPoller.UpdateKubernetesSecretsTask(ctx)
-				if err != nil {
-					setupLog.Error(err, "error running update kubernetes secret task")
-				}
-			}
-		}
-	}(ctx)
-
-	if metricsCertWatcher != nil {
-		setupLog.Info("Adding metrics certificate watcher to manager")
-		if err := mgr.Add(metricsCertWatcher); err != nil {
-			setupLog.Error(err, "Unable to add metrics certificate watcher to manager")
-			os.Exit(1)
-		}
-	}
-
-	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
-		setupLog.Error(err, "unable to set up health check")
-		os.Exit(1)
-	}
-	if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {
-		setupLog.Error(err, "unable to set up ready check")
-		os.Exit(1)
-	}
-
-	setupLog.Info("starting manager")
-	if err := mgr.Start(ctx); err != nil {
-		setupLog.Error(err, "problem running manager")
-		os.Exit(1)
-	}
-}
-
-// getWatchNamespace returns the Namespace the operator should be watching for changes
-func getWatchNamespace() (string, error) {
-	// WatchNamespaceEnvVar is the constant for env variable WATCH_NAMESPACE
-	// which specifies the Namespace to watch.
-	// An empty value means the operator is running with cluster scope.
-	var watchNamespaceEnvVar = "WATCH_NAMESPACE"
-
-	ns, found := os.LookupEnv(watchNamespaceEnvVar)
-	if !found {
-		return "", fmt.Errorf("%s must be set", watchNamespaceEnvVar)
-	}
-	return ns, nil
-}
-
-func shouldManageConnect() bool {
-	shouldManageConnect, found := os.LookupEnv(manageConnect)
-	if found {
-		shouldManageConnectBool, err := strconv.ParseBool(strings.ToLower(shouldManageConnect))
-		if err != nil {
-			setupLog.Error(err, "")
-			os.Exit(1)
-		}
-		return shouldManageConnectBool
-	}
-	return false
-}
-
-func shouldAutoRestartDeployments() bool {
-	shouldAutoRestartDeployments, found := os.LookupEnv(restartDeploymentsEnvVariable)
-	if found {
-		shouldAutoRestartDeploymentsBool, err := strconv.ParseBool(strings.ToLower(shouldAutoRestartDeployments))
-		if err != nil {
-			setupLog.Error(err, "")
-			os.Exit(1)
-		}
-		return shouldAutoRestartDeploymentsBool
-	}
-	return false
-}
-
-func getPollingIntervalForUpdatingSecrets() time.Duration {
-	timeInSecondsString, found := os.LookupEnv(envPollingIntervalVariable)
-	if found {
-		timeInSeconds, err := strconv.Atoi(timeInSecondsString)
-		if err == nil {
-			return time.Duration(timeInSeconds) * time.Second
-		}
-		setupLog.Info("Invalid value set for polling interval. Must be a valid integer.")
-	}
-
-	setupLog.Info(fmt.Sprintf("Using default polling interval of %v seconds", defaultPollingInterval))
-	return time.Duration(defaultPollingInterval) * time.Second
-}

config/crd/bases/onepassword.com_onepassworditems.yaml

@@ -1,81 +0,0 @@
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
-  name: onepassworditems.onepassword.com
-spec:
-  group: onepassword.com
-  names:
-    kind: OnePasswordItem
-    listKind: OnePasswordItemList
-    plural: onepassworditems
-    singular: onepassworditem
-  scope: Namespaced
-  versions:
-  - name: v1
-    schema:
-      openAPIV3Schema:
-        description: OnePasswordItem is the Schema for the onepassworditems API
-        properties:
-          apiVersion:
-            description: |-
-              APIVersion defines the versioned schema of this representation of an object.
-              Servers should convert recognized schemas to the latest internal value, and
-              may reject unrecognized values.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
-            type: string
-          kind:
-            description: |-
-              Kind is a string value representing the REST resource this object represents.
-              Servers may infer this from the endpoint the client submits requests to.
-              Cannot be updated.
-              In CamelCase.
-              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: OnePasswordItemSpec defines the desired state of OnePasswordItem
-            properties:
-              itemPath:
-                type: string
-            type: object
-          status:
-            description: OnePasswordItemStatus defines the observed state of OnePasswordItem
-            properties:
-              conditions:
-                items:
-                  properties:
-                    lastTransitionTime:
-                      description: Last time the condition transit from one status
-                        to another.
-                      format: date-time
-                      type: string
-                    message:
-                      description: Human-readable message indicating details about
-                        last transition.
-                      type: string
-                    status:
-                      description: Status of the condition, one of True, False, Unknown.
-                      type: string
-                    type:
-                      description: Type of job condition, Completed.
-                      type: string
-                  required:
-                  - status
-                  - type
-                  type: object
-                type: array
-            required:
-            - conditions
-            type: object
-          type:
-            description: 'Kubernetes secret type. More info: https://kubernetes.io/docs/concepts/configuration/secret/#secret-types'
-            type: string
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}

config/crd/bases/onepassword.com_onepassworditems_crd.yaml

@@ -0,0 +1,45 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: onepassworditems.onepassword.com
+spec:
+  group: onepassword.com
+  names:
+    kind: OnePasswordItem
+    listKind: OnePasswordItemList
+    plural: onepassworditems
+    singular: onepassworditem
+  scope: Namespaced
+  versions:
+  - name: v1
+    served: true
+    storage: true
+    schema:
+      openAPIV3Schema:
+        description: OnePasswordItem is the Schema for the onepassworditems API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            description: OnePasswordItemSpec defines the desired state of OnePasswordItem
+            properties:
+              itemPath:
+                type: string
+            type: object
+          status:
+            description: OnePasswordItemStatus defines the observed state of OnePasswordItem
+            type: object
+          type:
+            description: 'Kubernetes secret type. More info: https://kubernetes.io/docs/concepts/configuration/secret/#secret-types'
+            type: string
+        type: object

config/crd/bases/onepassword.com_v1_onepassworditem_cr.yaml

@@ -0,0 +1,6 @@
+apiVersion: onepassword.com/v1
+kind: OnePasswordItem
+metadata:
+  name: example
+spec:
+  itemPath: "vaults/<vault_id>/items/<item_id>"

config/crd/connect/deployment.yaml

@@ -12,10 +12,6 @@ spec:
         app: onepassword-connect
         version: "1.0.0"
     spec:
-      securityContext:
-        runAsNonRoot: true
-        fsGroup: 999
-        fsGroupChangePolicy: OnRootMismatch
       volumes:
         - name: shared-data
           emptyDir: {}
@@ -33,24 +29,12 @@ spec:
           volumeMounts:
             - mountPath: /home/opuser/.op/data
               name: shared-data
-          securityContext:
-            runAsUser: 0
-            runAsNonRoot: false
-            allowPrivilegeEscalation: false
-            capabilities:
-              drop: [ "ALL" ]
       containers:
         - name: connect-api
           image: 1password/connect-api:latest
-          securityContext:
-            runAsNonRoot: true
-            runAsUser: 999
-            runAsGroup: 999
-            allowPrivilegeEscalation: false
           resources:
             limits:
               memory: "128Mi"
-            requests:
               cpu: "0.2"
           ports:
             - containerPort: 8080
@@ -65,15 +49,9 @@ spec:
               name: shared-data
         - name: connect-sync
           image: 1password/connect-sync:latest
-          securityContext:
-            runAsNonRoot: true
-            runAsUser: 999
-            runAsGroup: 999
-            allowPrivilegeEscalation: false
           resources:
             limits:
               memory: "128Mi"
-            requests:
               cpu: "0.2"
           ports:
             - containerPort: 8081

config/crd/connect/service.yaml

@@ -9,7 +9,7 @@ spec:
   ports:
     - port: 8080
       name: connect-api
-      nodePort: 30080
+      nodePort: 31080
     - port: 8081
       name: connect-sync
-      nodePort: 30081
+      nodePort: 31081

config/crd/kustomization.yaml

@@ -2,16 +2,20 @@
 # since it depends on service name and namespace that are out of this kustomize package.
 # It should be run by config/default
 resources:
-- bases/onepassword.com_onepassworditems.yaml
+- bases/onepassword.onepassword.com_onepassworditems.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
-patches:
+patchesStrategicMerge:
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
 # patches here are for enabling the conversion webhook for each CRD
-#- path: patches/webhook_in_onepassworditems.yaml
+#- patches/webhook_in_onepassworditems.yaml
 #+kubebuilder:scaffold:crdkustomizewebhookpatch
 
-# [WEBHOOK] To enable webhook, uncomment the following section
+# [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix.
+# patches here are for enabling the CA injection for each CRD
+#- patches/cainjection_in_onepassworditems.yaml
+#+kubebuilder:scaffold:crdkustomizecainjectionpatch
+
 # the following config is for teaching kustomize how to do kustomization for CRDs.
-#configurations:
-#- kustomizeconfig.yaml
+configurations:
+- kustomizeconfig.yaml

config/crd/operator.yaml

@@ -0,0 +1,39 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: onepassword-connect-operator
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      name: onepassword-connect-operator
+  template:
+    metadata:
+      labels:
+        name: onepassword-connect-operator
+    spec:
+      serviceAccountName: onepassword-connect-operator
+      containers:
+        - name: onepassword-connect-operator
+          image: 1password/onepassword-operator
+          command: ["/manager"]
+          env:
+            - name: WATCH_NAMESPACE
+              value: "default"
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: OPERATOR_NAME
+              value: "onepassword-connect-operator"
+            - name: OP_CONNECT_HOST
+              value: "http://onepassword-connect:8080"
+            - name: POLLING_INTERVAL
+              value: "10"
+            - name: OP_CONNECT_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: onepassword-token
+                  key: token
+            - name: AUTO_RESTART
+              value: "false"

config/crd/operator_multi_namespace_example.yaml

@@ -0,0 +1,39 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: onepassword-connect-operator
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      name: onepassword-connect-operator
+  template:
+    metadata:
+      labels:
+        name: onepassword-connect-operator
+    spec:
+      serviceAccountName: onepassword-connect-operator
+      containers:
+        - name: onepassword-connect-operator
+          image: 1password/onepassword-operator
+          command: ["/manager"]
+          env:
+            - name: WATCH_NAMESPACE
+              value: "default,development"
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: OPERATOR_NAME
+              value: "onepassword-connect-operator"
+            - name: OP_CONNECT_HOST
+              value: "http://onepassword-connect:8080"
+            - name: POLLING_INTERVAL
+              value: "10"
+            - name: OP_CONNECT_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: onepassword-token
+                  key: token
+            - name: AUTO_RESTART
+              value: "false"

config/crd/patches/cainjection_in_onepassworditems.yaml

@@ -0,0 +1,7 @@
+# The following patch adds a directive for certmanager to inject CA into the CRD
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
+  name: onepassworditems.onepassword.onepassword.com

config/crd/patches/webhook_in_onepassworditems.yaml

@@ -0,0 +1,16 @@
+# The following patch enables a conversion webhook for the CRD
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: onepassworditems.onepassword.onepassword.com
+spec:
+  conversion:
+    strategy: Webhook
+    webhook:
+      clientConfig:
+        service:
+          namespace: system
+          name: webhook-service
+          path: /convert
+      conversionReviewVersions:
+      - v1

config/crd/permissions.yaml

@@ -1,21 +1,40 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: onepassword-connect-operator
+---
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: onepassword-connect-operator-default
+  namespace: default
+subjects:
+- kind: ServiceAccount
+  name: onepassword-connect-operator
+  namespace: default
+roleRef:
+  kind: ClusterRole
+  name: onepassword-connect-operator
+  apiGroup: rbac.authorization.k8s.io
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: manager-role
+  creationTimestamp: null
+  name: onepassword-connect-operator
 rules:
 - apiGroups:
   - ""
   resources:
-  - configmaps
-  - endpoints
-  - events
-  - namespaces
-  - persistentvolumeclaims
   - pods
-  - secrets
   - services
   - services/finalizers
+  - endpoints
+  - persistentvolumeclaims
+  - events
+  - configmaps
+  - secrets
+  - namespaces
   verbs:
   - create
   - delete
@@ -27,8 +46,8 @@ rules:
 - apiGroups:
   - apps
   resources:
-  - daemonsets
   - deployments
+  - daemonsets
   - replicasets
   - statefulsets
   verbs:
@@ -40,11 +59,12 @@ rules:
   - update
   - watch
 - apiGroups:
-  - apps
+  - monitoring.coreos.com
   resources:
-  - deployments/finalizers
+  - servicemonitors
   verbs:
-  - update
+  - get
+  - create
 - apiGroups:
   - apps
   resourceNames:
@@ -53,35 +73,23 @@ rules:
   - deployments/finalizers
   verbs:
   - update
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  verbs:
+  - get
 - apiGroups:
   - apps
   resources:
-  - deployments/status
+  - replicasets
+  - deployments
   verbs:
   - get
-  - patch
-  - update
-- apiGroups:
-  - coordination.k8s.io
-  resources:
-  - leases
-  verbs:
-  - create
-  - get
-  - list
-  - update
-- apiGroups:
-  - monitoring.coreos.com
-  resources:
-  - servicemonitors
-  verbs:
-  - create
-  - get
 - apiGroups:
   - onepassword.com
   resources:
   - '*'
-  - onepassworditems
   verbs:
   - create
   - delete
@@ -90,17 +98,3 @@ rules:
   - patch
   - update
   - watch
-- apiGroups:
-  - onepassword.com
-  resources:
-  - onepassworditems/finalizers
-  verbs:
-  - update
-- apiGroups:
-  - onepassword.com
-  resources:
-  - onepassworditems/status
-  verbs:
-  - get
-  - patch
-  - update

config/crd/permissions_multi_namespace_example.yaml

@@ -0,0 +1,114 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: onepassword-connect-operator
+---
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: onepassword-connect-operator-default
+  namespace: default
+subjects:
+- kind: ServiceAccount
+  name: onepassword-connect-operator
+  namespace: default
+roleRef:
+  kind: ClusterRole
+  name: onepassword-connect-operator
+  apiGroup: rbac.authorization.k8s.io
+---
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: onepassword-connect-operator-development
+  namespace: development
+subjects:
+- kind: ServiceAccount
+  name: onepassword-connect-operator
+  namespace: default
+roleRef:
+  kind: ClusterRole
+  name: onepassword-connect-operator
+  apiGroup: rbac.authorization.k8s.io
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  creationTimestamp: null
+  name: onepassword-connect-operator
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  - services
+  - services/finalizers
+  - endpoints
+  - persistentvolumeclaims
+  - events
+  - configmaps
+  - secrets
+  - namespaces
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - apps
+  resources:
+  - deployments
+  - daemonsets
+  - replicasets
+  - statefulsets
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - monitoring.coreos.com
+  resources:
+  - servicemonitors
+  verbs:
+  - get
+  - create
+- apiGroups:
+  - apps
+  resourceNames:
+  - onepassword-connect-operator
+  resources:
+  - deployments/finalizers
+  verbs:
+  - update
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  verbs:
+  - get
+- apiGroups:
+  - apps
+  resources:
+  - replicasets
+  - deployments
+  verbs:
+  - get
+- apiGroups:
+  - onepassword.com
+  resources:
+  - '*'
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch

config/default/kustomization.yaml

@@ -1,20 +1,18 @@
 # Adds namespace to all resources.
-# namespace: onepassword-connect-operator
+namespace: onepassword-operator-new-system
 
 # Value of this field is prepended to the
 # names of all resources, e.g. a deployment named
 # "wordpress" becomes "alices-wordpress".
 # Note that it should also match with the prefix (text before '-') of the namespace
 # field above.
-# namePrefix: onepassword-connect-
+namePrefix: onepassword-operator-new-
 
 # Labels to add to all resources and selectors.
-#labels:
-#- includeSelectors: true
-#  pairs:
-#    someName: someValue
+#commonLabels:
+#  someName: someValue
 
-resources:
+bases:
 - ../crd
 - ../rbac
 - ../manager
@@ -25,210 +23,52 @@ resources:
 #- ../certmanager
 # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
 #- ../prometheus
-# [METRICS] Expose the controller manager metrics service.
-- metrics_service.yaml
-# [NETWORK POLICY] Protect the /metrics endpoint and Webhook Server with NetworkPolicy.
-# Only Pod(s) running a namespace labeled with 'metrics: enabled' will be able to gather the metrics.
-# Only CR(s) which requires webhooks and are applied on namespaces labeled with 'webhooks: enabled' will
-# be able to communicate with the Webhook Server.
-#- ../network-policy
 
-# Uncomment the patches line if you enable Metrics
-patches:
-# [METRICS] The following patch will enable the metrics endpoint using HTTPS and the port :8443.
-# More info: https://book.kubebuilder.io/reference/metrics
-- path: manager_metrics_patch.yaml
-  target:
-    kind: Deployment
+patchesStrategicMerge:
+# Protect the /metrics endpoint by putting it behind auth.
+# If you want your controller-manager to expose the /metrics
+# endpoint w/o any authn/z, please comment the following line.
+- manager_auth_proxy_patch.yaml
 
-# Uncomment the patches line if you enable Metrics and CertManager
-# [METRICS-WITH-CERTS] To enable metrics protected with certManager, uncomment the following line.
-# This patch will protect the metrics with certManager self-signed certs.
-#- path: cert_metrics_manager_patch.yaml
-#  target:
-#    kind: Deployment
+# Mount the controller config file for loading manager configurations
+# through a ComponentConfig type
+#- manager_config_patch.yaml
 
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
 # crd/kustomization.yaml
-#- path: manager_webhook_patch.yaml
-#  target:
-#    kind: Deployment
+#- manager_webhook_patch.yaml
 
+# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'.
+# Uncomment 'CERTMANAGER' sections in crd/kustomization.yaml to enable the CA injection in the admission webhooks.
+# 'CERTMANAGER' needs to be enabled to use ca injection
+#- webhookcainjection_patch.yaml
+
+# the following config is for teaching kustomize how to do var substitution
+vars:
 # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER' prefix.
-# Uncomment the following replacements to add the cert-manager CA injection annotations
-#replacements:
-# - source: # Uncomment the following block to enable certificates for metrics
-#     kind: Service
-#     version: v1
-#     name: controller-manager-metrics-service
-#     fieldPath: metadata.name
-#   targets:
-#     - select:
-#         kind: Certificate
-#         group: cert-manager.io
-#         version: v1
-#         name: metrics-certs
-#       fieldPaths:
-#         - spec.dnsNames.0
-#         - spec.dnsNames.1
-#       options:
-#         delimiter: '.'
-#         index: 0
-#         create: true
-#     - select: # Uncomment the following to set the Service name for TLS config in Prometheus ServiceMonitor
-#         kind: ServiceMonitor
-#         group: monitoring.coreos.com
-#         version: v1
-#         name: controller-manager-metrics-monitor
-#       fieldPaths:
-#         - spec.endpoints.0.tlsConfig.serverName
-#       options:
-#         delimiter: '.'
-#         index: 0
-#         create: true
-#
-# - source:
-#     kind: Service
-#     version: v1
-#     name: controller-manager-metrics-service
-#     fieldPath: metadata.namespace
-#   targets:
-#     - select:
-#         kind: Certificate
-#         group: cert-manager.io
-#         version: v1
-#         name: metrics-certs
-#       fieldPaths:
-#         - spec.dnsNames.0
-#         - spec.dnsNames.1
-#       options:
-#         delimiter: '.'
-#         index: 1
-#         create: true
-#     - select: # Uncomment the following to set the Service namespace for TLS in Prometheus ServiceMonitor
-#         kind: ServiceMonitor
-#         group: monitoring.coreos.com
-#         version: v1
-#         name: controller-manager-metrics-monitor
-#       fieldPaths:
-#         - spec.endpoints.0.tlsConfig.serverName
-#       options:
-#         delimiter: '.'
-#         index: 1
-#         create: true
-#
-# - source: # Uncomment the following block if you have any webhook
-#     kind: Service
-#     version: v1
-#     name: webhook-service
-#     fieldPath: .metadata.name # Name of the service
-#   targets:
-#     - select:
-#         kind: Certificate
-#         group: cert-manager.io
-#         version: v1
-#         name: serving-cert
-#       fieldPaths:
-#         - .spec.dnsNames.0
-#         - .spec.dnsNames.1
-#       options:
-#         delimiter: '.'
-#         index: 0
-#         create: true
-# - source:
-#     kind: Service
-#     version: v1
-#     name: webhook-service
-#     fieldPath: .metadata.namespace # Namespace of the service
-#   targets:
-#     - select:
-#         kind: Certificate
-#         group: cert-manager.io
-#         version: v1
-#         name: serving-cert
-#       fieldPaths:
-#         - .spec.dnsNames.0
-#         - .spec.dnsNames.1
-#       options:
-#         delimiter: '.'
-#         index: 1
-#         create: true
-#
-# - source: # Uncomment the following block if you have a ValidatingWebhook (--programmatic-validation)
-#     kind: Certificate
-#     group: cert-manager.io
-#     version: v1
-#     name: serving-cert # This name should match the one in certificate.yaml
-#     fieldPath: .metadata.namespace # Namespace of the certificate CR
-#   targets:
-#     - select:
-#         kind: ValidatingWebhookConfiguration
-#       fieldPaths:
-#         - .metadata.annotations.[cert-manager.io/inject-ca-from]
-#       options:
-#         delimiter: '/'
-#         index: 0
-#         create: true
-# - source:
-#     kind: Certificate
-#     group: cert-manager.io
-#     version: v1
-#     name: serving-cert
-#     fieldPath: .metadata.name
-#   targets:
-#     - select:
-#         kind: ValidatingWebhookConfiguration
-#       fieldPaths:
-#         - .metadata.annotations.[cert-manager.io/inject-ca-from]
-#       options:
-#         delimiter: '/'
-#         index: 1
-#         create: true
-#
-# - source: # Uncomment the following block if you have a DefaultingWebhook (--defaulting )
-#     kind: Certificate
-#     group: cert-manager.io
-#     version: v1
-#     name: serving-cert
-#     fieldPath: .metadata.namespace # Namespace of the certificate CR
-#   targets:
-#     - select:
-#         kind: MutatingWebhookConfiguration
-#       fieldPaths:
-#         - .metadata.annotations.[cert-manager.io/inject-ca-from]
-#       options:
-#         delimiter: '/'
-#         index: 0
-#         create: true
-# - source:
-#     kind: Certificate
-#     group: cert-manager.io
-#     version: v1
-#     name: serving-cert
-#     fieldPath: .metadata.name
-#   targets:
-#     - select:
-#         kind: MutatingWebhookConfiguration
-#       fieldPaths:
-#         - .metadata.annotations.[cert-manager.io/inject-ca-from]
-#       options:
-#         delimiter: '/'
-#         index: 1
-#         create: true
-#
-# - source: # Uncomment the following block if you have a ConversionWebhook (--conversion)
-#     kind: Certificate
-#     group: cert-manager.io
-#     version: v1
-#     name: serving-cert
-#     fieldPath: .metadata.namespace # Namespace of the certificate CR
-#   targets: # Do not remove or uncomment the following scaffold marker; required to generate code for target CRD.
-# +kubebuilder:scaffold:crdkustomizecainjectionns
-# - source:
-#     kind: Certificate
-#     group: cert-manager.io
-#     version: v1
-#     name: serving-cert
-#     fieldPath: .metadata.name
-#   targets: # Do not remove or uncomment the following scaffold marker; required to generate code for target CRD.
-# +kubebuilder:scaffold:crdkustomizecainjectionname
+#- name: CERTIFICATE_NAMESPACE # namespace of the certificate CR
+#  objref:
+#    kind: Certificate
+#    group: cert-manager.io
+#    version: v1
+#    name: serving-cert # this name should match the one in certificate.yaml
+#  fieldref:
+#    fieldpath: metadata.namespace
+#- name: CERTIFICATE_NAME
+#  objref:
+#    kind: Certificate
+#    group: cert-manager.io
+#    version: v1
+#    name: serving-cert # this name should match the one in certificate.yaml
+#- name: SERVICE_NAMESPACE # namespace of the service
+#  objref:
+#    kind: Service
+#    version: v1
+#    name: webhook-service
+#  fieldref:
+#    fieldpath: metadata.namespace
+#- name: SERVICE_NAME
+#  objref:
+#    kind: Service
+#    version: v1
+#    name: webhook-service

config/default/manager_auth_proxy_patch.yaml

@@ -0,0 +1,34 @@
+# This patch inject a sidecar container which is a HTTP proxy for the
+# controller manager, it performs RBAC authorization against the Kubernetes API using SubjectAccessReviews.
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: controller-manager
+  namespace: system
+spec:
+  template:
+    spec:
+      containers:
+      - name: kube-rbac-proxy
+        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
+        args:
+        - "--secure-listen-address=0.0.0.0:8443"
+        - "--upstream=http://127.0.0.1:8080/"
+        - "--logtostderr=true"
+        - "--v=0"
+        ports:
+        - containerPort: 8443
+          protocol: TCP
+          name: https
+        resources:
+          limits:
+            cpu: 500m
+            memory: 128Mi
+          requests:
+            cpu: 5m
+            memory: 64Mi
+      - name: manager
+        args:
+        - "--health-probe-bind-address=:8081"
+        - "--metrics-bind-address=127.0.0.1:8080"
+        - "--leader-elect"

config/default/manager_config_patch.yaml

@@ -0,0 +1,20 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: controller-manager
+  namespace: system
+spec:
+  template:
+    spec:
+      containers:
+      - name: manager
+        args:
+        - "--config=controller_manager_config.yaml"
+        volumeMounts:
+        - name: manager-config
+          mountPath: /controller_manager_config.yaml
+          subPath: controller_manager_config.yaml
+      volumes:
+      - name: manager-config
+        configMap:
+          name: manager-config

config/default/manager_metrics_patch.yaml

@@ -1,4 +0,0 @@
-# This patch adds the args to allow exposing the metrics endpoint using HTTPS
-- op: add
-  path: /spec/template/spec/containers/0/args/0
-  value: --metrics-bind-address=:8443

config/manager/controller_manager_config.yaml

@@ -0,0 +1,11 @@
+apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
+kind: ControllerManagerConfig
+health:
+  healthProbeBindAddress: :8081
+metrics:
+  bindAddress: 127.0.0.1:8080
+webhook:
+  port: 9443
+leaderElection:
+  leaderElect: true
+  resourceName: c26807fd.onepassword.com

config/manager/kustomization.yaml

@@ -1,8 +1,10 @@
 resources:
 - manager.yaml
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-images:
-- name: controller
-  newName: 1password/onepassword-operator
-  newTag: latest
+
+generatorOptions:
+  disableNameSuffixHash: true
+
+configMapGenerator:
+- name: manager-config
+  files:
+  - controller_manager_config.yaml

config/manager/manager.yaml

@@ -2,113 +2,39 @@ apiVersion: v1
 kind: Namespace
 metadata:
   labels:
-    control-plane: onepassword-connect-operator
-    app.kubernetes.io/name: namespace
-    app.kubernetes.io/instance: system
-    app.kubernetes.io/component: manager
-    app.kubernetes.io/created-by: onepassword-connect-operator
-    app.kubernetes.io/part-of: onepassword-connect-operator
-    app.kubernetes.io/managed-by: kustomize
+    control-plane: controller-manager
   name: system
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: onepassword-connect-operator
+  name: controller-manager
   namespace: system
   labels:
     control-plane: controller-manager
-    app.kubernetes.io/name: deployment
-    app.kubernetes.io/instance: controller-manager
-    app.kubernetes.io/component: manager
-    app.kubernetes.io/created-by: onepassword-connect-operator
-    app.kubernetes.io/part-of: onepassword-connect-operator
-    app.kubernetes.io/managed-by: kustomize
 spec:
   selector:
     matchLabels:
-      name: onepassword-connect-operator
-      control-plane: onepassword-connect-operator
+      control-plane: controller-manager
   replicas: 1
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
       labels:
-        name: onepassword-connect-operator
-        control-plane: onepassword-connect-operator
+        control-plane: controller-manager
     spec:
-      # TODO(user): Uncomment the following code to configure the nodeAffinity expression
-      # according to the platforms which are supported by your solution.
-      # It is considered best practice to support multiple architectures. You can
-      # build your manager image using the makefile target docker-buildx.
-      # affinity:
-      #   nodeAffinity:
-      #     requiredDuringSchedulingIgnoredDuringExecution:
-      #       nodeSelectorTerms:
-      #         - matchExpressions:
-      #           - key: kubernetes.io/arch
-      #             operator: In
-      #             values:
-      #               - amd64
-      #               - arm64
-      #               - ppc64le
-      #               - s390x
-      #           - key: kubernetes.io/os
-      #             operator: In
-      #             values:
-      #               - linux
       securityContext:
         runAsNonRoot: true
-        # TODO(user): For common cases that do not require escalating privileges
-        # it is recommended to ensure that all your Pods/Containers are restrictive.
-        # More info: https://kubernetes.io/docs/concepts/security/pod-security-standards/#restricted
-        # Please uncomment the following code if your project does NOT have to work on old Kubernetes
-        # versions < 1.19 or on vendors versions which do NOT support this field by default (i.e. Openshift < 4.11 ).
-        # seccompProfile:
-        #   type: RuntimeDefault
       containers:
       - command:
         - /manager
         args:
         - --leader-elect
-        - --health-probe-bind-address=:8081
-        image: 1password/onepassword-operator:latest
-        imagePullPolicy: Never
+        image: controller:latest
         name: manager
-        env:
-          - name: OPERATOR_NAME
-            value: "onepassword-connect-operator"
-          - name: POD_NAME
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.name
-          - name: WATCH_NAMESPACE
-            value: "default"
-          - name: POLLING_INTERVAL
-            value: "10"
-          - name: AUTO_RESTART
-            value: "false"
-          - name: OP_CONNECT_HOST
-            value: "http://onepassword-connect:8080"
-          - name: OP_CONNECT_TOKEN
-            valueFrom:
-              secretKeyRef:
-                name: onepassword-token
-                key: token
-          - name: MANAGE_CONNECT
-            value: "true"
-#            Uncomment the following lines to enable service account token and comment out the OP_CONNECT_TOKEN, OP_CONNECT_HOST and MANAGE_CONNECT env vars.
-#          - name: OP_SERVICE_ACCOUNT_TOKEN
-#            valueFrom:
-#              secretKeyRef:
-#                name: onepassword-service-account-token
-#                key: token
         securityContext:
           allowPrivilegeEscalation: false
-          capabilities:
-            drop:
-            - "ALL"
         livenessProbe:
           httpGet:
             path: /healthz
@@ -126,9 +52,9 @@ spec:
         resources:
           limits:
             cpu: 500m
-            memory: 512Mi
-          requests:
-            cpu: 100m
             memory: 128Mi
-      serviceAccountName: onepassword-connect-operator
+          requests:
+            cpu: 10m
+            memory: 64Mi
+      serviceAccountName: controller-manager
       terminationGracePeriodSeconds: 10

config/manifests/kustomization.yaml

@@ -1,7 +1,7 @@
 # These resources constitute the fully configured set of manifests
 # used to generate the 'manifests/' directory in a bundle.
 resources:
-- bases/onepassword-operator.clusterserviceversion.yaml
+- bases/onepassword-operator-new.clusterserviceversion.yaml
 - ../default
 - ../samples
 - ../scorecard
@@ -20,8 +20,7 @@ resources:
 #    # Remove the manager container's "cert" volumeMount, since OLM will create and mount a set of certs.
 #    # Update the indices in this path if adding or removing containers/volumeMounts in the manager's Deployment.
 #    - op: remove
-
-#      path: /spec/template/spec/containers/0/volumeMounts/0
+#      path: /spec/template/spec/containers/1/volumeMounts/0
 #    # Remove the "cert" volume, since OLM will create and mount a set of certs.
 #    # Update the indices in this path if adding or removing volumes in the manager's Deployment.
 #    - op: remove

config/network-policy/allow-metrics-traffic.yaml

@@ -1,26 +0,0 @@
-# This NetworkPolicy allows ingress traffic
-# with Pods running on namespaces labeled with 'metrics: enabled'. Only Pods on those
-# namespaces are able to gathering data from the metrics endpoint.
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  labels:
-    app.kubernetes.io/name: onepassword-operator
-    app.kubernetes.io/managed-by: kustomize
-  name: allow-metrics-traffic
-  namespace: system
-spec:
-  podSelector:
-    matchLabels:
-      control-plane: controller-manager
-  policyTypes:
-      - Ingress
-  ingress:
-      # This allows ingress traffic from any namespace with the label metrics: enabled
-    - from:
-      - namespaceSelector:
-          matchLabels:
-            metrics: enabled  # Only from namespaces with this label
-      ports:
-        - port: 8443
-          protocol: TCP

config/network-policy/kustomization.yaml

@@ -1,2 +0,0 @@
-resources:
-- allow-metrics-traffic.yaml

config/prometheus/kustomization.yaml

@@ -1,11 +1,2 @@
 resources:
 - monitor.yaml
-
-# [PROMETHEUS-WITH-CERTS] The following patch configures the ServiceMonitor in ../prometheus
-# to securely reference certificates created and managed by cert-manager.
-# Additionally, ensure that you uncomment the [METRICS WITH CERTMANAGER] patch under config/default/kustomization.yaml
-# to mount the "metrics-server-cert" secret in the Manager Deployment.
-#patches:
-#  - path: monitor_tls_patch.yaml
-#    target:
-#      kind: ServiceMonitor

config/prometheus/monitor.yaml

@@ -1,37 +1,20 @@
+
 # Prometheus Monitor Service (Metrics)
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    name: onepassword-connect-operator
-    control-plane: onepassword-connect-operator
-    app.kubernetes.io/name: onepassword-operator
-    app.kubernetes.io/instance: controller-manager-metrics-monitor
-    app.kubernetes.io/component: metrics
-    app.kubernetes.io/created-by: onepassword-connect-operator
-    app.kubernetes.io/part-of: onepassword-connect-operator
-    app.kubernetes.io/managed-by: kustomize
-  name: onepassword-connect-operator-metrics-monitor
+    control-plane: controller-manager
+  name: controller-manager-metrics-monitor
   namespace: system
 spec:
   endpoints:
     - path: /metrics
-      port: https # Ensure this is the name of the port that exposes HTTPS metrics
+      port: https
       scheme: https
       bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
       tlsConfig:
-        # TODO(user): The option insecureSkipVerify: true is not recommended for production since it disables
-        # certificate verification. This poses a significant security risk by making the system vulnerable to
-        # man-in-the-middle attacks, where an attacker could intercept and manipulate the communication between
-        # Prometheus and the monitored services. This could lead to unauthorized access to sensitive metrics data,
-        # compromising the integrity and confidentiality of the information.
-        # Please use the following options for secure configurations:
-        # caFile: /etc/metrics-certs/ca.crt
-        # certFile: /etc/metrics-certs/tls.crt
-        # keyFile: /etc/metrics-certs/tls.key
         insecureSkipVerify: true
   selector:
     matchLabels:
-      name: onepassword-connect-operator
-      control-plane: onepassword-connect-operator
-      app.kubernetes.io/name: onepassword-operator
+      control-plane: controller-manager

config/prometheus/monitor_tls_patch.yaml

@@ -1,19 +0,0 @@
-# Patch for Prometheus ServiceMonitor to enable secure TLS configuration
-# using certificates managed by cert-manager
-- op: replace
-  path: /spec/endpoints/0/tlsConfig
-  value:
-    # SERVICE_NAME and SERVICE_NAMESPACE will be substituted by kustomize
-    serverName: SERVICE_NAME.SERVICE_NAMESPACE.svc
-    insecureSkipVerify: false
-    ca:
-      secret:
-        name: metrics-server-cert
-        key: ca.crt
-    cert:
-      secret:
-        name: metrics-server-cert
-        key: tls.crt
-    keySecret:
-      name: metrics-server-cert
-      key: tls.key

config/rbac/auth_proxy_client_clusterrole.yaml

@@ -3,7 +3,7 @@ kind: ClusterRole
 metadata:
   name: metrics-reader
 rules:
-  - nonResourceURLs:
-      - "/metrics"
-    verbs:
-      - get
+- nonResourceURLs:
+  - "/metrics"
+  verbs:
+  - get

config/rbac/auth_proxy_role.yaml

@@ -0,0 +1,17 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: proxy-role
+rules:
+- apiGroups:
+  - authentication.k8s.io
+  resources:
+  - tokenreviews
+  verbs:
+  - create
+- apiGroups:
+  - authorization.k8s.io
+  resources:
+  - subjectaccessreviews
+  verbs:
+  - create

config/rbac/auth_proxy_role_binding.yaml

@@ -1,12 +1,12 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: metrics-auth-rolebinding
+  name: proxy-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: metrics-auth-role
+  name: proxy-role
 subjects:
-  - kind: ServiceAccount
-    name: controller-manager
-    namespace: system
+- kind: ServiceAccount
+  name: controller-manager
+  namespace: system

config/rbac/auth_proxy_service.yaml

@@ -3,15 +3,13 @@ kind: Service
 metadata:
   labels:
     control-plane: controller-manager
-    app.kubernetes.io/name: onepassword-operator
-    app.kubernetes.io/managed-by: kustomize
   name: controller-manager-metrics-service
   namespace: system
 spec:
   ports:
-    - name: https
-      port: 8443
-      protocol: TCP
-      targetPort: 8443
+  - name: https
+    port: 8443
+    protocol: TCP
+    targetPort: https
   selector:
     control-plane: controller-manager

config/rbac/kustomization.yaml

@@ -9,19 +9,10 @@ resources:
 - role_binding.yaml
 - leader_election_role.yaml
 - leader_election_role_binding.yaml
-# The following RBAC configurations are used to protect
-# the metrics endpoint with authn/authz. These configurations
-# ensure that only authorized users and service accounts
-# can access the metrics endpoint. Comment the following
-# permissions if you want to disable this protection.
-# More info: https://book.kubebuilder.io/reference/metrics.html
-- metrics_auth_role.yaml
-- metrics_auth_role_binding.yaml
-- metrics_reader_role.yaml
-# For each CRD, "Admin", "Editor" and "Viewer" roles are scaffolded by
-# default, aiding admins in cluster management. Those roles are
-# not used by the {{ .ProjectName }} itself. You can comment the following lines
-# if you do not want those helpers be installed with your Project.
-- onepassworditem_admin_role.yaml
-- onepassworditem_editor_role.yaml
-- onepassworditem_viewer_role.yaml
+# Comment the following 4 lines if you want to disable
+# the auth proxy (https://github.com/brancz/kube-rbac-proxy)
+# which protects your /metrics endpoint.
+- auth_proxy_service.yaml
+- auth_proxy_role.yaml
+- auth_proxy_role_binding.yaml
+- auth_proxy_client_clusterrole.yaml

config/rbac/leader_election_role.yaml

@@ -2,13 +2,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  labels:
-    app.kubernetes.io/name: role
-    app.kubernetes.io/instance: leader-election-role
-    app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: onepassword-connect-operator
-    app.kubernetes.io/part-of: onepassword-connect-operator
-    app.kubernetes.io/managed-by: kustomize
   name: leader-election-role
 rules:
 - apiGroups:

config/rbac/leader_election_role_binding.yaml

@@ -1,13 +1,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  labels:
-    app.kubernetes.io/name: rolebinding
-    app.kubernetes.io/instance: leader-election-rolebinding
-    app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: onepassword-connect-operator
-    app.kubernetes.io/part-of: onepassword-connect-operator
-    app.kubernetes.io/managed-by: kustomize
   name: leader-election-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -15,5 +8,5 @@ roleRef:
   name: leader-election-role
 subjects:
 - kind: ServiceAccount
-  name: onepassword-connect-operator
+  name: controller-manager
   namespace: system

config/rbac/metrics_auth_role.yaml

@@ -1,17 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: metrics-auth-role
-rules:
-  - apiGroups:
-      - authentication.k8s.io
-    resources:
-      - tokenreviews
-    verbs:
-      - create
-  - apiGroups:
-      - authorization.k8s.io
-    resources:
-      - subjectaccessreviews
-    verbs:
-      - create

config/rbac/onepassworditem_admin_role.yaml

@@ -1,31 +0,0 @@
-# This rule is not used by the project onepassword-operator itself.
-# It is provided to allow the cluster admin to help manage permissions for users.
-#
-# Grants full permissions ('*') over onepassword.com.
-# This role is intended for users authorized to modify roles and bindings within the cluster,
-# enabling them to delegate specific permissions to other users or groups as needed.
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    app.kubernetes.io/name: clusterrole
-    app.kubernetes.io/instance: onepassworditem-admin-role
-    app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: onepassword-connect-operator
-    app.kubernetes.io/part-of: onepassword-connect-operator
-    app.kubernetes.io/managed-by: kustomize
-  name: onepassworditem-admin-role
-rules:
-  - apiGroups:
-      - onepassword.com
-    resources:
-      - onepassworditems
-    verbs:
-      - '*'
-  - apiGroups:
-      - onepassword.com
-    resources:
-      - onepassworditems/status
-    verbs:
-      - get

config/rbac/onepassworditem_editor_role.yaml

@@ -1,24 +1,11 @@
-# This rule is not used by the project onepassword-operator itself.
-# It is provided to allow the cluster admin to help manage permissions for users.
-#
-# Grants permissions to create, update, and delete resources within the onepassword.com.
-# This role is intended for users who need to manage these resources
-# but should not control RBAC or manage permissions for others.
-
+# permissions for end users to edit onepassworditems.
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  labels:
-    app.kubernetes.io/name: clusterrole
-    app.kubernetes.io/instance: onepassworditem-editor-role
-    app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: onepassword-connect-operator
-    app.kubernetes.io/part-of: onepassword-connect-operator
-    app.kubernetes.io/managed-by: kustomize
   name: onepassworditem-editor-role
 rules:
 - apiGroups:
-  - onepassword.com
+  - onepassword.onepassword.com
   resources:
   - onepassworditems
   verbs:
@@ -30,7 +17,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - onepassword.com
+  - onepassword.onepassword.com
   resources:
   - onepassworditems/status
   verbs:

config/rbac/onepassworditem_viewer_role.yaml

@@ -1,24 +1,11 @@
-# This rule is not used by the project onepassword-operator itself.
-# It is provided to allow the cluster admin to help manage permissions for users.
-#
-# Grants read-only access to onepassword.com resources.
-# This role is intended for users who need visibility into these resources
-# without permissions to modify them. It is ideal for monitoring purposes and limited-access viewing.
-
+# permissions for end users to view onepassworditems.
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  labels:
-    app.kubernetes.io/name: clusterrole
-    app.kubernetes.io/instance: onepassworditem-viewer-role
-    app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: onepassword-connect-operator
-    app.kubernetes.io/part-of: onepassword-connect-operator
-    app.kubernetes.io/managed-by: kustomize
   name: onepassworditem-viewer-role
 rules:
 - apiGroups:
-  - onepassword.com
+  - onepassword.onepassword.com
   resources:
   - onepassworditems
   verbs:
@@ -26,7 +13,7 @@ rules:
   - list
   - watch
 - apiGroups:
-  - onepassword.com
+  - onepassword.onepassword.com
   resources:
   - onepassworditems/status
   verbs:

config/rbac/role_binding.yaml

@@ -1,13 +1,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  labels:
-    app.kubernetes.io/name: clusterrolebinding
-    app.kubernetes.io/instance: manager-rolebinding
-    app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: onepassword-connect-operator
-    app.kubernetes.io/part-of: onepassword-connect-operator
-    app.kubernetes.io/managed-by: kustomize
   name: manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -15,5 +8,5 @@ roleRef:
   name: manager-role
 subjects:
 - kind: ServiceAccount
-  name: onepassword-connect-operator
+  name: controller-manager
   namespace: system

config/rbac/service_account.yaml

@@ -1,12 +1,5 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  labels:
-    app.kubernetes.io/name: serviceaccount
-    app.kubernetes.io/instance: controller-manager-sa
-    app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: onepassword-connect-operator
-    app.kubernetes.io/part-of: onepassword-connect-operator
-    app.kubernetes.io/managed-by: kustomize
-  name: onepassword-connect-operator
+  name: controller-manager
   namespace: system

config/samples/onepassword_v1_onepassworditem.yaml

@@ -1,12 +1,6 @@
-apiVersion: onepassword.com/v1
+apiVersion: onepassword.onepassword.com/v1
 kind: OnePasswordItem
 metadata:
-  labels:
-    app.kubernetes.io/name: onepassworditem
-    app.kubernetes.io/instance: onepassworditem-sample
-    app.kubernetes.io/part-of: onepassword-connect-operator
-    app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: onepassword-connect-operator
   name: onepassworditem-sample
 spec:
-  itemPath: "vaults/<vault_id>/items/<item_id>"
+  # TODO(user): Add fields here

config/scorecard/patches/basic.config.yaml

@@ -4,7 +4,7 @@
     entrypoint:
     - scorecard-test
     - basic-check-spec
-    image: quay.io/operator-framework/scorecard-test:v1.33.0
+    image: quay.io/operator-framework/scorecard-test:v1.19.0
     labels:
       suite: basic
       test: basic-check-spec-test

config/scorecard/patches/olm.config.yaml

@@ -4,7 +4,7 @@
     entrypoint:
     - scorecard-test
     - olm-bundle-validation
-    image: quay.io/operator-framework/scorecard-test:v1.33.0
+    image: quay.io/operator-framework/scorecard-test:v1.19.0
     labels:
       suite: olm
       test: olm-bundle-validation-test
@@ -14,7 +14,7 @@
     entrypoint:
     - scorecard-test
     - olm-crds-have-validation
-    image: quay.io/operator-framework/scorecard-test:v1.33.0
+    image: quay.io/operator-framework/scorecard-test:v1.19.0
     labels:
       suite: olm
       test: olm-crds-have-validation-test
@@ -24,7 +24,7 @@
     entrypoint:
     - scorecard-test
     - olm-crds-have-resources
-    image: quay.io/operator-framework/scorecard-test:v1.33.0
+    image: quay.io/operator-framework/scorecard-test:v1.19.0
     labels:
       suite: olm
       test: olm-crds-have-resources-test
@@ -34,7 +34,7 @@
     entrypoint:
     - scorecard-test
     - olm-spec-descriptors
-    image: quay.io/operator-framework/scorecard-test:v1.33.0
+    image: quay.io/operator-framework/scorecard-test:v1.19.0
     labels:
       suite: olm
       test: olm-spec-descriptors-test
@@ -44,7 +44,7 @@
     entrypoint:
     - scorecard-test
     - olm-status-descriptors
-    image: quay.io/operator-framework/scorecard-test:v1.33.0
+    image: quay.io/operator-framework/scorecard-test:v1.19.0
     labels:
       suite: olm
       test: olm-status-descriptors-test

controllers/deployment_controller.go

@@ -0,0 +1,235 @@
+package controllers
+
+import (
+	"context"
+	"fmt"
+
+	kubeSecrets "github.com/1Password/onepassword-operator/pkg/kubernetessecrets"
+	op "github.com/1Password/onepassword-operator/pkg/onepassword"
+	"github.com/1Password/onepassword-operator/pkg/utils"
+
+	"regexp"
+
+	"github.com/1Password/connect-sdk-go/connect"
+	appsv1 "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
+	"sigs.k8s.io/controller-runtime/pkg/controller"
+	"sigs.k8s.io/controller-runtime/pkg/handler"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/manager"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+	"sigs.k8s.io/controller-runtime/pkg/source"
+)
+
+var deploymentLog = logf.Log.WithName("controller_deployment")
+var finalizer = "onepassword.com/finalizer.secret"
+
+const annotationRegExpString = "^operator.1password.io\\/[a-zA-Z\\.]+"
+
+func Add(mgr manager.Manager, opConnectClient connect.Client) error {
+	return add(mgr, newReconciler(mgr, opConnectClient))
+}
+
+func newReconciler(mgr manager.Manager, opConnectClient connect.Client) *ReconcileDeployment {
+	r, _ := regexp.Compile(annotationRegExpString)
+	return &ReconcileDeployment{
+		opAnnotationRegExp: r,
+		kubeClient:         mgr.GetClient(),
+		scheme:             mgr.GetScheme(),
+		opConnectClient:    opConnectClient,
+	}
+}
+
+func add(mgr manager.Manager, r reconcile.Reconciler) error {
+	c, err := controller.New("deployment-controller", mgr, controller.Options{Reconciler: r})
+	if err != nil {
+		return err
+	}
+
+	// Watch for changes to primary resource Deployment
+	err = c.Watch(&source.Kind{Type: &appsv1.Deployment{}}, &handler.EnqueueRequestForObject{})
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+var _ reconcile.Reconciler = &ReconcileDeployment{}
+
+type ReconcileDeployment struct {
+	opAnnotationRegExp *regexp.Regexp
+	kubeClient         client.Client
+	scheme             *runtime.Scheme
+	opConnectClient    connect.Client
+}
+
+func (r *ReconcileDeployment) SetupWithManager(mgr ctrl.Manager) error {
+
+	c, err := controller.New("deployment-controller", mgr, controller.Options{Reconciler: r})
+	if err != nil {
+		return err
+	}
+
+	// Watch for changes to primary resource Deployment
+	err = c.Watch(&source.Kind{Type: &appsv1.Deployment{}}, &handler.EnqueueRequestForObject{})
+	if err != nil {
+		return err
+	}
+
+	return nil
+	// TODO figure out what to do with this code.
+	// return ctrl.NewControllerManagedBy(mgr).
+	// 	For(&appsv1.Deployment{}).
+	// 	Complete(r)
+}
+
+func (r *ReconcileDeployment) test() {
+	return
+}
+
+// Reconcile reads that state of the cluster for a Deployment object and makes changes based on the state read
+// and what is in the Deployment.Spec
+// Note:
+// The Controller will requeue the Request to be processed again if the returned error is non-nil or
+// Result.Requeue is true, otherwise upon completion it will remove the work from the queue.
+func (r *ReconcileDeployment) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) {
+	reqLogger := deploymentLog.WithValues("Request.Namespace", request.Namespace, "Request.Name", request.Name)
+	reqLogger.Info("Reconciling Deployment")
+
+	deployment := &appsv1.Deployment{}
+	err := r.kubeClient.Get(ctx, request.NamespacedName, deployment)
+	if err != nil {
+		if errors.IsNotFound(err) {
+			return reconcile.Result{}, nil
+		}
+		return reconcile.Result{}, err
+	}
+
+	annotations, annotationsFound := op.GetAnnotationsForDeployment(deployment, r.opAnnotationRegExp)
+	if !annotationsFound {
+		reqLogger.Info("No 1Password Annotations found")
+		return reconcile.Result{}, nil
+	}
+
+	//If the deployment is not being deleted
+	if deployment.ObjectMeta.DeletionTimestamp.IsZero() {
+		// Adds a finalizer to the deployment if one does not exist.
+		// This is so we can handle cleanup of associated secrets properly
+		if !utils.ContainsString(deployment.ObjectMeta.Finalizers, finalizer) {
+			deployment.ObjectMeta.Finalizers = append(deployment.ObjectMeta.Finalizers, finalizer)
+			if err := r.kubeClient.Update(context.Background(), deployment); err != nil {
+				return reconcile.Result{}, err
+			}
+		}
+		// Handles creation or updating secrets for deployment if needed
+		if err := r.HandleApplyingDeployment(deployment, deployment.Namespace, annotations, request); err != nil {
+			return reconcile.Result{}, err
+		}
+		return reconcile.Result{}, nil
+	}
+	// The deployment has been marked for deletion. If the one password
+	// finalizer is found there are cleanup tasks to perform
+	if utils.ContainsString(deployment.ObjectMeta.Finalizers, finalizer) {
+
+		secretName := annotations[op.NameAnnotation]
+		r.cleanupKubernetesSecretForDeployment(secretName, deployment)
+
+		// Remove the finalizer from the deployment so deletion of deployment can be completed
+		if err := r.removeOnePasswordFinalizerFromDeployment(deployment); err != nil {
+			return reconcile.Result{}, err
+		}
+	}
+	return reconcile.Result{}, nil
+}
+
+func (r *ReconcileDeployment) cleanupKubernetesSecretForDeployment(secretName string, deletedDeployment *appsv1.Deployment) error {
+	kubernetesSecret := &corev1.Secret{}
+	kubernetesSecret.ObjectMeta.Name = secretName
+	kubernetesSecret.ObjectMeta.Namespace = deletedDeployment.Namespace
+
+	if len(secretName) == 0 {
+		return nil
+	}
+	updatedSecrets := map[string]*corev1.Secret{secretName: kubernetesSecret}
+
+	multipleDeploymentsUsingSecret, err := r.areMultipleDeploymentsUsingSecret(updatedSecrets, *deletedDeployment)
+	if err != nil {
+		return err
+	}
+
+	// Only delete the associated kubernetes secret if it is not being used by other deployments
+	if !multipleDeploymentsUsingSecret {
+		if err := r.kubeClient.Delete(context.Background(), kubernetesSecret); err != nil {
+			if !errors.IsNotFound(err) {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+func (r *ReconcileDeployment) areMultipleDeploymentsUsingSecret(updatedSecrets map[string]*corev1.Secret, deletedDeployment appsv1.Deployment) (bool, error) {
+	deployments := &appsv1.DeploymentList{}
+	opts := []client.ListOption{
+		client.InNamespace(deletedDeployment.Namespace),
+	}
+
+	err := r.kubeClient.List(context.Background(), deployments, opts...)
+	if err != nil {
+		deploymentLog.Error(err, "Failed to list kubernetes deployments")
+		return false, err
+	}
+
+	for i := 0; i < len(deployments.Items); i++ {
+		if deployments.Items[i].Name != deletedDeployment.Name {
+			if op.IsDeploymentUsingSecrets(&deployments.Items[i], updatedSecrets) {
+				return true, nil
+			}
+		}
+	}
+	return false, nil
+}
+
+func (r *ReconcileDeployment) removeOnePasswordFinalizerFromDeployment(deployment *appsv1.Deployment) error {
+	deployment.ObjectMeta.Finalizers = utils.RemoveString(deployment.ObjectMeta.Finalizers, finalizer)
+	return r.kubeClient.Update(context.Background(), deployment)
+}
+
+func (r *ReconcileDeployment) HandleApplyingDeployment(deployment *appsv1.Deployment, namespace string, annotations map[string]string, request reconcile.Request) error {
+	reqLog := deploymentLog.WithValues("Request.Namespace", request.Namespace, "Request.Name", request.Name)
+
+	secretName := annotations[op.NameAnnotation]
+	secretLabels := map[string]string(nil)
+	secretType := ""
+
+	if len(secretName) == 0 {
+		reqLog.Info("No 'item-name' annotation set. 'item-path' and 'item-name' must be set as annotations to add new secret.")
+		return nil
+	}
+
+	item, err := op.GetOnePasswordItemByPath(r.opConnectClient, annotations[op.ItemPathAnnotation])
+	if err != nil {
+		return fmt.Errorf("Failed to retrieve item: %v", err)
+	}
+
+	// Create owner reference.
+	gvk, err := apiutil.GVKForObject(deployment, r.scheme)
+	if err != nil {
+		return fmt.Errorf("could not to retrieve group version kind: %v", err)
+	}
+	ownerRef := &metav1.OwnerReference{
+		APIVersion: gvk.GroupVersion().String(),
+		Kind:       gvk.Kind,
+		Name:       deployment.GetName(),
+		UID:        deployment.GetUID(),
+	}
+
+	return kubeSecrets.CreateKubernetesSecretFromItem(r.kubeClient, secretName, namespace, item, annotations[op.RestartDeploymentsAnnotation], secretLabels, secretType, annotations, ownerRef)
+}

controllers/onepassworditem_controller.go

@@ -0,0 +1,183 @@
+/*
+Copyright 2022.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package controllers
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/1Password/onepassword-operator/pkg/onepassword"
+	op "github.com/1Password/onepassword-operator/pkg/onepassword"
+
+	kubeSecrets "github.com/1Password/onepassword-operator/pkg/kubernetessecrets"
+	"k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/runtime"
+	ctrl "sigs.k8s.io/controller-runtime"
+	kubeClient "sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller"
+	"sigs.k8s.io/controller-runtime/pkg/handler"
+	"sigs.k8s.io/controller-runtime/pkg/source"
+
+	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
+	"github.com/1Password/onepassword-operator/pkg/utils"
+
+	"github.com/1Password/connect-sdk-go/connect"
+	corev1 "k8s.io/api/core/v1"
+
+	onepasswordv1 "github.com/1Password/onepassword-operator/api/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+var log = logf.Log.WithName("controller_onepassworditem")
+
+// OnePasswordItemReconciler reconciles a OnePasswordItem object
+type OnePasswordItemReconciler struct {
+	Client          kubeClient.Client
+	Scheme          *runtime.Scheme
+	OpConnectClient connect.Client
+}
+
+//+kubebuilder:rbac:groups=onepassword.onepassword.com,resources=onepassworditems,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=onepassword.onepassword.com,resources=onepassworditems/status,verbs=get;update;patch
+//+kubebuilder:rbac:groups=onepassword.onepassword.com,resources=onepassworditems/finalizers,verbs=update
+
+// Reconcile is part of the main kubernetes reconciliation loop which aims to
+// move the current state of the cluster closer to the desired state.
+// TODO(user): Modify the Reconcile function to compare the state specified by
+// the OnePasswordItem object against the actual cluster state, and then
+// perform operations to make the cluster state reflect the state specified by
+// the user.
+//
+// For more details, check Reconcile and its Result here:
+// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.11.0/pkg/reconcile
+func (r *OnePasswordItemReconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.Result, error) {
+	reqLogger := log.WithValues("Request.Namespace", request.Namespace, "Request.Name", request.Name)
+	reqLogger.Info("Reconciling OnePasswordItem")
+
+	onepassworditem := &onepasswordv1.OnePasswordItem{}
+	err := r.Client.Get(context.Background(), request.NamespacedName, onepassworditem)
+	if err != nil {
+		if errors.IsNotFound(err) {
+			return reconcile.Result{}, nil
+		}
+		return reconcile.Result{}, err
+	}
+
+	// If the deployment is not being deleted
+	if onepassworditem.ObjectMeta.DeletionTimestamp.IsZero() {
+		// Adds a finalizer to the deployment if one does not exist.
+		// This is so we can handle cleanup of associated secrets properly
+		if !utils.ContainsString(onepassworditem.ObjectMeta.Finalizers, finalizer) {
+			onepassworditem.ObjectMeta.Finalizers = append(onepassworditem.ObjectMeta.Finalizers, finalizer)
+			if err := r.Client.Update(context.Background(), onepassworditem); err != nil {
+				return reconcile.Result{}, err
+			}
+		}
+
+		// Handles creation or updating secrets for deployment if needed
+		if err := r.HandleOnePasswordItem(onepassworditem, request); err != nil {
+			return reconcile.Result{}, err
+		}
+		return reconcile.Result{}, nil
+	}
+	// If one password finalizer exists then we must cleanup associated secrets
+	if utils.ContainsString(onepassworditem.ObjectMeta.Finalizers, finalizer) {
+
+		// Delete associated kubernetes secret
+		if err = r.cleanupKubernetesSecret(onepassworditem); err != nil {
+			return reconcile.Result{}, err
+		}
+
+		// Remove finalizer now that cleanup is complete
+		if err := r.removeFinalizer(onepassworditem); err != nil {
+			return reconcile.Result{}, err
+		}
+	}
+	return reconcile.Result{}, nil
+}
+
+// SetupWithManager sets up the controller with the Manager.
+func (r *OnePasswordItemReconciler) SetupWithManager(mgr ctrl.Manager) error {
+	c, err := controller.New("onepassworditem-controller", mgr, controller.Options{Reconciler: r})
+	if err != nil {
+		return err
+	}
+
+	// Watch for changes to primary resource OnePasswordItem
+	err = c.Watch(&source.Kind{Type: &onepasswordv1.OnePasswordItem{}}, &handler.EnqueueRequestForObject{})
+	if err != nil {
+		return err
+	}
+
+	return nil
+	// TODO Consider the simplified code below. Based on the migration guide: https://sdk.operatorframework.io/docs/building-operators/golang/migration/#create-a-new-project
+	//	return ctrl.NewControllerManagedBy(mgr).Named("onepassworditem-controller").WithOptions(controller.Options{Reconciler: r}).
+	//		For(&onepasswordv1.OnePasswordItem{}).Watches(&source.Kind{Type: &onepasswordv1.OnePasswordItem{}}, &handler.EnqueueRequestForObject{}).
+	//		Complete(r)
+}
+
+func (r *OnePasswordItemReconciler) removeFinalizer(onePasswordItem *onepasswordv1.OnePasswordItem) error {
+	onePasswordItem.ObjectMeta.Finalizers = utils.RemoveString(onePasswordItem.ObjectMeta.Finalizers, finalizer)
+	if err := r.Client.Update(context.Background(), onePasswordItem); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (r *OnePasswordItemReconciler) cleanupKubernetesSecret(onePasswordItem *onepasswordv1.OnePasswordItem) error {
+	kubernetesSecret := &corev1.Secret{}
+	kubernetesSecret.ObjectMeta.Name = onePasswordItem.Name
+	kubernetesSecret.ObjectMeta.Namespace = onePasswordItem.Namespace
+
+	r.Client.Delete(context.Background(), kubernetesSecret)
+	if err := r.Client.Delete(context.Background(), kubernetesSecret); err != nil {
+		if !errors.IsNotFound(err) {
+			return err
+		}
+	}
+	return nil
+}
+
+func (r *OnePasswordItemReconciler) HandleOnePasswordItem(resource *onepasswordv1.OnePasswordItem, request reconcile.Request) error {
+	secretName := resource.GetName()
+	labels := resource.Labels
+	annotations := resource.Annotations
+	secretType := resource.Type
+	autoRestart := annotations[op.RestartDeploymentsAnnotation]
+
+	item, err := onepassword.GetOnePasswordItemByPath(r.OpConnectClient, resource.Spec.ItemPath)
+	if err != nil {
+		return fmt.Errorf("Failed to retrieve item: %v", err)
+	}
+
+	// Create owner reference.
+	gvk, err := apiutil.GVKForObject(resource, r.Scheme)
+	if err != nil {
+		return fmt.Errorf("could not to retrieve group version kind: %v", err)
+	}
+	ownerRef := &metav1.OwnerReference{
+		APIVersion: gvk.GroupVersion().String(),
+		Kind:       gvk.Kind,
+		Name:       resource.GetName(),
+		UID:        resource.GetUID(),
+	}
+
+	return kubeSecrets.CreateKubernetesSecretFromItem(r.Client, secretName, resource.Namespace, item, autoRestart, labels, secretType, annotations, ownerRef)
+}

controllers/suite_test.go

@@ -0,0 +1,80 @@
+/*
+Copyright 2022.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package controllers
+
+import (
+	"path/filepath"
+	"testing"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	"k8s.io/client-go/kubernetes/scheme"
+	"k8s.io/client-go/rest"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+
+	onepasswordv1 "github.com/1Password/onepassword-operator/api/v1"
+	//+kubebuilder:scaffold:imports
+)
+
+// These tests use Ginkgo (BDD-style Go testing framework). Refer to
+// http://onsi.github.io/ginkgo/ to learn more about Ginkgo.
+
+var cfg *rest.Config
+var k8sClient client.Client
+var testEnv *envtest.Environment
+
+func TestAPIs(t *testing.T) {
+	RegisterFailHandler(Fail)
+
+	RunSpecsWithDefaultAndCustomReporters(t,
+		"Controller Suite",
+		[]Reporter{printer.NewlineReporter{}})
+}
+
+var _ = BeforeSuite(func() {
+	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
+
+	By("bootstrapping test environment")
+	testEnv = &envtest.Environment{
+		CRDDirectoryPaths:     []string{filepath.Join("..", "config", "crd", "bases")},
+		ErrorIfCRDPathMissing: true,
+	}
+
+	cfg, err := testEnv.Start()
+	Expect(err).NotTo(HaveOccurred())
+	Expect(cfg).NotTo(BeNil())
+
+	err = onepasswordv1.AddToScheme(scheme.Scheme)
+	Expect(err).NotTo(HaveOccurred())
+
+	//+kubebuilder:scaffold:scheme
+
+	k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
+	Expect(err).NotTo(HaveOccurred())
+	Expect(k8sClient).NotTo(BeNil())
+
+}, 60)
+
+var _ = AfterSuite(func() {
+	By("tearing down the test environment")
+	err := testEnv.Stop()
+	Expect(err).NotTo(HaveOccurred())
+})

docs/testing.md

@@ -1,27 +0,0 @@
-# Testing
-
-## Unit tests
-**When**: Pure Go logic, no Kubernetes apiserver or network.
-**Where**: `internal/...`, `pkg/...`  
-**Add files in**: `*_test.go` next to the code.  
-**Run**: `make test`
-
-## Integration tests (envtest)
-**When**: Controller/reconciler behavior against a mocked kubernetes cluster.  
-**Where**: `internal/controller/...`  
-**Framework**: controller-runtime’s `envtest`.  
-**Run**: `make test`
-
-## E2E tests (kind)
-**When**: Full cluster behavior (CRDs, operator image, Connect/SA flows).  
-**Where**: `test/e2e/...`  
-**Framework**: Ginkgo + `pkg/testhelper`.
-
-**Local prep**:
-1. [Install `kind`](https://kind.sigs.k8s.io/docs/user/quick-start/#installing-with-a-package-manager) to spin up local Kubernetes cluster.
-2. `export OP_CONNECT_TOKEN=<token>`
-3. `export OP_SERVICE_ACCOUNT_TOKEN=<token>`
-4. `make test-e2e`
-5. Put `1password-credentials.json` into project root.
-
-**Run**: `make test-e2e`

go.mod

@@ -1,116 +1,81 @@
 module github.com/1Password/onepassword-operator
 
-go 1.24.0
-
-toolchain go1.24.5
+go 1.17
 
 require (
-	github.com/1Password/connect-sdk-go v1.5.3
-	github.com/1password/onepassword-sdk-go v0.3.1
-	github.com/go-logr/logr v1.4.2
-	github.com/onsi/ginkgo/v2 v2.22.0
-	github.com/onsi/gomega v1.36.1
-	github.com/stretchr/testify v1.10.0
-	k8s.io/api v0.33.0
-	k8s.io/apiextensions-apiserver v0.33.0
-	k8s.io/apimachinery v0.33.0
-	k8s.io/client-go v0.33.0
-	k8s.io/kubectl v0.29.0
-	sigs.k8s.io/controller-runtime v0.21.0
+	github.com/1Password/connect-sdk-go v1.2.0
+	github.com/onsi/ginkgo v1.16.5
+	github.com/onsi/gomega v1.17.0
+	github.com/stretchr/testify v1.7.0
+	k8s.io/api v0.23.5
+	k8s.io/apimachinery v0.23.5
+	k8s.io/client-go v0.23.5
+	k8s.io/kubectl v0.23.5
+	sigs.k8s.io/controller-runtime v0.11.0
 )
 
 require (
-	cel.dev/expr v0.19.1 // indirect
-	github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
+	cloud.google.com/go v0.81.0 // indirect
+	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
+	github.com/Azure/go-autorest/autorest v0.11.18 // indirect
+	github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
+	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
+	github.com/Azure/go-autorest/logger v0.2.1 // indirect
+	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/blang/semver/v4 v4.0.0 // indirect
-	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/dylibso/observe-sdk/go v0.0.0-20240819160327-2d926c5d788a // indirect
-	github.com/emicklei/go-restful/v3 v3.12.0 // indirect
-	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
-	github.com/evanphx/json-patch/v5 v5.9.11 // indirect
-	github.com/extism/go-sdk v1.7.0 // indirect
-	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-logr/zapr v1.3.0 // indirect
-	github.com/go-openapi/jsonpointer v0.21.0 // indirect
-	github.com/go-openapi/jsonreference v0.21.0 // indirect
-	github.com/go-openapi/swag v0.23.0 // indirect
-	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
-	github.com/gobwas/glob v0.2.3 // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
+	github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
+	github.com/fsnotify/fsnotify v1.5.1 // indirect
+	github.com/go-logr/logr v1.2.0 // indirect
+	github.com/go-logr/zapr v1.2.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/google/btree v1.1.3 // indirect
-	github.com/google/cel-go v0.23.2 // indirect
-	github.com/google/gnostic-models v0.6.9 // indirect
-	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
-	github.com/ianlancetaylor/demangle v0.0.0-20240805132620-81f5be970eca // indirect
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/go-cmp v0.5.5 // indirect
+	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/google/uuid v1.1.2 // indirect
+	github.com/googleapis/gnostic v0.5.5 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_golang v1.22.0 // indirect
-	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.62.0 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
-	github.com/spf13/cobra v1.8.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/prometheus/client_golang v1.11.0 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.28.0 // indirect
+	github.com/prometheus/procfs v0.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stoewer/go-strcase v1.3.0 // indirect
-	github.com/stretchr/objx v0.5.2 // indirect
-	github.com/tetratelabs/wabin v0.0.0-20230304001439-f6f874872834 // indirect
-	github.com/tetratelabs/wazero v1.9.0 // indirect
-	github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
-	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
-	github.com/x448/float16 v0.8.4 // indirect
-	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
-	go.opentelemetry.io/otel v1.33.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
-	go.opentelemetry.io/otel/metric v1.33.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.33.0 // indirect
-	go.opentelemetry.io/otel/trace v1.33.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.4.0 // indirect
-	go.uber.org/atomic v1.11.0 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
-	golang.org/x/net v0.41.0 // indirect
-	golang.org/x/oauth2 v0.30.0 // indirect
-	golang.org/x/sync v0.15.0 // indirect
-	golang.org/x/sys v0.33.0 // indirect
-	golang.org/x/term v0.32.0 // indirect
-	golang.org/x/text v0.26.0 // indirect
-	golang.org/x/time v0.9.0 // indirect
-	golang.org/x/tools v0.33.0 // indirect
-	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
-	google.golang.org/grpc v1.68.1 // indirect
-	google.golang.org/protobuf v1.36.5 // indirect
-	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
+	github.com/uber/jaeger-client-go v2.25.0+incompatible // indirect
+	github.com/uber/jaeger-lib v2.4.0+incompatible // indirect
+	go.uber.org/atomic v1.7.0 // indirect
+	go.uber.org/multierr v1.6.0 // indirect
+	go.uber.org/zap v1.19.1 // indirect
+	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
+	golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
+	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
+	golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect
+	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
+	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiserver v0.33.0 // indirect
-	k8s.io/component-base v0.33.0 // indirect
-	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
-	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
-	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
-	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
-	sigs.k8s.io/randfill v1.0.0 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
-	sigs.k8s.io/yaml v1.4.0 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	k8s.io/apiextensions-apiserver v0.23.0 // indirect
+	k8s.io/component-base v0.23.5 // indirect
+	k8s.io/klog/v2 v2.30.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
+	k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
+	sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
 )

hack/boilerplate.go.txt

@@ -1,23 +1,15 @@
 /*
-MIT License
+Copyright 2022.
 
-Copyright (c) 2020-2024 1Password
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+    http://www.apache.org/licenses/LICENSE-2.0
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 */

internal/controller/deployment_controller.go

@@ -1,223 +0,0 @@
-/*
-MIT License
-
-Copyright (c) 2020-2024 1Password
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-package controller
-
-import (
-	"context"
-	"fmt"
-	"regexp"
-	"strings"
-	"time"
-
-	kubeSecrets "github.com/1Password/onepassword-operator/pkg/kubernetessecrets"
-	"github.com/1Password/onepassword-operator/pkg/logs"
-	op "github.com/1Password/onepassword-operator/pkg/onepassword"
-	opclient "github.com/1Password/onepassword-operator/pkg/onepassword/client"
-	"github.com/1Password/onepassword-operator/pkg/utils"
-
-	appsv1 "k8s.io/api/apps/v1"
-	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
-	logf "sigs.k8s.io/controller-runtime/pkg/log"
-	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-)
-
-var logDeployment = logf.Log.WithName("controller_deployment")
-
-// DeploymentReconciler reconciles a Deployment object
-type DeploymentReconciler struct {
-	client.Client
-	Scheme             *runtime.Scheme
-	OpClient           opclient.Client
-	OpAnnotationRegExp *regexp.Regexp
-}
-
-// +kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=apps,resources=deployments/status,verbs=get;update;patch
-// +kubebuilder:rbac:groups=apps,resources=deployments/finalizers,verbs=update
-
-// Reconcile is part of the main kubernetes reconciliation loop which aims to
-// move the current state of the cluster closer to the desired state.
-// TODO(user): Modify the Reconcile function to compare the state specified by
-// the OnePasswordItem object against the actual cluster state, and then
-// perform operations to make the cluster state reflect the state specified by
-// the user.
-//
-// For more details, check Reconcile and its Result here:
-// - https://pkg.go.dev/sigs.k8s.io/controller-runtime/pkg/reconcile
-func (r *DeploymentReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	reqLogger := logDeployment.WithValues("Request.Namespace", req.Namespace, "Request.Name", req.Name)
-	reqLogger.V(logs.DebugLevel).Info("Reconciling Deployment")
-
-	deployment := &appsv1.Deployment{}
-	err := r.Get(ctx, req.NamespacedName, deployment)
-	if err != nil {
-		if errors.IsNotFound(err) {
-			return reconcile.Result{}, nil
-		}
-		return ctrl.Result{}, err
-	}
-
-	annotations, annotationsFound := op.GetAnnotationsForDeployment(deployment, r.OpAnnotationRegExp)
-	if !annotationsFound {
-		reqLogger.V(logs.DebugLevel).Info("No 1Password Annotations found")
-		return ctrl.Result{}, nil
-	}
-
-	// If the deployment is not being deleted
-	if deployment.DeletionTimestamp.IsZero() {
-		// Adds a finalizer to the deployment if one does not exist.
-		// This is so we can handle cleanup of associated secrets properly
-		if !utils.ContainsString(deployment.Finalizers, finalizer) {
-			deployment.Finalizers = append(deployment.Finalizers, finalizer)
-			if err = r.Update(ctx, deployment); err != nil {
-				return reconcile.Result{}, err
-			}
-		}
-		// Handles creation or updating secrets for deployment if needed
-		if err = r.handleApplyingDeployment(ctx, deployment, deployment.Namespace, annotations, req); err != nil {
-			if strings.Contains(err.Error(), "rate limit") {
-				reqLogger.V(logs.InfoLevel).Info("1Password rate limit hit. Requeuing after 15 minutes.")
-				return ctrl.Result{RequeueAfter: 15 * time.Minute}, nil
-			} else {
-				return ctrl.Result{}, err
-			}
-		}
-		return ctrl.Result{}, nil
-	}
-	// The deployment has been marked for deletion. If the one password
-	// finalizer is found there are cleanup tasks to perform
-	if utils.ContainsString(deployment.Finalizers, finalizer) {
-
-		secretName := annotations[op.NameAnnotation]
-		if err = r.cleanupKubernetesSecretForDeployment(ctx, secretName, deployment); err != nil {
-			return ctrl.Result{}, err
-		}
-
-		// Remove the finalizer from the deployment so deletion of deployment can be completed
-		if err = r.removeOnePasswordFinalizerFromDeployment(ctx, deployment); err != nil {
-			return reconcile.Result{}, err
-		}
-	}
-	return ctrl.Result{}, nil
-}
-
-// SetupWithManager sets up the controller with the Manager.
-func (r *DeploymentReconciler) SetupWithManager(mgr ctrl.Manager) error {
-	return ctrl.NewControllerManagedBy(mgr).
-		For(&appsv1.Deployment{}).
-		Named("onepassword-deployment").
-		Complete(r)
-}
-
-func (r *DeploymentReconciler) cleanupKubernetesSecretForDeployment(ctx context.Context, secretName string, deletedDeployment *appsv1.Deployment) error {
-	kubernetesSecret := &corev1.Secret{}
-	kubernetesSecret.Name = secretName
-	kubernetesSecret.Namespace = deletedDeployment.Namespace
-
-	if len(secretName) == 0 {
-		return nil
-	}
-	updatedSecrets := map[string]*corev1.Secret{secretName: kubernetesSecret}
-
-	multipleDeploymentsUsingSecret, err := r.areMultipleDeploymentsUsingSecret(ctx, updatedSecrets, *deletedDeployment)
-	if err != nil {
-		return err
-	}
-
-	// Only delete the associated kubernetes secret if it is not being used by other deployments
-	if !multipleDeploymentsUsingSecret {
-		if err = r.Delete(ctx, kubernetesSecret); err != nil {
-			if !errors.IsNotFound(err) {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (r *DeploymentReconciler) areMultipleDeploymentsUsingSecret(ctx context.Context, updatedSecrets map[string]*corev1.Secret, deletedDeployment appsv1.Deployment) (bool, error) {
-	deployments := &appsv1.DeploymentList{}
-	opts := []client.ListOption{
-		client.InNamespace(deletedDeployment.Namespace),
-	}
-
-	err := r.List(ctx, deployments, opts...)
-	if err != nil {
-		logDeployment.Error(err, "Failed to list kubernetes deployments")
-		return false, err
-	}
-
-	for i := 0; i < len(deployments.Items); i++ {
-		if deployments.Items[i].Name != deletedDeployment.Name {
-			if op.IsDeploymentUsingSecrets(&deployments.Items[i], updatedSecrets) {
-				return true, nil
-			}
-		}
-	}
-	return false, nil
-}
-
-func (r *DeploymentReconciler) removeOnePasswordFinalizerFromDeployment(ctx context.Context, deployment *appsv1.Deployment) error {
-	deployment.Finalizers = utils.RemoveString(deployment.Finalizers, finalizer)
-	return r.Update(ctx, deployment)
-}
-
-func (r *DeploymentReconciler) handleApplyingDeployment(ctx context.Context, deployment *appsv1.Deployment, namespace string, annotations map[string]string, request reconcile.Request) error {
-	reqLog := logDeployment.WithValues("Request.Namespace", request.Namespace, "Request.Name", request.Name)
-
-	secretName := annotations[op.NameAnnotation]
-	secretLabels := map[string]string(nil)
-	secretType := string(corev1.SecretTypeOpaque)
-
-	if len(secretName) == 0 {
-		reqLog.Info("No 'item-name' annotation set. 'item-path' and 'item-name' must be set as annotations to add new secret.")
-		return nil
-	}
-
-	item, err := op.GetOnePasswordItemByPath(ctx, r.OpClient, annotations[op.ItemPathAnnotation])
-	if err != nil {
-		return fmt.Errorf("failed to retrieve item: %w", err)
-	}
-
-	// Create owner reference.
-	gvk, err := apiutil.GVKForObject(deployment, r.Scheme)
-	if err != nil {
-		return fmt.Errorf("could not to retrieve group version kind: %w", err)
-	}
-	ownerRef := &metav1.OwnerReference{
-		APIVersion: gvk.GroupVersion().String(),
-		Kind:       gvk.Kind,
-		Name:       deployment.GetName(),
-		UID:        deployment.GetUID(),
-	}
-
-	return kubeSecrets.CreateKubernetesSecretFromItem(ctx, r.Client, secretName, namespace, item, annotations[op.RestartDeploymentsAnnotation], secretLabels, secretType, ownerRef)
-}

internal/controller/deployment_controller_test.go

@@ -1,390 +0,0 @@
-package controller
-
-import (
-	"context"
-	"time"
-
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-
-	appsv1 "k8s.io/api/apps/v1"
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-
-	onepasswordv1 "github.com/1Password/onepassword-operator/api/v1"
-	op "github.com/1Password/onepassword-operator/pkg/onepassword"
-)
-
-const (
-	deploymentKind       = "Deployment"
-	deploymentAPIVersion = "v1"
-	deploymentName       = "test-deployment"
-)
-
-var _ = Describe("Deployment controller", func() {
-	ctx := context.Background()
-	var deploymentKey types.NamespacedName
-	var secretKey types.NamespacedName
-	var deploymentResource *appsv1.Deployment
-	createdSecret := &v1.Secret{}
-
-	makeDeployment := func() {
-
-		deploymentKey = types.NamespacedName{
-			Name:      deploymentName,
-			Namespace: namespace,
-		}
-
-		secretKey = types.NamespacedName{
-			Name:      item1.Name,
-			Namespace: namespace,
-		}
-
-		By("Deploying a pod with proper annotations successfully")
-		deploymentResource = &appsv1.Deployment{
-			TypeMeta: metav1.TypeMeta{
-				Kind:       deploymentKind,
-				APIVersion: deploymentAPIVersion,
-			},
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      deploymentKey.Name,
-				Namespace: deploymentKey.Namespace,
-				Annotations: map[string]string{
-					op.ItemPathAnnotation: item1.Path,
-					op.NameAnnotation:     item1.Name,
-				},
-			},
-			Spec: appsv1.DeploymentSpec{
-				Template: v1.PodTemplateSpec{
-					ObjectMeta: metav1.ObjectMeta{
-						Labels: map[string]string{"app": deploymentName},
-					},
-					Spec: v1.PodSpec{
-						Containers: []v1.Container{
-							{
-								Name:            deploymentName,
-								Image:           "eu.gcr.io/kyma-project/example/http-db-service:0.0.6",
-								ImagePullPolicy: "IfNotPresent",
-							},
-						},
-					},
-				},
-				Selector: &metav1.LabelSelector{
-					MatchLabels: map[string]string{"app": deploymentName},
-				},
-			},
-		}
-		Expect(k8sClient.Create(ctx, deploymentResource)).Should(Succeed())
-
-		By("Creating the K8s secret successfully")
-		time.Sleep(time.Millisecond * 100)
-		Eventually(func() bool {
-			err := k8sClient.Get(ctx, secretKey, createdSecret)
-			return err == nil
-		}, timeout, interval).Should(BeTrue())
-		Expect(createdSecret.Data).Should(Equal(item1.SecretData))
-	}
-
-	cleanK8sResources := func() {
-		// failed test runs that don't clean up leave resources behind.
-		err := k8sClient.DeleteAllOf(ctx, &onepasswordv1.OnePasswordItem{}, client.InNamespace(namespace))
-		Expect(err).ToNot(HaveOccurred())
-
-		err = k8sClient.DeleteAllOf(ctx, &v1.Secret{}, client.InNamespace(namespace))
-		Expect(err).ToNot(HaveOccurred())
-
-		err = k8sClient.DeleteAllOf(ctx, &appsv1.Deployment{}, client.InNamespace(namespace))
-		Expect(err).ToNot(HaveOccurred())
-	}
-
-	mockGetItemFunc := func() {
-		// mock GetItemByID to return test item 'item1'
-		mockGetItemByIDFunc.Return(item1.ToModel(), nil)
-	}
-
-	BeforeEach(func() {
-		cleanK8sResources()
-		mockGetItemFunc()
-		time.Sleep(time.Second) // TODO: can we achieve that with ginkgo?
-		makeDeployment()
-	})
-
-	Context("Deployment with secrets from 1Password", func() {
-		It("Should delete secret if deployment is deleted", func() {
-			By("Deleting the pod")
-			Eventually(func() error {
-				f := &appsv1.Deployment{}
-				err := k8sClient.Get(ctx, deploymentKey, f)
-				if err != nil {
-					return err
-				}
-				return k8sClient.Delete(ctx, f)
-			}, timeout, interval).Should(Succeed())
-
-			Eventually(func() error {
-				f := &appsv1.Deployment{}
-				return k8sClient.Get(ctx, deploymentKey, f)
-			}, timeout, interval).ShouldNot(Succeed())
-
-			Eventually(func() error {
-				f := &v1.Secret{}
-				return k8sClient.Get(ctx, secretKey, f)
-			}, timeout, interval).ShouldNot(Succeed())
-		})
-
-		It("Should update existing K8s Secret using deployment", func() {
-			By("Updating secret")
-
-			// mock GetItemByID to return test item 'item2'
-			mockGetItemByIDFunc.Return(item2.ToModel(), nil)
-
-			Eventually(func() error {
-				updatedDeployment := &appsv1.Deployment{
-					TypeMeta: metav1.TypeMeta{
-						Kind:       deploymentKind,
-						APIVersion: deploymentAPIVersion,
-					},
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      deploymentKey.Name,
-						Namespace: deploymentKey.Namespace,
-						Annotations: map[string]string{
-							op.ItemPathAnnotation: item2.Path,
-							op.NameAnnotation:     item1.Name,
-						},
-					},
-					Spec: appsv1.DeploymentSpec{
-						Template: v1.PodTemplateSpec{
-							ObjectMeta: metav1.ObjectMeta{
-								Labels: map[string]string{"app": deploymentName},
-							},
-							Spec: v1.PodSpec{
-								Containers: []v1.Container{
-									{
-										Name:            deploymentName,
-										Image:           "eu.gcr.io/kyma-project/example/http-db-service:0.0.6",
-										ImagePullPolicy: "IfNotPresent",
-									},
-								},
-							},
-						},
-						Selector: &metav1.LabelSelector{
-							MatchLabels: map[string]string{"app": deploymentName},
-						},
-					},
-				}
-				err := k8sClient.Update(ctx, updatedDeployment)
-				if err != nil {
-					return err
-				}
-				return nil
-			}, timeout, interval).Should(Succeed())
-
-			// TODO: can we achieve the same without sleep?
-			time.Sleep(time.Millisecond * 10)
-			By("Reading updated K8s secret")
-			updatedSecret := &v1.Secret{}
-			Eventually(func() bool {
-				err := k8sClient.Get(ctx, secretKey, updatedSecret)
-				return err == nil
-			}, timeout, interval).Should(BeTrue())
-			Expect(updatedSecret.Data).Should(Equal(item2.SecretData))
-		})
-
-		It("Should not update secret if Annotations have not changed", func() {
-			By("Updating secret without changing annotations")
-			Eventually(func() error {
-				updatedDeployment := &appsv1.Deployment{
-					TypeMeta: metav1.TypeMeta{
-						Kind:       deploymentKind,
-						APIVersion: deploymentAPIVersion,
-					},
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      deploymentKey.Name,
-						Namespace: deploymentKey.Namespace,
-						Annotations: map[string]string{
-							op.ItemPathAnnotation: item1.Path,
-							op.NameAnnotation:     item1.Name,
-						},
-					},
-					Spec: appsv1.DeploymentSpec{
-						Template: v1.PodTemplateSpec{
-							ObjectMeta: metav1.ObjectMeta{
-								Labels: map[string]string{"app": deploymentName},
-							},
-							Spec: v1.PodSpec{
-								Containers: []v1.Container{
-									{
-										Name:            deploymentName,
-										Image:           "eu.gcr.io/kyma-project/example/http-db-service:0.0.6",
-										ImagePullPolicy: "IfNotPresent",
-									},
-								},
-							},
-						},
-						Selector: &metav1.LabelSelector{
-							MatchLabels: map[string]string{"app": deploymentName},
-						},
-					},
-				}
-				err := k8sClient.Update(ctx, updatedDeployment)
-				if err != nil {
-					return err
-				}
-				return nil
-			}, timeout, interval).Should(Succeed())
-
-			// TODO: can we achieve the same without sleep?
-			time.Sleep(time.Millisecond * 10)
-			By("Reading updated K8s secret")
-			updatedSecret := &v1.Secret{}
-			Eventually(func() bool {
-				err := k8sClient.Get(ctx, secretKey, updatedSecret)
-				return err == nil
-			}, timeout, interval).Should(BeTrue())
-			Expect(updatedSecret.Data).Should(Equal(item1.SecretData))
-		})
-
-		It("Should not delete secret created via deployment if it's used in another container", func() {
-			By("Creating another POD with created secret")
-			anotherDeploymentKey := types.NamespacedName{
-				Name:      "other-deployment",
-				Namespace: namespace,
-			}
-			Eventually(func() error {
-				anotherDeployment := &appsv1.Deployment{
-					TypeMeta: metav1.TypeMeta{
-						Kind:       deploymentKind,
-						APIVersion: deploymentAPIVersion,
-					},
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      anotherDeploymentKey.Name,
-						Namespace: anotherDeploymentKey.Namespace,
-					},
-					Spec: appsv1.DeploymentSpec{
-						Template: v1.PodTemplateSpec{
-							ObjectMeta: metav1.ObjectMeta{
-								Labels: map[string]string{"app": anotherDeploymentKey.Name},
-							},
-							Spec: v1.PodSpec{
-								Containers: []v1.Container{
-									{
-										Name:            anotherDeploymentKey.Name,
-										Image:           "eu.gcr.io/kyma-project/example/http-db-service:0.0.6",
-										ImagePullPolicy: "IfNotPresent",
-										Env: []v1.EnvVar{
-											{
-												Name: anotherDeploymentKey.Name,
-												ValueFrom: &v1.EnvVarSource{
-													SecretKeyRef: &v1.SecretKeySelector{
-														LocalObjectReference: v1.LocalObjectReference{
-															Name: secretKey.Name,
-														},
-														Key: "password",
-													},
-												},
-											},
-										},
-									},
-								},
-							},
-						},
-						Selector: &metav1.LabelSelector{
-							MatchLabels: map[string]string{"app": anotherDeploymentKey.Name},
-						},
-					},
-				}
-				err := k8sClient.Create(ctx, anotherDeployment)
-				if err != nil {
-					return err
-				}
-				return nil
-			}, timeout, interval).Should(Succeed())
-
-			By("Deleting the pod")
-			Eventually(func() error {
-				f := &appsv1.Deployment{}
-				err := k8sClient.Get(ctx, deploymentKey, f)
-				if err != nil {
-					return err
-				}
-				return k8sClient.Delete(ctx, f)
-			}, timeout, interval).Should(Succeed())
-
-			Eventually(func() error {
-				f := &v1.Secret{}
-				return k8sClient.Get(ctx, secretKey, f)
-			}, timeout, interval).Should(Succeed())
-		})
-
-		It("Should not delete secret created via deployment if it's used in another volume", func() {
-			By("Creating another POD with created secret")
-			anotherDeploymentKey := types.NamespacedName{
-				Name:      "other-deployment",
-				Namespace: namespace,
-			}
-			Eventually(func() error {
-				anotherDeployment := &appsv1.Deployment{
-					TypeMeta: metav1.TypeMeta{
-						Kind:       deploymentKind,
-						APIVersion: deploymentAPIVersion,
-					},
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      anotherDeploymentKey.Name,
-						Namespace: anotherDeploymentKey.Namespace,
-					},
-					Spec: appsv1.DeploymentSpec{
-						Template: v1.PodTemplateSpec{
-							ObjectMeta: metav1.ObjectMeta{
-								Labels: map[string]string{"app": anotherDeploymentKey.Name},
-							},
-							Spec: v1.PodSpec{
-								Volumes: []v1.Volume{
-									{
-										Name: anotherDeploymentKey.Name,
-										VolumeSource: v1.VolumeSource{
-											Secret: &v1.SecretVolumeSource{
-												SecretName: secretKey.Name,
-											},
-										},
-									},
-								},
-								Containers: []v1.Container{
-									{
-										Name:            anotherDeploymentKey.Name,
-										Image:           "eu.gcr.io/kyma-project/example/http-db-service:0.0.6",
-										ImagePullPolicy: "IfNotPresent",
-									},
-								},
-							},
-						},
-						Selector: &metav1.LabelSelector{
-							MatchLabels: map[string]string{"app": anotherDeploymentKey.Name},
-						},
-					},
-				}
-				err := k8sClient.Create(ctx, anotherDeployment)
-				if err != nil {
-					return err
-				}
-				return nil
-			}, timeout, interval).Should(Succeed())
-
-			By("Deleting the pod")
-			Eventually(func() error {
-				f := &appsv1.Deployment{}
-				err := k8sClient.Get(ctx, deploymentKey, f)
-				if err != nil {
-					return err
-				}
-				return k8sClient.Delete(ctx, f)
-			}, timeout, interval).Should(Succeed())
-
-			Eventually(func() error {
-				f := &v1.Secret{}
-				return k8sClient.Get(ctx, secretKey, f)
-			}, timeout, interval).Should(Succeed())
-		})
-	})
-})

internal/controller/onepassworditem_controller.go

@@ -1,216 +0,0 @@
-/*
-MIT License
-
-Copyright (c) 2020-2024 1Password
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-package controller
-
-import (
-	"context"
-	"fmt"
-	"strings"
-	"time"
-
-	onepasswordv1 "github.com/1Password/onepassword-operator/api/v1"
-	kubeSecrets "github.com/1Password/onepassword-operator/pkg/kubernetessecrets"
-	"github.com/1Password/onepassword-operator/pkg/logs"
-	op "github.com/1Password/onepassword-operator/pkg/onepassword"
-	opclient "github.com/1Password/onepassword-operator/pkg/onepassword/client"
-	"github.com/1Password/onepassword-operator/pkg/utils"
-
-	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
-	logf "sigs.k8s.io/controller-runtime/pkg/log"
-)
-
-var logOnePasswordItem = logf.Log.WithName("controller_onepassworditem")
-var finalizer = "onepassword.com/finalizer.secret"
-
-// OnePasswordItemReconciler reconciles a OnePasswordItem object
-type OnePasswordItemReconciler struct {
-	client.Client
-	Scheme   *runtime.Scheme
-	OpClient opclient.Client
-}
-
-// +kubebuilder:rbac:groups=onepassword.com,resources=onepassworditems,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=onepassword.com,resources=onepassworditems/status,verbs=get;update;patch
-// +kubebuilder:rbac:groups=onepassword.com,resources=onepassworditems/finalizers,verbs=update
-
-// +kubebuilder:rbac:groups="",resources=pods,verbs=get
-// +kubebuilder:rbac:groups="",resources=pods;services;services/finalizers;endpoints;persistentvolumeclaims;events;configmaps;secrets;namespaces,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=apps,resources=daemonsets;deployments;replicasets;statefulsets,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=apps,resources=replicasets;deployments,verbs=get
-// +kubebuilder:rbac:groups=apps,resourceNames=onepassword-connect-operator,resources=deployments/finalizers,verbs=update
-// +kubebuilder:rbac:groups=onepassword.com,resources=*,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=monitoring.coreos.com,resources=servicemonitors,verbs=get;create
-// +kubebuilder:rbac:groups=coordination.k8s.io,resources=leases,verbs=get;list;create;update
-
-// Reconcile is part of the main kubernetes reconciliation loop which aims to
-// move the current state of the cluster closer to the desired state.
-// TODO(user): Modify the Reconcile function to compare the state specified by
-// the OnePasswordItem object against the actual cluster state, and then
-// perform operations to make the cluster state reflect the state specified by
-// the user.
-//
-// For more details, check Reconcile and its Result here:
-// - https://pkg.go.dev/sigs.k8s.io/controller-runtime/pkg/reconcile
-func (r *OnePasswordItemReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	reqLogger := logOnePasswordItem.WithValues("Request.Namespace", req.Namespace, "Request.Name", req.Name)
-	reqLogger.V(logs.DebugLevel).Info("Reconciling OnePasswordItem")
-
-	onepassworditem := &onepasswordv1.OnePasswordItem{}
-	err := r.Get(ctx, req.NamespacedName, onepassworditem)
-	if err != nil {
-		if errors.IsNotFound(err) {
-			return ctrl.Result{}, nil
-		}
-		return ctrl.Result{}, err
-	}
-
-	// If the deployment is not being deleted
-	if onepassworditem.DeletionTimestamp.IsZero() {
-		// Adds a finalizer to the deployment if one does not exist.
-		// This is so we can handle cleanup of associated secrets properly
-		if !utils.ContainsString(onepassworditem.Finalizers, finalizer) {
-			onepassworditem.Finalizers = append(onepassworditem.Finalizers, finalizer)
-			if err = r.Update(ctx, onepassworditem); err != nil {
-				return ctrl.Result{}, err
-			}
-		}
-
-		// Handles creation or updating secrets for deployment if needed
-		err = r.handleOnePasswordItem(ctx, onepassworditem, req)
-		if err != nil {
-			if strings.Contains(err.Error(), "rate limit") {
-				reqLogger.V(logs.InfoLevel).Info("1Password rate limit hit. Requeuing after 15 minutes.")
-				return ctrl.Result{RequeueAfter: 15 * time.Minute}, nil
-			}
-		}
-		if updateStatusErr := r.updateStatus(ctx, onepassworditem, err); updateStatusErr != nil {
-			return ctrl.Result{}, fmt.Errorf("cannot update status: %s", updateStatusErr)
-		}
-		return ctrl.Result{}, err
-	}
-	// If one password finalizer exists then we must cleanup associated secrets
-	if utils.ContainsString(onepassworditem.Finalizers, finalizer) {
-
-		// Delete associated kubernetes secret
-		if err = r.cleanupKubernetesSecret(ctx, onepassworditem); err != nil {
-			return ctrl.Result{}, err
-		}
-
-		// Remove finalizer now that cleanup is complete
-		if err = r.removeOnePasswordFinalizerFromOnePasswordItem(ctx, onepassworditem); err != nil {
-			return ctrl.Result{}, err
-		}
-	}
-	return ctrl.Result{}, nil
-}
-
-// SetupWithManager sets up the controller with the Manager.
-func (r *OnePasswordItemReconciler) SetupWithManager(mgr ctrl.Manager) error {
-	return ctrl.NewControllerManagedBy(mgr).
-		For(&onepasswordv1.OnePasswordItem{}).
-		Named("onepassworditem").
-		Complete(r)
-}
-
-func (r *OnePasswordItemReconciler) cleanupKubernetesSecret(ctx context.Context, onePasswordItem *onepasswordv1.OnePasswordItem) error {
-	kubernetesSecret := &corev1.Secret{}
-	kubernetesSecret.Name = onePasswordItem.Name
-	kubernetesSecret.Namespace = onePasswordItem.Namespace
-
-	if err := r.Delete(ctx, kubernetesSecret); err != nil {
-		if !errors.IsNotFound(err) {
-			return err
-		}
-	}
-	return nil
-}
-
-func (r *OnePasswordItemReconciler) removeOnePasswordFinalizerFromOnePasswordItem(ctx context.Context, onePasswordItem *onepasswordv1.OnePasswordItem) error {
-	onePasswordItem.Finalizers = utils.RemoveString(onePasswordItem.Finalizers, finalizer)
-	return r.Update(ctx, onePasswordItem)
-}
-
-func (r *OnePasswordItemReconciler) handleOnePasswordItem(ctx context.Context, resource *onepasswordv1.OnePasswordItem, _ ctrl.Request) error {
-	secretName := resource.GetName()
-	labels := resource.Labels
-	secretType := resource.Type
-	autoRestart := resource.Annotations[op.RestartDeploymentsAnnotation]
-
-	item, err := op.GetOnePasswordItemByPath(ctx, r.OpClient, resource.Spec.ItemPath)
-	if err != nil {
-		return fmt.Errorf("failed to retrieve item: %w", err)
-	}
-
-	// Create owner reference.
-	gvk, err := apiutil.GVKForObject(resource, r.Scheme)
-	if err != nil {
-		return fmt.Errorf("could not to retrieve group version kind: %w", err)
-	}
-	ownerRef := &metav1.OwnerReference{
-		APIVersion: gvk.GroupVersion().String(),
-		Kind:       gvk.Kind,
-		Name:       resource.GetName(),
-		UID:        resource.GetUID(),
-	}
-
-	return kubeSecrets.CreateKubernetesSecretFromItem(ctx, r.Client, secretName, resource.Namespace, item, autoRestart, labels, secretType, ownerRef)
-}
-
-func (r *OnePasswordItemReconciler) updateStatus(ctx context.Context, resource *onepasswordv1.OnePasswordItem, err error) error {
-	existingCondition := findCondition(resource.Status.Conditions, onepasswordv1.OnePasswordItemReady)
-	updatedCondition := existingCondition
-	if err != nil {
-		updatedCondition.Message = err.Error()
-		updatedCondition.Status = metav1.ConditionFalse
-	} else {
-		updatedCondition.Message = ""
-		updatedCondition.Status = metav1.ConditionTrue
-	}
-
-	if existingCondition.Status != updatedCondition.Status {
-		updatedCondition.LastTransitionTime = metav1.Now()
-	}
-
-	resource.Status.Conditions = []onepasswordv1.OnePasswordItemCondition{updatedCondition}
-	return r.Status().Update(ctx, resource)
-}
-
-func findCondition(conditions []onepasswordv1.OnePasswordItemCondition, t onepasswordv1.OnePasswordItemConditionType) onepasswordv1.OnePasswordItemCondition {
-	for _, c := range conditions {
-		if c.Type == t {
-			return c
-		}
-	}
-	return onepasswordv1.OnePasswordItemCondition{
-		Type:   t,
-		Status: metav1.ConditionUnknown,
-	}
-}

internal/controller/onepassworditem_controller_test.go

@@ -1,426 +0,0 @@
-package controller
-
-import (
-	"context"
-	"fmt"
-
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-
-	onepasswordv1 "github.com/1Password/onepassword-operator/api/v1"
-	"github.com/1Password/onepassword-operator/pkg/onepassword/model"
-)
-
-const (
-	firstHost = "http://localhost:8080"
-	awsKey    = "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"
-	iceCream  = "freezing blue 20%"
-)
-
-var _ = Describe("OnePasswordItem controller", func() {
-	BeforeEach(func() {
-		// failed test runs that don't clean up leave resources behind.
-		err := k8sClient.DeleteAllOf(context.Background(), &onepasswordv1.OnePasswordItem{}, client.InNamespace(namespace))
-		Expect(err).ToNot(HaveOccurred())
-		err = k8sClient.DeleteAllOf(context.Background(), &v1.Secret{}, client.InNamespace(namespace))
-		Expect(err).ToNot(HaveOccurred())
-
-		item := item1.ToModel()
-		mockGetItemByIDFunc.Return(item, nil)
-	})
-
-	Context("Happy path", func() {
-		It("Should handle 1Password Item and secret correctly", func() {
-			ctx := context.Background()
-			spec := onepasswordv1.OnePasswordItemSpec{
-				ItemPath: item1.Path,
-			}
-
-			key := types.NamespacedName{
-				Name:      "sample-item",
-				Namespace: namespace,
-			}
-
-			toCreate := &onepasswordv1.OnePasswordItem{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      key.Name,
-					Namespace: key.Namespace,
-				},
-				Spec: spec,
-			}
-
-			By("Creating a new OnePasswordItem successfully")
-			Expect(k8sClient.Create(ctx, toCreate)).Should(Succeed())
-
-			created := &onepasswordv1.OnePasswordItem{}
-			Eventually(func() bool {
-				err := k8sClient.Get(ctx, key, created)
-				return err == nil
-			}, timeout, interval).Should(BeTrue())
-
-			By("Creating the K8s secret successfully")
-			createdSecret := &v1.Secret{}
-			Eventually(func() bool {
-				err := k8sClient.Get(ctx, key, createdSecret)
-				return err == nil
-			}, timeout, interval).Should(BeTrue())
-			Expect(createdSecret.Data).Should(Equal(item1.SecretData))
-
-			By("Updating existing secret successfully")
-			newData := map[string]string{
-				"username":   "newUser1234",
-				"password":   "##newPassword##",
-				"extraField": "dev",
-			}
-			newDataByte := map[string][]byte{
-				"username":   []byte("newUser1234"),
-				"password":   []byte("##newPassword##"),
-				"extraField": []byte("dev"),
-			}
-
-			item := item2.ToModel()
-			for k, v := range newData {
-				item.Fields = append(item.Fields, model.ItemField{Label: k, Value: v})
-			}
-			mockGetItemByIDFunc.Return(item, nil)
-
-			_, err := onePasswordItemReconciler.Reconcile(ctx, reconcile.Request{NamespacedName: key})
-			Expect(err).ToNot(HaveOccurred())
-
-			updatedSecret := &v1.Secret{}
-			Eventually(func() bool {
-				err := k8sClient.Get(ctx, key, updatedSecret)
-				return err == nil
-			}, timeout, interval).Should(BeTrue())
-			Expect(updatedSecret.Data).Should(Equal(newDataByte))
-
-			By("Deleting the OnePasswordItem successfully")
-			Eventually(func() error {
-				f := &onepasswordv1.OnePasswordItem{}
-				err := k8sClient.Get(ctx, key, f)
-				if err != nil {
-					return err
-				}
-				return k8sClient.Delete(ctx, f)
-			}, timeout, interval).Should(Succeed())
-
-			Eventually(func() error {
-				f := &onepasswordv1.OnePasswordItem{}
-				return k8sClient.Get(ctx, key, f)
-			}, timeout, interval).ShouldNot(Succeed())
-
-			Eventually(func() error {
-				f := &v1.Secret{}
-				return k8sClient.Get(ctx, key, f)
-			}, timeout, interval).ShouldNot(Succeed())
-		})
-
-		It("Should handle 1Password Item with fields and sections that have invalid K8s labels correctly", func() {
-			ctx := context.Background()
-			spec := onepasswordv1.OnePasswordItemSpec{
-				ItemPath: item1.Path,
-			}
-
-			key := types.NamespacedName{
-				Name:      "my-secret-it3m",
-				Namespace: namespace,
-			}
-
-			toCreate := &onepasswordv1.OnePasswordItem{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      key.Name,
-					Namespace: key.Namespace,
-				},
-				Spec: spec,
-			}
-
-			testData := map[string]string{
-				"username":         username,
-				"password":         password,
-				"first host":       firstHost,
-				"AWS Access Key":   awsKey,
-				"😄 ice-cream type": iceCream,
-			}
-			expectedData := map[string][]byte{
-				"username":       []byte(username),
-				"password":       []byte(password),
-				"first-host":     []byte(firstHost),
-				"AWS-Access-Key": []byte(awsKey),
-				"ice-cream-type": []byte(iceCream),
-			}
-
-			item := item2.ToModel()
-			for k, v := range testData {
-				item.Fields = append(item.Fields, model.ItemField{Label: k, Value: v})
-			}
-			mockGetItemByIDFunc.Return(item, nil)
-
-			By("Creating a new OnePasswordItem successfully")
-			Expect(k8sClient.Create(ctx, toCreate)).Should(Succeed())
-
-			created := &onepasswordv1.OnePasswordItem{}
-			Eventually(func() bool {
-				err := k8sClient.Get(ctx, key, created)
-				return err == nil
-			}, timeout, interval).Should(BeTrue())
-
-			By("Creating the K8s secret successfully")
-			createdSecret := &v1.Secret{}
-			Eventually(func() bool {
-				err := k8sClient.Get(ctx, key, createdSecret)
-				return err == nil
-			}, timeout, interval).Should(BeTrue())
-			Expect(createdSecret.Data).Should(Equal(expectedData))
-
-			By("Deleting the OnePasswordItem successfully")
-			Eventually(func() error {
-				f := &onepasswordv1.OnePasswordItem{}
-				err := k8sClient.Get(ctx, key, f)
-				if err != nil {
-					return err
-				}
-				return k8sClient.Delete(ctx, f)
-			}, timeout, interval).Should(Succeed())
-
-			Eventually(func() error {
-				f := &onepasswordv1.OnePasswordItem{}
-				return k8sClient.Get(ctx, key, f)
-			}, timeout, interval).ShouldNot(Succeed())
-
-			Eventually(func() error {
-				f := &v1.Secret{}
-				return k8sClient.Get(ctx, key, f)
-			}, timeout, interval).ShouldNot(Succeed())
-		})
-
-		It("Should not update K8s secret if OnePasswordItem Version or VaultPath has not changed", func() {
-			ctx := context.Background()
-			spec := onepasswordv1.OnePasswordItemSpec{
-				ItemPath: item1.Path,
-			}
-
-			key := types.NamespacedName{
-				Name:      "item-not-updated",
-				Namespace: namespace,
-			}
-
-			toCreate := &onepasswordv1.OnePasswordItem{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      key.Name,
-					Namespace: key.Namespace,
-				},
-				Spec: spec,
-			}
-
-			By("Creating a new OnePasswordItem successfully")
-			Expect(k8sClient.Create(ctx, toCreate)).Should(Succeed())
-
-			item := &onepasswordv1.OnePasswordItem{}
-			Eventually(func() bool {
-				err := k8sClient.Get(ctx, key, item)
-				return err == nil
-			}, timeout, interval).Should(BeTrue())
-
-			By("Creating the K8s secret successfully")
-			createdSecret := &v1.Secret{}
-			Eventually(func() bool {
-				err := k8sClient.Get(ctx, key, createdSecret)
-				return err == nil
-			}, timeout, interval).Should(BeTrue())
-			Expect(createdSecret.Data).Should(Equal(item1.SecretData))
-
-			By("Updating OnePasswordItem type")
-			Eventually(func() bool {
-				err1 := k8sClient.Get(ctx, key, item)
-				if err1 != nil {
-					return false
-				}
-				item.Type = string(v1.SecretTypeOpaque)
-				err := k8sClient.Update(ctx, item)
-				return err == nil
-			}, timeout, interval).Should(BeTrue())
-
-			By("Reading K8s secret")
-			secret := &v1.Secret{}
-			Eventually(func() bool {
-				err := k8sClient.Get(ctx, key, secret)
-				return err == nil
-			}, timeout, interval).Should(BeTrue())
-			Expect(secret.Data).Should(Equal(item1.SecretData))
-		})
-
-		It("Should create custom K8s Secret type using OnePasswordItem", func() {
-			const customType = "CustomType"
-			ctx := context.Background()
-			spec := onepasswordv1.OnePasswordItemSpec{
-				ItemPath: item1.Path,
-			}
-
-			key := types.NamespacedName{
-				Name:      "item-custom-secret-type",
-				Namespace: namespace,
-			}
-
-			toCreate := &onepasswordv1.OnePasswordItem{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      key.Name,
-					Namespace: key.Namespace,
-				},
-				Spec: spec,
-				Type: customType,
-			}
-
-			By("Creating a new OnePasswordItem successfully")
-			Expect(k8sClient.Create(ctx, toCreate)).Should(Succeed())
-
-			By("Reading K8s secret")
-			secret := &v1.Secret{}
-			Eventually(func() bool {
-				err := k8sClient.Get(ctx, key, secret)
-				return err == nil
-			}, timeout, interval).Should(BeTrue())
-			Expect(secret.Type).Should(Equal(v1.SecretType(customType)))
-		})
-
-		It("Should handle 1Password Item with a file and populate secret correctly", func() {
-			ctx := context.Background()
-			spec := onepasswordv1.OnePasswordItemSpec{
-				ItemPath: item1.Path,
-			}
-
-			key := types.NamespacedName{
-				Name:      "item-with-file",
-				Namespace: namespace,
-			}
-
-			toCreate := &onepasswordv1.OnePasswordItem{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      key.Name,
-					Namespace: key.Namespace,
-				},
-				Spec: spec,
-			}
-
-			fileContent := []byte("dummy-cert-content")
-			item := item1.ToModel()
-			item.Files = []model.File{
-				{
-					ID:          "file-id-123",
-					Name:        "server.crt",
-					ContentPath: fmt.Sprintf("/v1/vaults/%s/items/%s/files/file-id-123/content", item.VaultID, item.ID),
-				},
-			}
-			item.Files[0].SetContent(fileContent)
-
-			mockGetItemByIDFunc.Return(item, nil)
-			mockGetItemByIDFunc.On("GetFileContent", item.VaultID, item.ID, "file-id-123").Return(fileContent, nil)
-
-			By("Creating a new OnePasswordItem with file successfully")
-			Expect(k8sClient.Create(ctx, toCreate)).Should(Succeed())
-
-			createdSecret := &v1.Secret{}
-			Eventually(func() bool {
-				err := k8sClient.Get(ctx, key, createdSecret)
-				return err == nil
-			}, timeout, interval).Should(BeTrue())
-
-			Expect(createdSecret.Data).Should(HaveKeyWithValue("server.crt", fileContent))
-		})
-	})
-
-	Context("Unhappy path", func() {
-		It("Should throw an error if K8s Secret type is changed", func() {
-			ctx := context.Background()
-			spec := onepasswordv1.OnePasswordItemSpec{
-				ItemPath: item1.Path,
-			}
-
-			key := types.NamespacedName{
-				Name:      "item-changed-secret-type",
-				Namespace: namespace,
-			}
-
-			toCreate := &onepasswordv1.OnePasswordItem{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      key.Name,
-					Namespace: key.Namespace,
-				},
-				Spec: spec,
-			}
-
-			By("Creating a new OnePasswordItem successfully")
-			Expect(k8sClient.Create(ctx, toCreate)).Should(Succeed())
-
-			By("Reading K8s secret")
-			secret := &v1.Secret{}
-			Eventually(func() bool {
-				err := k8sClient.Get(ctx, key, secret)
-				return err == nil
-			}, timeout, interval).Should(BeTrue())
-
-			By("Failing to update K8s secret")
-			Eventually(func() bool {
-				secret.Type = v1.SecretTypeBasicAuth
-				err := k8sClient.Update(ctx, secret)
-				return err == nil
-			}, timeout, interval).Should(BeFalse())
-		})
-
-		When("OnePasswordItem resource name contains `_`", func() {
-			It("Should fail creating a OnePasswordItem resource", func() {
-				ctx := context.Background()
-				spec := onepasswordv1.OnePasswordItemSpec{
-					ItemPath: item1.Path,
-				}
-
-				key := types.NamespacedName{
-					Name:      "invalid_name",
-					Namespace: namespace,
-				}
-
-				toCreate := &onepasswordv1.OnePasswordItem{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      key.Name,
-						Namespace: key.Namespace,
-					},
-					Spec: spec,
-				}
-
-				By("Creating a new OnePasswordItem")
-				Expect(k8sClient.Create(ctx, toCreate)).To(HaveOccurred())
-
-			})
-		})
-
-		When("OnePasswordItem resource name contains capital letters", func() {
-			It("Should fail creating a OnePasswordItem resource", func() {
-				ctx := context.Background()
-				spec := onepasswordv1.OnePasswordItemSpec{
-					ItemPath: item1.Path,
-				}
-
-				key := types.NamespacedName{
-					Name:      "invalidName",
-					Namespace: namespace,
-				}
-
-				toCreate := &onepasswordv1.OnePasswordItem{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      key.Name,
-						Namespace: key.Namespace,
-					},
-					Spec: spec,
-				}
-
-				By("Creating a new OnePasswordItem")
-				Expect(k8sClient.Create(ctx, toCreate)).To(HaveOccurred())
-			})
-		})
-	})
-})

internal/controller/suite_test.go

@@ -1,241 +0,0 @@
-/*
-MIT License
-
-Copyright (c) 2020-2024 1Password
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-package controller
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"regexp"
-	"testing"
-	"time"
-
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-	"github.com/stretchr/testify/mock"
-
-	"k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/client-go/rest"
-	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/envtest"
-	logf "sigs.k8s.io/controller-runtime/pkg/log"
-	"sigs.k8s.io/controller-runtime/pkg/log/zap"
-
-	onepasswordcomv1 "github.com/1Password/onepassword-operator/api/v1"
-	"github.com/1Password/onepassword-operator/pkg/mocks"
-	"github.com/1Password/onepassword-operator/pkg/onepassword/model"
-	// +kubebuilder:scaffold:imports
-)
-
-// These tests use Ginkgo (BDD-style Go testing framework). Refer to
-// http://onsi.github.io/ginkgo/ to learn more about Ginkgo.
-
-const (
-	username = "test-user"
-	password = "QmHumKc$mUeEem7caHtbaBaJ"
-
-	username2 = "test-user2"
-	password2 = "4zotzqDqXKasLFT2jzTs"
-
-	annotationRegExpString = "^operator.1password.io\\/[a-zA-Z\\.]+"
-)
-
-// Define utility constants for object names and testing timeouts/durations and intervals.
-const (
-	namespace = "default"
-
-	timeout  = time.Second * 10
-	duration = time.Second * 10
-	interval = time.Millisecond * 250
-)
-
-var (
-	cfg                       *rest.Config
-	k8sClient                 client.Client
-	testEnv                   *envtest.Environment
-	ctx                       context.Context
-	cancel                    context.CancelFunc
-	onePasswordItemReconciler *OnePasswordItemReconciler
-	deploymentReconciler      *DeploymentReconciler
-	mockGetItemByIDFunc       *mock.Call
-
-	item1 = &TestItem{
-		ItemID:  "nwrhuano7bcwddcviubpp4mhfq",
-		VaultID: "hfnjvi6aymbsnfc2xeeoheizda",
-		Name:    "test-item",
-		Version: 123,
-		Path:    "vaults/hfnjvi6aymbsnfc2xeeoheizda/items/nwrhuano7bcwddcviubpp4mhfq",
-		Data: map[string]string{
-			"username": username,
-			"password": password,
-		},
-		SecretData: map[string][]byte{
-			"password": []byte(password),
-			"username": []byte(username),
-		},
-	}
-
-	item2 = &TestItem{
-		ItemID:  "nwrhuano7bcwddcviubpp4mhf2",
-		VaultID: "hfnjvi6aymbsnfc2xeeoheizd2",
-		Name:    "test-item2",
-		Path:    "vaults/hfnjvi6aymbsnfc2xeeoheizd2/items/nwrhuano7bcwddcviubpp4mhf2",
-		Version: 456,
-		Data: map[string]string{
-			"username": username2,
-			"password": password2,
-		},
-		SecretData: map[string][]byte{
-			"password": []byte(password2),
-			"username": []byte(username2),
-		},
-	}
-)
-
-type TestItem struct {
-	ItemID     string
-	VaultID    string
-	Name       string
-	Version    int
-	Path       string
-	Data       map[string]string
-	SecretData map[string][]byte
-}
-
-func (ti *TestItem) ToModel() *model.Item {
-	item := &model.Item{}
-	item.Version = ti.Version
-	item.VaultID = ti.VaultID
-	item.ID = ti.ItemID
-
-	item.Fields = []model.ItemField{}
-	for k, v := range ti.Data {
-		item.Fields = append(item.Fields, model.ItemField{Label: k, Value: v})
-	}
-
-	return item
-}
-
-func TestAPIs(t *testing.T) {
-	RegisterFailHandler(Fail)
-
-	RunSpecs(t, "Controller Suite")
-}
-
-var _ = BeforeSuite(func() {
-	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
-
-	ctx, cancel = context.WithCancel(context.TODO())
-
-	By("bootstrapping test environment")
-	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "config", "crd", "bases")},
-		ErrorIfCRDPathMissing: true,
-	}
-
-	// Retrieve the first found binary directory to allow running tests from IDEs
-	if getFirstFoundEnvTestBinaryDir() != "" {
-		testEnv.BinaryAssetsDirectory = getFirstFoundEnvTestBinaryDir()
-	}
-
-	var err error
-	// cfg is defined in this file globally.
-	cfg, err = testEnv.Start()
-	Expect(err).NotTo(HaveOccurred())
-	Expect(cfg).NotTo(BeNil())
-
-	err = onepasswordcomv1.AddToScheme(scheme.Scheme)
-	Expect(err).NotTo(HaveOccurred())
-
-	// +kubebuilder:scaffold:scheme
-
-	k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
-	Expect(err).NotTo(HaveOccurred())
-	Expect(k8sClient).NotTo(BeNil())
-
-	k8sManager, err := ctrl.NewManager(cfg, ctrl.Options{
-		Scheme: scheme.Scheme,
-	})
-	Expect(err).ToNot(HaveOccurred())
-
-	mockOpClient := &mocks.TestClient{}
-	mockGetItemByIDFunc = mockOpClient.On("GetItemByID", mock.Anything, mock.Anything)
-
-	onePasswordItemReconciler = &OnePasswordItemReconciler{
-		Client:   k8sManager.GetClient(),
-		Scheme:   k8sManager.GetScheme(),
-		OpClient: mockOpClient,
-	}
-	err = (onePasswordItemReconciler).SetupWithManager(k8sManager)
-	Expect(err).ToNot(HaveOccurred())
-
-	r, _ := regexp.Compile(annotationRegExpString)
-	deploymentReconciler = &DeploymentReconciler{
-		Client:             k8sManager.GetClient(),
-		Scheme:             k8sManager.GetScheme(),
-		OpClient:           mockOpClient,
-		OpAnnotationRegExp: r,
-	}
-	err = (deploymentReconciler).SetupWithManager(k8sManager)
-	Expect(err).ToNot(HaveOccurred())
-
-	go func() {
-		defer GinkgoRecover()
-		err = k8sManager.Start(ctx)
-		Expect(err).ToNot(HaveOccurred(), "failed to run manager")
-	}()
-
-})
-
-var _ = AfterSuite(func() {
-	cancel()
-	By("tearing down the test environment")
-	err := testEnv.Stop()
-	Expect(err).NotTo(HaveOccurred())
-})
-
-// getFirstFoundEnvTestBinaryDir locates the first binary in the specified path.
-// ENVTEST-based tests depend on specific binaries, usually located in paths set by
-// controller-runtime. When running tests directly (e.g., via an IDE) without using
-// Makefile targets, the 'BinaryAssetsDirectory' must be explicitly configured.
-//
-// This function streamlines the process by finding the required binaries, similar to
-// setting the 'KUBEBUILDER_ASSETS' environment variable. To ensure the binaries are
-// properly set up, run 'make setup-envtest' beforehand.
-func getFirstFoundEnvTestBinaryDir() string {
-	basePath := filepath.Join("..", "..", "bin", "k8s")
-	entries, err := os.ReadDir(basePath)
-	if err != nil {
-		logf.Log.Error(err, "Failed to read directory", "path", basePath)
-		return ""
-	}
-	for _, entry := range entries {
-		if entry.IsDir() {
-			return filepath.Join(basePath, entry.Name())
-		}
-	}
-	return ""
-}

main.go

@@ -0,0 +1,254 @@
+/*
+Copyright 2022.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package main
+
+import (
+	"errors"
+	"flag"
+	"fmt"
+	"os"
+	"runtime"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/1Password/connect-sdk-go/connect"
+	op "github.com/1Password/onepassword-operator/pkg/onepassword"
+	"github.com/1Password/onepassword-operator/pkg/utils"
+	"github.com/1Password/onepassword-operator/version"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
+	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
+
+	//	sdkVersion "github.com/operator-framework/operator-sdk/version"
+
+	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
+	// to ensure that exec-entrypoint and run can make use of them.
+	_ "k8s.io/client-go/plugin/pkg/client/auth"
+
+	k8sruntime "k8s.io/apimachinery/pkg/runtime"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/healthz"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+
+	onepasswordv1 "github.com/1Password/onepassword-operator/api/v1"
+	"github.com/1Password/onepassword-operator/controllers"
+	//+kubebuilder:scaffold:imports
+)
+
+var (
+	scheme               = k8sruntime.NewScheme()
+	setupLog             = ctrl.Log.WithName("setup")
+	WatchNamespaceEnvVar = "WATCH_NAMESPACE"
+)
+
+func init() {
+	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
+
+	utilruntime.Must(onepasswordv1.AddToScheme(scheme))
+	//+kubebuilder:scaffold:scheme
+}
+
+func printVersion() {
+	setupLog.Info(fmt.Sprintf("Operator Version: %s", version.Version))
+	setupLog.Info(fmt.Sprintf("Go Version: %s", runtime.Version()))
+	setupLog.Info(fmt.Sprintf("Go OS/Arch: %s/%s", runtime.GOOS, runtime.GOARCH))
+	// TODO figure out how to get operator-sdk version
+	// setupLog.Info(fmt.Sprintf("Version of operator-sdk: %v", sdkVersion.Version))
+}
+
+func main() {
+	var metricsAddr string
+	var enableLeaderElection bool
+	var probeAddr string
+	flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
+	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
+	flag.BoolVar(&enableLeaderElection, "leader-elect", false,
+		"Enable leader election for controller manager. "+
+			"Enabling this will ensure there is only one active controller manager.")
+	opts := zap.Options{
+		Development: true,
+	}
+	opts.BindFlags(flag.CommandLine)
+	flag.Parse()
+
+	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
+
+	printVersion()
+
+	namespace := os.Getenv(WatchNamespaceEnvVar)
+
+	options := ctrl.Options{
+		Scheme:                 scheme,
+		Namespace:              namespace,
+		MetricsBindAddress:     metricsAddr,
+		Port:                   9443,
+		HealthProbeBindAddress: probeAddr,
+		LeaderElection:         enableLeaderElection,
+		LeaderElectionID:       "c26807fd.onepassword.com",
+	}
+
+	// Add support for MultiNamespace set in WATCH_NAMESPACE (e.g ns1,ns2)
+	// Note that this is not intended to be used for excluding namespaces, this is better done via a Predicate
+	// Also note that you may face performance issues when using this with a high number of namespaces.
+	if strings.Contains(namespace, ",") {
+		options.Namespace = ""
+		options.NewCache = cache.MultiNamespacedCacheBuilder(strings.Split(namespace, ","))
+	}
+
+	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), options)
+	if err != nil {
+		setupLog.Error(err, "unable to start manager")
+		os.Exit(1)
+	}
+
+	// Setup One Password Client
+	opConnectClient, err := connect.NewClientFromEnvironment()
+	if err != nil {
+		setupLog.Error(err, "failed to create 1Password client")
+		os.Exit(1)
+	}
+
+	if err = (&controllers.OnePasswordItemReconciler{
+		Client:          mgr.GetClient(),
+		Scheme:          mgr.GetScheme(),
+		OpConnectClient: opConnectClient,
+	}).SetupWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to create controller", "controller", "OnePasswordItem")
+		os.Exit(1)
+	}
+	//+kubebuilder:scaffold:builder
+
+	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
+		setupLog.Error(err, "unable to set up health check")
+		os.Exit(1)
+	}
+	if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {
+		setupLog.Error(err, "unable to set up ready check")
+		os.Exit(1)
+	}
+
+	setupLog.Info("starting manager")
+	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
+		setupLog.Error(err, "problem running manager")
+		os.Exit(1)
+	}
+
+	deploymentNamespace, err := utils.GetOperatorNamespace()
+	if err != nil {
+		setupLog.Error(err, "Failed to get namespace")
+		os.Exit(1)
+	}
+
+	//Setup 1PasswordConnect
+	if shouldManageConnect() {
+		setupLog.Info("Automated Connect Management Enabled")
+		go func() {
+			connectStarted := false
+			for !connectStarted {
+				err := op.SetupConnect(mgr.GetClient(), deploymentNamespace)
+				// Cache Not Started is an acceptable error. Retry until cache is started.
+				if err != nil && !errors.Is(err, &cache.ErrCacheNotStarted{}) {
+					setupLog.Error(err, "")
+					os.Exit(1)
+				}
+				if err == nil {
+					connectStarted = true
+				}
+			}
+		}()
+	} else {
+		setupLog.Info("Automated Connect Management Disabled")
+	}
+
+	// TODO: Configure Metrics Service. See: https://sdk.operatorframework.io/docs/building-operators/golang/migration/#export-metrics
+
+	// Setup update secrets task
+	updatedSecretsPoller := op.NewManager(mgr.GetClient(), opConnectClient, shouldAutoRestartDeployments())
+	done := make(chan bool)
+	ticker := time.NewTicker(getPollingIntervalForUpdatingSecrets())
+	go func() {
+		for {
+			select {
+			case <-done:
+				ticker.Stop()
+				return
+			case <-ticker.C:
+				err := updatedSecretsPoller.UpdateKubernetesSecretsTask()
+				if err != nil {
+					setupLog.Error(err, "error running update kubernetes secret task")
+				}
+			}
+		}
+	}()
+
+	// Start the Cmd
+	if err := mgr.Start(signals.SetupSignalHandler()); err != nil {
+		setupLog.Error(err, "Manager exited non-zero")
+		done <- true
+		os.Exit(1)
+	}
+
+}
+
+const manageConnect = "MANAGE_CONNECT"
+
+func shouldManageConnect() bool {
+	shouldManageConnect, found := os.LookupEnv(manageConnect)
+	if found {
+		shouldManageConnectBool, err := strconv.ParseBool(strings.ToLower(shouldManageConnect))
+		if err != nil {
+			setupLog.Error(err, "")
+			os.Exit(1)
+		}
+		return shouldManageConnectBool
+	}
+	return false
+}
+
+const envPollingIntervalVariable = "POLLING_INTERVAL"
+const defaultPollingInterval = 600
+
+func getPollingIntervalForUpdatingSecrets() time.Duration {
+	timeInSecondsString, found := os.LookupEnv(envPollingIntervalVariable)
+	if found {
+		timeInSeconds, err := strconv.Atoi(timeInSecondsString)
+		if err == nil {
+			return time.Duration(timeInSeconds) * time.Second
+		}
+		setupLog.Info("Invalid value set for polling interval. Must be a valid integer.")
+	}
+
+	setupLog.Info(fmt.Sprintf("Using default polling interval of %v seconds", defaultPollingInterval))
+	return time.Duration(defaultPollingInterval) * time.Second
+}
+
+const restartDeploymentsEnvVariable = "AUTO_RESTART"
+
+func shouldAutoRestartDeployments() bool {
+	shouldAutoRestartDeployments, found := os.LookupEnv(restartDeploymentsEnvVariable)
+	if found {
+		shouldAutoRestartDeploymentsBool, err := strconv.ParseBool(strings.ToLower(shouldAutoRestartDeployments))
+		if err != nil {
+			setupLog.Error(err, "")
+			os.Exit(1)
+		}
+		return shouldAutoRestartDeploymentsBool
+	}
+	return false
+}

pkg/kubernetessecrets/kubernetes_secrets_builder.go

@@ -2,16 +2,20 @@ package kubernetessecrets
 
 import (
 	"context"
-	"errors"
 	"fmt"
-	"reflect"
+
 	"regexp"
 	"strings"
 
-	"github.com/1Password/onepassword-operator/pkg/onepassword/model"
+	"reflect"
+
+	errs "errors"
+
+	"github.com/1Password/connect-sdk-go/onepassword"
+
 	"github.com/1Password/onepassword-operator/pkg/utils"
 	corev1 "k8s.io/api/core/v1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	kubeValidate "k8s.io/apimachinery/pkg/util/validation"
@@ -23,93 +27,67 @@ import (
 const OnepasswordPrefix = "operator.1password.io"
 const NameAnnotation = OnepasswordPrefix + "/item-name"
 const VersionAnnotation = OnepasswordPrefix + "/item-version"
+const restartAnnotation = OnepasswordPrefix + "/last-restarted"
 const ItemPathAnnotation = OnepasswordPrefix + "/item-path"
 const RestartDeploymentsAnnotation = OnepasswordPrefix + "/auto-restart"
 
-var ErrCannotUpdateSecretType = errors.New("cannot change secret type: secret type is immutable")
+var ErrCannotUpdateSecretType = errs.New("Cannot change secret type. Secret type is immutable")
 
 var log = logf.Log
 
-func CreateKubernetesSecretFromItem(
-	ctx context.Context,
-	kubeClient kubernetesClient.Client,
-	secretName, namespace string,
-	item *model.Item,
-	autoRestart string,
-	labels map[string]string,
-	secretType string,
-	ownerRef *metav1.OwnerReference,
-) error {
+func CreateKubernetesSecretFromItem(kubeClient kubernetesClient.Client, secretName, namespace string, item *onepassword.Item, autoRestart string, labels map[string]string, secretType string, secretAnnotations map[string]string, ownerRef *metav1.OwnerReference) error {
+
 	itemVersion := fmt.Sprint(item.Version)
-	secretAnnotations := map[string]string{
-		VersionAnnotation:  itemVersion,
-		ItemPathAnnotation: fmt.Sprintf("vaults/%v/items/%v", item.VaultID, item.ID),
+
+	// If secretAnnotations is nil we create an empty map so we can later assign values for the OP Annotations in the map
+	if secretAnnotations == nil {
+		secretAnnotations = map[string]string{}
 	}
 
+	secretAnnotations[VersionAnnotation] = itemVersion
+	secretAnnotations[ItemPathAnnotation] = fmt.Sprintf("vaults/%v/items/%v", item.Vault.ID, item.ID)
+
 	if autoRestart != "" {
 		_, err := utils.StringToBool(autoRestart)
 		if err != nil {
-			return fmt.Errorf("error parsing %v annotation on Secret %v. Must be true or false. Defaulting to false",
-				RestartDeploymentsAnnotation, secretName,
-			)
+			log.Error(err, "Error parsing %v annotation on Secret %v. Must be true or false. Defaulting to false.", RestartDeploymentsAnnotation, secretName)
+			return err
 		}
 		secretAnnotations[RestartDeploymentsAnnotation] = autoRestart
 	}
 
 	// "Opaque" and "" secret types are treated the same by Kubernetes.
-	secret := BuildKubernetesSecretFromOnePasswordItem(secretName, namespace, secretAnnotations, labels,
-		secretType, *item, ownerRef)
+	secret := BuildKubernetesSecretFromOnePasswordItem(secretName, namespace, secretAnnotations, labels, secretType, *item, ownerRef)
 
 	currentSecret := &corev1.Secret{}
-	err := kubeClient.Get(ctx, types.NamespacedName{Name: secret.Name, Namespace: secret.Namespace}, currentSecret)
-	if err != nil && apierrors.IsNotFound(err) {
+	err := kubeClient.Get(context.Background(), types.NamespacedName{Name: secret.Name, Namespace: secret.Namespace}, currentSecret)
+	if err != nil && errors.IsNotFound(err) {
 		log.Info(fmt.Sprintf("Creating Secret %v at namespace '%v'", secret.Name, secret.Namespace))
-		return kubeClient.Create(ctx, secret)
+		return kubeClient.Create(context.Background(), secret)
 	} else if err != nil {
 		return err
 	}
 
-	// Check if the secret types are being changed on the update.
-	// Avoid Opaque and "" are treated as different on check.
-	wantSecretType := secretType
-	if wantSecretType == "" {
-		wantSecretType = string(corev1.SecretTypeOpaque)
-	}
+	currentAnnotations := currentSecret.Annotations
+	currentLabels := currentSecret.Labels
 	currentSecretType := string(currentSecret.Type)
-	if currentSecretType == "" {
-		currentSecretType = string(corev1.SecretTypeOpaque)
-	}
-	if currentSecretType != wantSecretType {
+	if !reflect.DeepEqual(currentSecretType, secretType) {
 		return ErrCannotUpdateSecretType
 	}
 
-	currentAnnotations := currentSecret.Annotations
-	currentLabels := currentSecret.Labels
 	if !reflect.DeepEqual(currentAnnotations, secretAnnotations) || !reflect.DeepEqual(currentLabels, labels) {
 		log.Info(fmt.Sprintf("Updating Secret %v at namespace '%v'", secret.Name, secret.Namespace))
-		currentSecret.Annotations = secretAnnotations
-		currentSecret.Labels = labels
+		currentSecret.ObjectMeta.Annotations = secretAnnotations
+		currentSecret.ObjectMeta.Labels = labels
 		currentSecret.Data = secret.Data
-		if err := kubeClient.Update(ctx, currentSecret); err != nil {
-			return fmt.Errorf("kubernetes secret update failed: %w", err)
-		}
-		return nil
+		return kubeClient.Update(context.Background(), currentSecret)
 	}
 
-	log.Info(fmt.Sprintf("Secret with name %v and version %v already exists",
-		secret.Name, secret.Annotations[VersionAnnotation],
-	))
+	log.Info(fmt.Sprintf("Secret with name %v and version %v already exists", secret.Name, secret.Annotations[VersionAnnotation]))
 	return nil
 }
 
-func BuildKubernetesSecretFromOnePasswordItem(
-	name, namespace string,
-	annotations map[string]string,
-	labels map[string]string,
-	secretType string,
-	item model.Item,
-	ownerRef *metav1.OwnerReference,
-) *corev1.Secret {
+func BuildKubernetesSecretFromOnePasswordItem(name, namespace string, annotations map[string]string, labels map[string]string, secretType string, item onepassword.Item, ownerRef *metav1.OwnerReference) *corev1.Secret {
 	var ownerRefs []metav1.OwnerReference
 	if ownerRef != nil {
 		ownerRefs = []metav1.OwnerReference{*ownerRef}
@@ -128,7 +106,7 @@ func BuildKubernetesSecretFromOnePasswordItem(
 	}
 }
 
-func BuildKubernetesSecretData(fields []model.ItemField, files []model.File) map[string][]byte {
+func BuildKubernetesSecretData(fields []*onepassword.ItemField, files []*onepassword.File) map[string][]byte {
 	secretData := map[string][]byte{}
 	for i := 0; i < len(fields); i++ {
 		if fields[i].Value != "" {
@@ -141,7 +119,7 @@ func BuildKubernetesSecretData(fields []model.ItemField, files []model.File) map
 	for _, file := range files {
 		content, err := file.Content()
 		if err != nil {
-			log.Error(err, fmt.Sprintf("Could not load contents of file %s", file.Name))
+			log.Error(err, "Could not load contents of file %s", file.Name)
 			continue
 		}
 		if content != nil {

pkg/kubernetessecrets/kubernetes_secrets_builder_test.go

@@ -6,65 +6,71 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/1Password/connect-sdk-go/onepassword"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	kubeValidate "k8s.io/apimachinery/pkg/util/validation"
+	"k8s.io/client-go/kubernetes"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
-
-	"github.com/1Password/onepassword-operator/pkg/onepassword/model"
 )
 
-const (
-	restartDeploymentAnnotation = "false"
-	testNamespace               = "test"
-	testItemUUID                = "h46bb3jddvay7nxopfhvlwg35q"
-	testVaultUUID               = "hfnjvi6aymbsnfc2xeeoheizda"
-)
+const restartDeploymentAnnotation = "false"
+
+type k8s struct {
+	clientset kubernetes.Interface
+}
 
 func TestCreateKubernetesSecretFromOnePasswordItem(t *testing.T) {
-	ctx := context.Background()
 	secretName := "test-secret-name"
-	namespace := testNamespace
+	namespace := "test"
 
-	item := model.Item{}
+	item := onepassword.Item{}
 	item.Fields = generateFields(5)
 	item.Version = 123
-	item.VaultID = testVaultUUID
-	item.ID = testItemUUID
+	item.Vault.ID = "hfnjvi6aymbsnfc2xeeoheizda"
+	item.ID = "h46bb3jddvay7nxopfhvlwg35q"
 
-	kubeClient := fake.NewClientBuilder().Build()
+	kubeClient := fake.NewFakeClient()
 	secretLabels := map[string]string{}
+	secretAnnotations := map[string]string{
+		"testAnnotation": "exists",
+	}
 	secretType := ""
 
-	err := CreateKubernetesSecretFromItem(ctx, kubeClient, secretName, namespace, &item, restartDeploymentAnnotation,
-		secretLabels, secretType, nil)
+	err := CreateKubernetesSecretFromItem(kubeClient, secretName, namespace, &item, restartDeploymentAnnotation, secretLabels, secretType, secretAnnotations, nil)
 	if err != nil {
 		t.Errorf("Unexpected error: %v", err)
 	}
 	createdSecret := &corev1.Secret{}
-	err = kubeClient.Get(ctx, types.NamespacedName{Name: secretName, Namespace: namespace}, createdSecret)
+	err = kubeClient.Get(context.Background(), types.NamespacedName{Name: secretName, Namespace: namespace}, createdSecret)
 
 	if err != nil {
 		t.Errorf("Secret was not created: %v", err)
 	}
 	compareFields(item.Fields, createdSecret.Data, t)
 	compareAnnotationsToItem(createdSecret.Annotations, item, t)
+
+	if createdSecret.Annotations["testAnnotation"] != "exists" {
+		t.Errorf("Expected testAnnotation to be merged with existing annotations, but wasn't.")
+	}
 }
 
 func TestKubernetesSecretFromOnePasswordItemOwnerReferences(t *testing.T) {
-	ctx := context.Background()
 	secretName := "test-secret-name"
-	namespace := testNamespace
+	namespace := "test"
 
-	item := model.Item{}
+	item := onepassword.Item{}
 	item.Fields = generateFields(5)
 	item.Version = 123
-	item.VaultID = testVaultUUID
-	item.ID = testItemUUID
+	item.Vault.ID = "hfnjvi6aymbsnfc2xeeoheizda"
+	item.ID = "h46bb3jddvay7nxopfhvlwg35q"
 
-	kubeClient := fake.NewClientBuilder().Build()
+	kubeClient := fake.NewFakeClient()
 	secretLabels := map[string]string{}
+	secretAnnotations := map[string]string{
+		"testAnnotation": "exists",
+	}
 	secretType := ""
 
 	ownerRef := &metav1.OwnerReference{
@@ -73,19 +79,15 @@ func TestKubernetesSecretFromOnePasswordItemOwnerReferences(t *testing.T) {
 		Name:       "test-deployment",
 		UID:        types.UID("test-uid"),
 	}
-	err := CreateKubernetesSecretFromItem(ctx, kubeClient, secretName, namespace, &item, restartDeploymentAnnotation,
-		secretLabels, secretType, ownerRef)
+	err := CreateKubernetesSecretFromItem(kubeClient, secretName, namespace, &item, restartDeploymentAnnotation, secretLabels, secretType, secretAnnotations, ownerRef)
 	if err != nil {
 		t.Errorf("Unexpected error: %v", err)
 	}
 	createdSecret := &corev1.Secret{}
-	err = kubeClient.Get(ctx, types.NamespacedName{Name: secretName, Namespace: namespace}, createdSecret)
-	if err != nil {
-		t.Errorf("Unexpected error: %v", err)
-	}
+	err = kubeClient.Get(context.Background(), types.NamespacedName{Name: secretName, Namespace: namespace}, createdSecret)
 
 	// Check owner references.
-	gotOwnerRefs := createdSecret.OwnerReferences
+	gotOwnerRefs := createdSecret.ObjectMeta.OwnerReferences
 	if len(gotOwnerRefs) != 1 {
 		t.Errorf("Expected owner references length: 1 but got: %d", len(gotOwnerRefs))
 	}
@@ -103,40 +105,38 @@ func TestKubernetesSecretFromOnePasswordItemOwnerReferences(t *testing.T) {
 }
 
 func TestUpdateKubernetesSecretFromOnePasswordItem(t *testing.T) {
-	ctx := context.Background()
 	secretName := "test-secret-update"
-	namespace := testNamespace
+	namespace := "test"
 
-	item := model.Item{}
+	item := onepassword.Item{}
 	item.Fields = generateFields(5)
 	item.Version = 123
-	item.VaultID = testVaultUUID
-	item.ID = testItemUUID
+	item.Vault.ID = "hfnjvi6aymbsnfc2xeeoheizda"
+	item.ID = "h46bb3jddvay7nxopfhvlwg35q"
 
-	kubeClient := fake.NewClientBuilder().Build()
+	kubeClient := fake.NewFakeClient()
 	secretLabels := map[string]string{}
+	secretAnnotations := map[string]string{}
 	secretType := ""
 
-	err := CreateKubernetesSecretFromItem(ctx, kubeClient, secretName, namespace, &item, restartDeploymentAnnotation,
-		secretLabels, secretType, nil)
+	err := CreateKubernetesSecretFromItem(kubeClient, secretName, namespace, &item, restartDeploymentAnnotation, secretLabels, secretType, secretAnnotations, nil)
 
 	if err != nil {
 		t.Errorf("Unexpected error: %v", err)
 	}
 
 	// Updating kubernetes secret with new item
-	newItem := model.Item{}
+	newItem := onepassword.Item{}
 	newItem.Fields = generateFields(6)
 	newItem.Version = 456
-	newItem.VaultID = testVaultUUID
-	newItem.ID = testItemUUID
-	err = CreateKubernetesSecretFromItem(ctx, kubeClient, secretName, namespace, &newItem, restartDeploymentAnnotation,
-		secretLabels, secretType, nil)
+	newItem.Vault.ID = "hfnjvi6aymbsnfc2xeeoheizda"
+	newItem.ID = "h46bb3jddvay7nxopfhvlwg35q"
+	err = CreateKubernetesSecretFromItem(kubeClient, secretName, namespace, &newItem, restartDeploymentAnnotation, secretLabels, secretType, secretAnnotations, nil)
 	if err != nil {
 		t.Errorf("Unexpected error: %v", err)
 	}
 	updatedSecret := &corev1.Secret{}
-	err = kubeClient.Get(ctx, types.NamespacedName{Name: secretName, Namespace: namespace}, updatedSecret)
+	err = kubeClient.Get(context.Background(), types.NamespacedName{Name: secretName, Namespace: namespace}, updatedSecret)
 
 	if err != nil {
 		t.Errorf("Secret was not found: %v", err)
@@ -162,7 +162,7 @@ func TestBuildKubernetesSecretFromOnePasswordItem(t *testing.T) {
 	annotations := map[string]string{
 		annotationKey: annotationValue,
 	}
-	item := model.Item{}
+	item := onepassword.Item{}
 	item.Fields = generateFields(5)
 	labels := map[string]string{}
 	secretType := ""
@@ -188,10 +188,10 @@ func TestBuildKubernetesSecretFixesInvalidLabels(t *testing.T) {
 		"annotationKey": "annotationValue",
 	}
 	labels := map[string]string{}
-	item := model.Item{}
+	item := onepassword.Item{}
 	secretType := ""
 
-	item.Fields = []model.ItemField{
+	item.Fields = []*onepassword.ItemField{
 		{
 			Label: "label w%th invalid ch!rs-",
 			Value: "value1",
@@ -221,27 +221,28 @@ func TestBuildKubernetesSecretFixesInvalidLabels(t *testing.T) {
 }
 
 func TestCreateKubernetesTLSSecretFromOnePasswordItem(t *testing.T) {
-	ctx := context.Background()
 	secretName := "tls-test-secret-name"
-	namespace := testNamespace
+	namespace := "test"
 
-	item := model.Item{}
+	item := onepassword.Item{}
 	item.Fields = generateFields(5)
 	item.Version = 123
-	item.VaultID = testVaultUUID
-	item.ID = testItemUUID
+	item.Vault.ID = "hfnjvi6aymbsnfc2xeeoheizda"
+	item.ID = "h46bb3jddvay7nxopfhvlwg35q"
 
-	kubeClient := fake.NewClientBuilder().Build()
+	kubeClient := fake.NewFakeClient()
 	secretLabels := map[string]string{}
+	secretAnnotations := map[string]string{
+		"testAnnotation": "exists",
+	}
 	secretType := "kubernetes.io/tls"
 
-	err := CreateKubernetesSecretFromItem(ctx, kubeClient, secretName, namespace, &item, restartDeploymentAnnotation,
-		secretLabels, secretType, nil)
+	err := CreateKubernetesSecretFromItem(kubeClient, secretName, namespace, &item, restartDeploymentAnnotation, secretLabels, secretType, secretAnnotations, nil)
 	if err != nil {
 		t.Errorf("Unexpected error: %v", err)
 	}
 	createdSecret := &corev1.Secret{}
-	err = kubeClient.Get(ctx, types.NamespacedName{Name: secretName, Namespace: namespace}, createdSecret)
+	err = kubeClient.Get(context.Background(), types.NamespacedName{Name: secretName, Namespace: namespace}, createdSecret)
 
 	if err != nil {
 		t.Errorf("Secret was not created: %v", err)
@@ -252,13 +253,13 @@ func TestCreateKubernetesTLSSecretFromOnePasswordItem(t *testing.T) {
 	}
 }
 
-func compareAnnotationsToItem(annotations map[string]string, item model.Item, t *testing.T) {
+func compareAnnotationsToItem(annotations map[string]string, item onepassword.Item, t *testing.T) {
 	actualVaultId, actualItemId, err := ParseVaultIdAndItemIdFromPath(annotations[ItemPathAnnotation])
 	if err != nil {
 		t.Errorf("Was unable to parse Item Path")
 	}
-	if actualVaultId != item.VaultID {
-		t.Errorf("Expected annotation vault id to be %v but was %v", item.VaultID, actualVaultId)
+	if actualVaultId != item.Vault.ID {
+		t.Errorf("Expected annotation vault id to be %v but was %v", item.Vault.ID, actualVaultId)
 	}
 	if actualItemId != item.ID {
 		t.Errorf("Expected annotation item id to be %v but was %v", item.ID, actualItemId)
@@ -268,13 +269,11 @@ func compareAnnotationsToItem(annotations map[string]string, item model.Item, t
 	}
 
 	if annotations[RestartDeploymentsAnnotation] != "false" {
-		t.Errorf("Expected restart deployments annotation to be %v but was %v",
-			restartDeploymentAnnotation, RestartDeploymentsAnnotation,
-		)
+		t.Errorf("Expected restart deployments annotation to be %v but was %v", restartDeploymentAnnotation, RestartDeploymentsAnnotation)
 	}
 }
 
-func compareFields(actualFields []model.ItemField, secretData map[string][]byte, t *testing.T) {
+func compareFields(actualFields []*onepassword.ItemField, secretData map[string][]byte, t *testing.T) {
 	for i := 0; i < len(actualFields); i++ {
 		value, found := secretData[actualFields[i].Label]
 		if !found {
@@ -286,13 +285,14 @@ func compareFields(actualFields []model.ItemField, secretData map[string][]byte,
 	}
 }
 
-func generateFields(numToGenerate int) []model.ItemField {
-	fields := []model.ItemField{}
+func generateFields(numToGenerate int) []*onepassword.ItemField {
+	fields := []*onepassword.ItemField{}
 	for i := 0; i < numToGenerate; i++ {
-		fields = append(fields, model.ItemField{
+		field := onepassword.ItemField{
 			Label: "key" + fmt.Sprint(i),
 			Value: "value" + fmt.Sprint(i),
-		})
+		}
+		fields = append(fields, &field)
 	}
 	return fields
 }
@@ -302,10 +302,7 @@ func ParseVaultIdAndItemIdFromPath(path string) (string, string, error) {
 	if len(splitPath) == 4 && splitPath[0] == "vaults" && splitPath[2] == "items" {
 		return splitPath[1], splitPath[3], nil
 	}
-	return "", "", fmt.Errorf(
-		"%q is not an acceptable path for One Password item. Must be of the format: `vaults/{vault_id}/items/{item_id}`",
-		path,
-	)
+	return "", "", fmt.Errorf("%q is not an acceptable path for One Password item. Must be of the format: `vaults/{vault_id}/items/{item_id}`", path)
 }
 
 func validLabel(v string) bool {

pkg/logs/log_levels.go

@@ -1,11 +0,0 @@
-package logs
-
-// A Level is a logging priority. Lower levels are more important.
-// All levels have been multiplied by -1 to ensure compatibility
-// between zapcore and logr
-const (
-	ErrorLevel = -2
-	WarnLevel  = -1
-	InfoLevel  = 0
-	DebugLevel = 1
-)

pkg/mocks/mocksecretserver.go

@@ -1,39 +1,84 @@
 package mocks
 
 import (
-	"context"
-
-	"github.com/stretchr/testify/mock"
-
-	"github.com/1Password/onepassword-operator/pkg/onepassword/model"
+	"github.com/1Password/connect-sdk-go/onepassword"
 )
 
 type TestClient struct {
-	mock.Mock
+	GetVaultsFunc        func() ([]onepassword.Vault, error)
+	GetVaultsByTitleFunc func(title string) ([]onepassword.Vault, error)
+	GetVaultFunc         func(uuid string) (*onepassword.Vault, error)
+	GetItemFunc          func(uuid string, vaultUUID string) (*onepassword.Item, error)
+	GetItemsFunc         func(vaultUUID string) ([]onepassword.Item, error)
+	GetItemsByTitleFunc  func(title string, vaultUUID string) ([]onepassword.Item, error)
+	GetItemByTitleFunc   func(title string, vaultUUID string) (*onepassword.Item, error)
+	CreateItemFunc       func(item *onepassword.Item, vaultUUID string) (*onepassword.Item, error)
+	UpdateItemFunc       func(item *onepassword.Item, vaultUUID string) (*onepassword.Item, error)
+	DeleteItemFunc       func(item *onepassword.Item, vaultUUID string) error
+	GetFileFunc          func(uuid string, itemUUID string, vaultUUID string) (*onepassword.File, error)
+	GetFileContentFunc   func(file *onepassword.File) ([]byte, error)
 }
 
-func (tc *TestClient) GetItemByID(ctx context.Context, vaultID, itemID string) (*model.Item, error) {
-	args := tc.Called(vaultID, itemID)
-	if args.Get(0) == nil {
-		return nil, args.Error(1)
-	}
-	return args.Get(0).(*model.Item), args.Error(1)
+var (
+	GetGetVaultsFunc       func() ([]onepassword.Vault, error)
+	DoGetVaultsByTitleFunc func(title string) ([]onepassword.Vault, error)
+	DoGetVaultFunc         func(uuid string) (*onepassword.Vault, error)
+	GetGetItemFunc         func(uuid string, vaultUUID string) (*onepassword.Item, error)
+	DoGetItemsByTitleFunc  func(title string, vaultUUID string) ([]onepassword.Item, error)
+	DoGetItemByTitleFunc   func(title string, vaultUUID string) (*onepassword.Item, error)
+	DoCreateItemFunc       func(item *onepassword.Item, vaultUUID string) (*onepassword.Item, error)
+	DoDeleteItemFunc       func(item *onepassword.Item, vaultUUID string) error
+	DoGetItemsFunc         func(vaultUUID string) ([]onepassword.Item, error)
+	DoUpdateItemFunc       func(item *onepassword.Item, vaultUUID string) (*onepassword.Item, error)
+	DoGetFileFunc          func(uuid string, itemUUID string, vaultUUID string) (*onepassword.File, error)
+	DoGetFileContentFunc   func(file *onepassword.File) ([]byte, error)
+)
+
+// Do is the mock client's `Do` func
+func (m *TestClient) GetVaults() ([]onepassword.Vault, error) {
+	return GetGetVaultsFunc()
 }
 
-func (tc *TestClient) GetItemsByTitle(ctx context.Context, vaultID, itemTitle string) ([]model.Item, error) {
-	args := tc.Called(vaultID, itemTitle)
-	return args.Get(0).([]model.Item), args.Error(1)
+func (m *TestClient) GetVaultsByTitle(title string) ([]onepassword.Vault, error) {
+	return DoGetVaultsByTitleFunc(title)
 }
 
-func (tc *TestClient) GetFileContent(ctx context.Context, vaultID, itemID, fileID string) ([]byte, error) {
-	args := tc.Called(vaultID, itemID, fileID)
-	if args.Get(0) == nil {
-		return nil, args.Error(1)
-	}
-	return args.Get(0).([]byte), args.Error(1)
+func (m *TestClient) GetVault(uuid string) (*onepassword.Vault, error) {
+	return DoGetVaultFunc(uuid)
 }
 
-func (tc *TestClient) GetVaultsByTitle(ctx context.Context, title string) ([]model.Vault, error) {
-	args := tc.Called(title)
-	return args.Get(0).([]model.Vault), args.Error(1)
+func (m *TestClient) GetItem(uuid string, vaultUUID string) (*onepassword.Item, error) {
+	return GetGetItemFunc(uuid, vaultUUID)
+}
+
+func (m *TestClient) GetItems(vaultUUID string) ([]onepassword.Item, error) {
+	return DoGetItemsFunc(vaultUUID)
+}
+
+func (m *TestClient) GetItemsByTitle(title, vaultUUID string) ([]onepassword.Item, error) {
+	return DoGetItemsByTitleFunc(title, vaultUUID)
+}
+
+func (m *TestClient) GetItemByTitle(title string, vaultUUID string) (*onepassword.Item, error) {
+	return DoGetItemByTitleFunc(title, vaultUUID)
+}
+
+func (m *TestClient) CreateItem(item *onepassword.Item, vaultUUID string) (*onepassword.Item, error) {
+	return DoCreateItemFunc(item, vaultUUID)
+}
+
+func (m *TestClient) DeleteItem(item *onepassword.Item, vaultUUID string) error {
+	return DoDeleteItemFunc(item, vaultUUID)
+}
+
+func (m *TestClient) UpdateItem(item *onepassword.Item, vaultUUID string) (*onepassword.Item, error) {
+	return DoUpdateItemFunc(item, vaultUUID)
+}
+
+func (m *TestClient) GetFile(uuid string, itemUUID string, vaultUUID string) (*onepassword.File, error) {
+	return DoGetFileFunc(uuid, itemUUID, vaultUUID)
+}
+
+func (m *TestClient) GetFileContent(file *onepassword.File) ([]byte, error) {
+	return DoGetFileContentFunc(file)
 }

pkg/onepassword/annotations.go

@@ -45,14 +45,13 @@ func FilterAnnotations(annotations map[string]string, regex *regexp.Regexp) map[
 
 func AreAnnotationsUsingSecrets(annotations map[string]string, secrets map[string]*corev1.Secret) bool {
 	_, ok := secrets[annotations[NameAnnotation]]
-	return ok
+	if ok {
+		return true
+	}
+	return false
 }
 
-func AppendAnnotationUpdatedSecret(
-	annotations map[string]string,
-	secrets map[string]*corev1.Secret,
-	updatedDeploymentSecrets map[string]*corev1.Secret,
-) map[string]*corev1.Secret {
+func AppendAnnotationUpdatedSecret(annotations map[string]string, secrets map[string]*corev1.Secret, updatedDeploymentSecrets map[string]*corev1.Secret) map[string]*corev1.Secret {
 	secret, ok := secrets[annotations[NameAnnotation]]
 	if ok {
 		updatedDeploymentSecrets[secret.Name] = secret

pkg/onepassword/annotations_test.go

@@ -80,7 +80,7 @@ func TestGetNoAnnotationsForDeployment(t *testing.T) {
 	}
 
 	numAnnotations := len(filteredAnnotations)
-	if numAnnotations != 0 {
+	if 0 != numAnnotations {
 		t.Errorf("Expected %v annotations got %v", 0, numAnnotations)
 	}
 }

pkg/onepassword/client/client.go

@@ -1,56 +0,0 @@
-package client
-
-import (
-	"context"
-	"errors"
-	"os"
-
-	"github.com/go-logr/logr"
-
-	"github.com/1Password/onepassword-operator/pkg/onepassword/client/connect"
-	"github.com/1Password/onepassword-operator/pkg/onepassword/client/sdk"
-	"github.com/1Password/onepassword-operator/pkg/onepassword/model"
-)
-
-// Client is an interface for interacting with 1Password items and vaults.
-type Client interface {
-	GetItemByID(ctx context.Context, vaultID, itemID string) (*model.Item, error)
-	GetItemsByTitle(ctx context.Context, vaultID, itemTitle string) ([]model.Item, error)
-	GetFileContent(ctx context.Context, vaultID, itemID, fileID string) ([]byte, error)
-	GetVaultsByTitle(ctx context.Context, title string) ([]model.Vault, error)
-}
-
-type Config struct {
-	Logger  logr.Logger
-	Version string
-}
-
-// NewFromEnvironment creates a new 1Password client based on the provided configuration.
-func NewFromEnvironment(ctx context.Context, cfg Config) (Client, error) {
-	connectHost, _ := os.LookupEnv("OP_CONNECT_HOST")
-	connectToken, _ := os.LookupEnv("OP_CONNECT_TOKEN")
-	serviceAccountToken, _ := os.LookupEnv("OP_SERVICE_ACCOUNT_TOKEN")
-
-	if connectHost != "" && connectToken != "" && serviceAccountToken != "" {
-		return nil, errors.New("invalid configuration. Either Connect or Service Account credentials should be set, not both")
-	}
-
-	if serviceAccountToken != "" {
-		cfg.Logger.Info("Using Service Account Token")
-		return sdk.NewClient(ctx, sdk.Config{
-			ServiceAccountToken: serviceAccountToken,
-			IntegrationName:     "1password-operator",
-			IntegrationVersion:  cfg.Version,
-		})
-	}
-
-	if connectHost != "" && connectToken != "" {
-		cfg.Logger.Info("Using 1Password Connect")
-		return connect.NewClient(connect.Config{
-			ConnectHost:  connectHost,
-			ConnectToken: connectToken,
-		}), nil
-	}
-
-	return nil, errors.New("invalid configuration. Connect or Service Account credentials should be set")
-}

pkg/onepassword/client/connect/connect.go

@@ -1,104 +0,0 @@
-package connect
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"time"
-
-	"github.com/1Password/connect-sdk-go/connect"
-	"github.com/1Password/connect-sdk-go/onepassword"
-	"github.com/1Password/onepassword-operator/pkg/onepassword/model"
-)
-
-// Config holds the configuration for the Connect client.
-type Config struct {
-	ConnectHost  string
-	ConnectToken string
-}
-
-// Connect is a client for interacting with 1Password using the Connect API.
-type Connect struct {
-	client connect.Client
-}
-
-// NewClient creates a new Connect client using provided configuration.
-func NewClient(config Config) *Connect {
-	return &Connect{
-		client: connect.NewClient(config.ConnectHost, config.ConnectToken),
-	}
-}
-
-func (c *Connect) GetItemByID(ctx context.Context, vaultID, itemID string) (*model.Item, error) {
-	connectItem, err := c.client.GetItemByUUID(itemID, vaultID)
-	if err != nil {
-		return nil, fmt.Errorf("failed to GetItemByID using 1Password Connect: %w", err)
-	}
-
-	var item model.Item
-	item.FromConnectItem(connectItem)
-	return &item, nil
-}
-
-func (c *Connect) GetItemsByTitle(ctx context.Context, vaultID, itemTitle string) ([]model.Item, error) {
-	// Get all items in the vault with the specified title
-	connectItems, err := c.client.GetItemsByTitle(itemTitle, vaultID)
-	if err != nil {
-		return nil, fmt.Errorf("failed to GetItemsByTitle using 1Password Connect: %w", err)
-	}
-
-	items := make([]model.Item, len(connectItems))
-	for i, connectItem := range connectItems {
-		var item model.Item
-		item.FromConnectItem(&connectItem)
-		items[i] = item
-	}
-
-	return items, nil
-}
-
-// GetFileContent retrieves the content of a file from a 1Password item.
-// As the Connect has a delay when synchronizing files and returns a 500 error in this case,
-// this function implements a retry mechanism.
-func (c *Connect) GetFileContent(ctx context.Context, vaultID, itemID, fileID string) ([]byte, error) {
-	const maxRetries = 5
-	const delay = 1 * time.Second
-
-	var lastErr error
-	for i := 0; i < maxRetries; i++ {
-		bytes, err := c.client.GetFileContent(&onepassword.File{
-			ContentPath: fmt.Sprintf("/v1/vaults/%s/items/%s/files/%s/content", vaultID, itemID, fileID),
-		})
-		if err == nil {
-			return bytes, nil
-		}
-
-		var connectErr *onepassword.Error
-		if errors.As(err, &connectErr) && connectErr.StatusCode == 500 {
-			lastErr = err
-			time.Sleep(delay)
-			continue
-		}
-
-		return nil, fmt.Errorf("failed to GetFileContent using 1Password Connect: %w", err)
-	}
-
-	return nil, fmt.Errorf("failed to GetFileContent using 1Password Connect after %d retries: %w", maxRetries, lastErr)
-}
-
-func (c *Connect) GetVaultsByTitle(ctx context.Context, vaultQuery string) ([]model.Vault, error) {
-	connectVaults, err := c.client.GetVaultsByTitle(vaultQuery)
-	if err != nil {
-		return nil, fmt.Errorf("failed to GetVaultsByTitle using 1Password Connect: %w", err)
-	}
-
-	var vaults []model.Vault
-	for _, connectVault := range connectVaults {
-		if vaultQuery == connectVault.Name {
-			var vault model.Vault
-			vault.FromConnectVault(&connectVault)
-			vaults = append(vaults, vault)
-		}
-	}
-	return vaults, nil
-}

pkg/onepassword/client/connect/connect_test.go

@@ -1,241 +0,0 @@
-package connect
-
-import (
-	"context"
-	"errors"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/1Password/connect-sdk-go/onepassword"
-	clienttesting "github.com/1Password/onepassword-operator/pkg/onepassword/client/testing"
-	"github.com/1Password/onepassword-operator/pkg/onepassword/client/testing/mock"
-	"github.com/1Password/onepassword-operator/pkg/onepassword/model"
-)
-
-const VaultTitleEmployee = "Employee"
-
-func TestConnect_GetItemByID(t *testing.T) {
-	connectItem := clienttesting.CreateConnectItem()
-
-	testCases := map[string]struct {
-		mockClient func() *mock.ConnectClientMock
-		check      func(t *testing.T, item *model.Item, err error)
-	}{
-		"should return an item": {
-			mockClient: func() *mock.ConnectClientMock {
-				mockConnectClient := &mock.ConnectClientMock{}
-				mockConnectClient.On("GetItemByUUID", "item-id", "vault-id").Return(connectItem, nil)
-				return mockConnectClient
-			},
-			check: func(t *testing.T, item *model.Item, err error) {
-				require.NoError(t, err)
-				clienttesting.CheckConnectItemMapping(t, connectItem, item)
-			},
-		},
-		"should return an error": {
-			mockClient: func() *mock.ConnectClientMock {
-				mockConnectClient := &mock.ConnectClientMock{}
-				mockConnectClient.On("GetItemByUUID", "item-id", "vault-id").Return((*onepassword.Item)(nil), errors.New("error"))
-				return mockConnectClient
-			},
-			check: func(t *testing.T, item *model.Item, err error) {
-				require.Error(t, err)
-				require.Nil(t, item)
-			},
-		},
-	}
-
-	for description, tc := range testCases {
-		t.Run(description, func(t *testing.T) {
-			client := &Connect{client: tc.mockClient()}
-			item, err := client.GetItemByID(context.Background(), "vault-id", "item-id")
-			tc.check(t, item, err)
-		})
-	}
-}
-
-func TestConnect_GetItemsByTitle(t *testing.T) {
-	connectItem1 := clienttesting.CreateConnectItem()
-	connectItem2 := clienttesting.CreateConnectItem()
-
-	testCases := map[string]struct {
-		mockClient func() *mock.ConnectClientMock
-		check      func(t *testing.T, items []model.Item, err error)
-	}{
-		"should return a single item": {
-			mockClient: func() *mock.ConnectClientMock {
-				mockConnectClient := &mock.ConnectClientMock{}
-				mockConnectClient.On("GetItemsByTitle", "item-title", "vault-id").Return(
-					[]onepassword.Item{
-						*connectItem1,
-					}, nil)
-				return mockConnectClient
-			},
-			check: func(t *testing.T, items []model.Item, err error) {
-				require.NoError(t, err)
-				require.Len(t, items, 1)
-				require.Equal(t, connectItem1.ID, items[0].ID)
-			},
-		},
-		"should return two items": {
-			mockClient: func() *mock.ConnectClientMock {
-				mockConnectClient := &mock.ConnectClientMock{}
-				mockConnectClient.On("GetItemsByTitle", "item-title", "vault-id").Return(
-					[]onepassword.Item{
-						*connectItem1,
-						*connectItem2,
-					}, nil)
-				return mockConnectClient
-			},
-			check: func(t *testing.T, items []model.Item, err error) {
-				require.NoError(t, err)
-				require.Len(t, items, 2)
-				clienttesting.CheckConnectItemMapping(t, connectItem1, &items[0])
-				clienttesting.CheckConnectItemMapping(t, connectItem2, &items[1])
-			},
-		},
-		"should return an error": {
-			mockClient: func() *mock.ConnectClientMock {
-				mockConnectClient := &mock.ConnectClientMock{}
-				mockConnectClient.On("GetItemsByTitle", "item-title", "vault-id").Return([]onepassword.Item{}, errors.New("error"))
-				return mockConnectClient
-			},
-			check: func(t *testing.T, items []model.Item, err error) {
-				require.Error(t, err)
-				require.Nil(t, items)
-			},
-		},
-	}
-
-	for description, tc := range testCases {
-		t.Run(description, func(t *testing.T) {
-			client := &Connect{client: tc.mockClient()}
-			items, err := client.GetItemsByTitle(context.Background(), "vault-id", "item-title")
-			tc.check(t, items, err)
-		})
-	}
-}
-
-func TestConnect_GetFileContent(t *testing.T) {
-	testCases := map[string]struct {
-		mockClient func() *mock.ConnectClientMock
-		check      func(t *testing.T, content []byte, err error)
-	}{
-		"should return file content": {
-			mockClient: func() *mock.ConnectClientMock {
-				mockConnectClient := &mock.ConnectClientMock{}
-				mockConnectClient.On("GetFileContent", &onepassword.File{
-					ContentPath: "/v1/vaults/vault-id/items/item-id/files/file-id/content",
-				}).Return([]byte("file content"), nil)
-				return mockConnectClient
-			},
-			check: func(t *testing.T, content []byte, err error) {
-				require.NoError(t, err)
-				require.Equal(t, []byte("file content"), content)
-			},
-		},
-		"should return an error": {
-			mockClient: func() *mock.ConnectClientMock {
-				mockConnectClient := &mock.ConnectClientMock{}
-				mockConnectClient.On("GetFileContent", &onepassword.File{
-					ContentPath: "/v1/vaults/vault-id/items/item-id/files/file-id/content",
-				}).Return(nil, errors.New("error"))
-				return mockConnectClient
-			},
-			check: func(t *testing.T, content []byte, err error) {
-				require.Error(t, err)
-				require.Nil(t, content)
-			},
-		},
-	}
-
-	for description, tc := range testCases {
-		t.Run(description, func(t *testing.T) {
-			client := &Connect{client: tc.mockClient()}
-			content, err := client.GetFileContent(context.Background(), "vault-id", "item-id", "file-id")
-			tc.check(t, content, err)
-		})
-	}
-}
-
-func TestConnect_GetVaultsByTitle(t *testing.T) {
-	now := time.Now()
-	testCases := map[string]struct {
-		mockClient func() *mock.ConnectClientMock
-		check      func(t *testing.T, vaults []model.Vault, err error)
-	}{
-		"should return a single vault": {
-			mockClient: func() *mock.ConnectClientMock {
-				mockConnectClient := &mock.ConnectClientMock{}
-				mockConnectClient.On("GetVaultsByTitle", VaultTitleEmployee).Return([]onepassword.Vault{
-					{
-						ID:        "test-id",
-						Name:      VaultTitleEmployee,
-						CreatedAt: now,
-					},
-					{
-						ID:        "test-id-2",
-						Name:      "Some other vault",
-						CreatedAt: now,
-					},
-				}, nil)
-				return mockConnectClient
-			},
-			check: func(t *testing.T, vaults []model.Vault, err error) {
-				require.NoError(t, err)
-				require.Len(t, vaults, 1)
-				require.Equal(t, "test-id", vaults[0].ID)
-				require.Equal(t, now, vaults[0].CreatedAt)
-			},
-		},
-		"should return a two vaults": {
-			mockClient: func() *mock.ConnectClientMock {
-				mockConnectClient := &mock.ConnectClientMock{}
-				mockConnectClient.On("GetVaultsByTitle", VaultTitleEmployee).Return([]onepassword.Vault{
-					{
-						ID:        "test-id",
-						Name:      VaultTitleEmployee,
-						CreatedAt: now,
-					},
-					{
-						ID:        "test-id-2",
-						Name:      VaultTitleEmployee,
-						CreatedAt: now,
-					},
-				}, nil)
-				return mockConnectClient
-			},
-			check: func(t *testing.T, vaults []model.Vault, err error) {
-				require.NoError(t, err)
-				require.Len(t, vaults, 2)
-				// Check the first vault
-				require.Equal(t, "test-id", vaults[0].ID)
-				require.Equal(t, now, vaults[0].CreatedAt)
-				// Check the second vault
-				require.Equal(t, "test-id-2", vaults[1].ID)
-				require.Equal(t, now, vaults[1].CreatedAt)
-			},
-		},
-		"should return an error": {
-			mockClient: func() *mock.ConnectClientMock {
-				mockConnectClient := &mock.ConnectClientMock{}
-				mockConnectClient.On("GetVaultsByTitle", VaultTitleEmployee).Return([]onepassword.Vault{}, errors.New("error"))
-				return mockConnectClient
-			},
-			check: func(t *testing.T, vaults []model.Vault, err error) {
-				require.Error(t, err)
-				require.Empty(t, vaults)
-			},
-		},
-	}
-
-	for description, tc := range testCases {
-		t.Run(description, func(t *testing.T) {
-			client := &Connect{client: tc.mockClient()}
-			vault, err := client.GetVaultsByTitle(context.Background(), VaultTitleEmployee)
-			tc.check(t, vault, err)
-		})
-	}
-}

pkg/onepassword/client/sdk/sdk.go

@@ -1,97 +0,0 @@
-package sdk
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/1Password/onepassword-operator/pkg/onepassword/model"
-	sdk "github.com/1password/onepassword-sdk-go"
-)
-
-// Config holds the configuration for the 1Password SDK client.
-type Config struct {
-	ServiceAccountToken string
-	IntegrationName     string
-	IntegrationVersion  string
-}
-
-// SDK is a client for interacting with 1Password using the SDK.
-type SDK struct {
-	client *sdk.Client
-}
-
-func NewClient(ctx context.Context, config Config) (*SDK, error) {
-	client, err := sdk.NewClient(ctx,
-		sdk.WithServiceAccountToken(config.ServiceAccountToken),
-		sdk.WithIntegrationInfo(config.IntegrationName, config.IntegrationVersion),
-	)
-	if err != nil {
-		return nil, fmt.Errorf("1Password sdk error: %w", err)
-	}
-
-	return &SDK{
-		client: client,
-	}, nil
-}
-
-func (s *SDK) GetItemByID(ctx context.Context, vaultID, itemID string) (*model.Item, error) {
-	sdkItem, err := s.client.Items().Get(ctx, vaultID, itemID)
-	if err != nil {
-		return nil, fmt.Errorf("failed to GetItemsByTitle using 1Password SDK: %w", err)
-	}
-
-	var item model.Item
-	item.FromSDKItem(&sdkItem)
-	return &item, nil
-}
-
-func (s *SDK) GetItemsByTitle(ctx context.Context, vaultID, itemTitle string) ([]model.Item, error) {
-	// Get all items in the vault
-	sdkItems, err := s.client.Items().List(ctx, vaultID)
-	if err != nil {
-		return nil, fmt.Errorf("failed to GetItemsByTitle using 1Password SDK: %w", err)
-	}
-
-	// Filter items by title
-	var items []model.Item
-	for _, sdkItem := range sdkItems {
-		if sdkItem.Title == itemTitle {
-			var item model.Item
-			item.FromSDKItemOverview(&sdkItem)
-			items = append(items, item)
-		}
-	}
-
-	return items, nil
-}
-
-func (s *SDK) GetFileContent(ctx context.Context, vaultID, itemID, fileID string) ([]byte, error) {
-	bytes, err := s.client.Items().Files().Read(ctx, vaultID, itemID, sdk.FileAttributes{
-		ID: fileID,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("failed to GetFileContent using 1Password SDK: %w", err)
-	}
-
-	return bytes, nil
-}
-
-func (s *SDK) GetVaultsByTitle(ctx context.Context, title string) ([]model.Vault, error) {
-	// List all vaults
-	sdkVaults, err := s.client.Vaults().List(ctx)
-	if err != nil {
-		return nil, fmt.Errorf("failed to GetVaultsByTitle using 1Password SDK: %w", err)
-	}
-
-	// Filter vaults by title
-	var vaults []model.Vault
-	for _, sdkVault := range sdkVaults {
-		if sdkVault.Title == title {
-			var vault model.Vault
-			vault.FromSDKVault(&sdkVault)
-			vaults = append(vaults, vault)
-		}
-	}
-
-	return vaults, nil
-}

pkg/onepassword/client/sdk/sdk_test.go

@@ -1,288 +0,0 @@
-package sdk
-
-import (
-	"context"
-	"errors"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-
-	clienttesting "github.com/1Password/onepassword-operator/pkg/onepassword/client/testing"
-	clientmock "github.com/1Password/onepassword-operator/pkg/onepassword/client/testing/mock"
-	"github.com/1Password/onepassword-operator/pkg/onepassword/model"
-	sdk "github.com/1password/onepassword-sdk-go"
-)
-
-const VaultTitleEmployee = "Employee"
-
-func TestSDK_GetItemByID(t *testing.T) {
-	sdkItem := clienttesting.CreateSDKItem()
-
-	testCases := map[string]struct {
-		mockItemAPI func() *clientmock.ItemAPIMock
-		check       func(t *testing.T, item *model.Item, err error)
-	}{
-		"should return a single item": {
-			mockItemAPI: func() *clientmock.ItemAPIMock {
-				m := &clientmock.ItemAPIMock{}
-				m.On("Get", context.Background(), "vault-id", "item-id").Return(*sdkItem, nil)
-				return m
-			},
-			check: func(t *testing.T, item *model.Item, err error) {
-				require.NoError(t, err)
-				clienttesting.CheckSDKItemMapping(t, sdkItem, item)
-			},
-		},
-		"should return an error": {
-			mockItemAPI: func() *clientmock.ItemAPIMock {
-				m := &clientmock.ItemAPIMock{}
-				m.On("Get", context.Background(), "vault-id", "item-id").Return(sdk.Item{}, errors.New("error"))
-				return m
-			},
-			check: func(t *testing.T, item *model.Item, err error) {
-				require.Error(t, err)
-				require.Empty(t, item)
-			},
-		},
-	}
-
-	for description, tc := range testCases {
-		t.Run(description, func(t *testing.T) {
-			client := &SDK{
-				client: &sdk.Client{
-					ItemsAPI: tc.mockItemAPI(),
-				},
-			}
-			item, err := client.GetItemByID(context.Background(), "vault-id", "item-id")
-			tc.check(t, item, err)
-		})
-	}
-}
-
-func TestSDK_GetItemsByTitle(t *testing.T) {
-	sdkItem1 := clienttesting.CreateSDKItemOverview()
-	sdkItem2 := clienttesting.CreateSDKItemOverview()
-
-	testCases := map[string]struct {
-		mockItemAPI func() *clientmock.ItemAPIMock
-		check       func(t *testing.T, items []model.Item, err error)
-	}{
-		"should return a single item": {
-			mockItemAPI: func() *clientmock.ItemAPIMock {
-				m := &clientmock.ItemAPIMock{}
-
-				copySDKItem2 := *sdkItem2
-				copySDKItem2.Title = "Some other item"
-
-				m.On("List", context.Background(), "vault-id", mock.Anything).Return([]sdk.ItemOverview{
-					*sdkItem1,
-					copySDKItem2,
-				}, nil)
-				return m
-			},
-			check: func(t *testing.T, items []model.Item, err error) {
-				require.NoError(t, err)
-				require.Len(t, items, 1)
-				clienttesting.CheckSDKItemOverviewMapping(t, sdkItem1, &items[0])
-			},
-		},
-		"should return a two items": {
-			mockItemAPI: func() *clientmock.ItemAPIMock {
-				m := &clientmock.ItemAPIMock{}
-				m.On("List", context.Background(), "vault-id", mock.Anything).Return([]sdk.ItemOverview{
-					*sdkItem1,
-					*sdkItem2,
-				}, nil)
-				return m
-			},
-			check: func(t *testing.T, items []model.Item, err error) {
-				require.NoError(t, err)
-				require.Len(t, items, 2)
-				clienttesting.CheckSDKItemOverviewMapping(t, sdkItem1, &items[0])
-				clienttesting.CheckSDKItemOverviewMapping(t, sdkItem2, &items[1])
-			},
-		},
-		"should return empty list": {
-			mockItemAPI: func() *clientmock.ItemAPIMock {
-				m := &clientmock.ItemAPIMock{}
-				m.On("List", context.Background(), "vault-id", mock.Anything).Return([]sdk.ItemOverview{}, nil)
-				return m
-			},
-			check: func(t *testing.T, items []model.Item, err error) {
-				require.NoError(t, err)
-				require.Len(t, items, 0)
-			},
-		},
-		"should return an error": {
-			mockItemAPI: func() *clientmock.ItemAPIMock {
-				m := &clientmock.ItemAPIMock{}
-				m.On("List", context.Background(), "vault-id", mock.Anything).Return([]sdk.ItemOverview{}, errors.New("error"))
-				return m
-			},
-			check: func(t *testing.T, items []model.Item, err error) {
-				require.Error(t, err)
-				require.Empty(t, items)
-			},
-		},
-	}
-
-	for description, tc := range testCases {
-		t.Run(description, func(t *testing.T) {
-			client := &SDK{
-				client: &sdk.Client{
-					ItemsAPI: tc.mockItemAPI(),
-				},
-			}
-			items, err := client.GetItemsByTitle(context.Background(), "vault-id", "item-title")
-			tc.check(t, items, err)
-		})
-	}
-}
-
-func TestSDK_GetFileContent(t *testing.T) {
-	testCases := map[string]struct {
-		mockItemAPI func() *clientmock.ItemAPIMock
-		check       func(t *testing.T, content []byte, err error)
-	}{
-		"should return file content": {
-			mockItemAPI: func() *clientmock.ItemAPIMock {
-				fileMock := &clientmock.FileAPIMock{}
-				fileMock.On("Read", mock.Anything, "vault-id", "item-id",
-					mock.MatchedBy(func(attr sdk.FileAttributes) bool {
-						return attr.ID == "file-id"
-					}),
-				).Return([]byte("file content"), nil)
-
-				itemMock := &clientmock.ItemAPIMock{
-					FilesAPI: fileMock,
-				}
-				itemMock.On("Files").Return(fileMock)
-
-				return itemMock
-			},
-			check: func(t *testing.T, content []byte, err error) {
-				require.NoError(t, err)
-				require.Equal(t, []byte("file content"), content)
-			},
-		},
-		"should return an error": {
-			mockItemAPI: func() *clientmock.ItemAPIMock {
-				fileMock := &clientmock.FileAPIMock{}
-				fileMock.On("Read", mock.Anything, "vault-id", "item-id",
-					mock.MatchedBy(func(attr sdk.FileAttributes) bool {
-						return attr.ID == "file-id"
-					}),
-				).Return(nil, errors.New("error"))
-
-				itemMock := &clientmock.ItemAPIMock{
-					FilesAPI: fileMock,
-				}
-				itemMock.On("Files").Return(fileMock)
-
-				return itemMock
-			},
-			check: func(t *testing.T, content []byte, err error) {
-				require.Error(t, err)
-				require.Nil(t, content)
-			},
-		},
-	}
-
-	for description, tc := range testCases {
-		t.Run(description, func(t *testing.T) {
-			client := &SDK{
-				client: &sdk.Client{
-					ItemsAPI: tc.mockItemAPI(),
-				},
-			}
-			content, err := client.GetFileContent(context.Background(), "vault-id", "item-id", "file-id")
-			tc.check(t, content, err)
-		})
-	}
-}
-
-func TestSDK_GetVaultsByTitle(t *testing.T) {
-	now := time.Now()
-	testCases := map[string]struct {
-		mockVaultAPI func() *clientmock.VaultAPIMock
-		check        func(t *testing.T, vaults []model.Vault, err error)
-	}{
-		"should return a single vault": {
-			mockVaultAPI: func() *clientmock.VaultAPIMock {
-				m := &clientmock.VaultAPIMock{}
-				m.On("List", context.Background()).Return([]sdk.VaultOverview{
-					{
-						ID:        "test-id",
-						Title:     VaultTitleEmployee,
-						CreatedAt: now,
-					},
-					{
-						ID:        "test-id-2",
-						Title:     "Some other vault",
-						CreatedAt: now,
-					},
-				}, nil)
-				return m
-			},
-			check: func(t *testing.T, vaults []model.Vault, err error) {
-				require.NoError(t, err)
-				require.Len(t, vaults, 1)
-				require.Equal(t, "test-id", vaults[0].ID)
-				require.Equal(t, now, vaults[0].CreatedAt)
-			},
-		},
-		"should return a two vaults": {
-			mockVaultAPI: func() *clientmock.VaultAPIMock {
-				m := &clientmock.VaultAPIMock{}
-				m.On("List", context.Background()).Return([]sdk.VaultOverview{
-					{
-						ID:        "test-id",
-						Title:     VaultTitleEmployee,
-						CreatedAt: now,
-					},
-					{
-						ID:        "test-id-2",
-						Title:     VaultTitleEmployee,
-						CreatedAt: now,
-					},
-				}, nil)
-				return m
-			},
-			check: func(t *testing.T, vaults []model.Vault, err error) {
-				require.NoError(t, err)
-				require.Len(t, vaults, 2)
-				// Check the first vault
-				require.Equal(t, "test-id", vaults[0].ID)
-				require.Equal(t, now, vaults[0].CreatedAt)
-				// Check the second vault
-				require.Equal(t, "test-id-2", vaults[1].ID)
-				require.Equal(t, now, vaults[1].CreatedAt)
-			},
-		},
-		"should return an error": {
-			mockVaultAPI: func() *clientmock.VaultAPIMock {
-				m := &clientmock.VaultAPIMock{}
-				m.On("List", context.Background()).Return([]sdk.VaultOverview{}, errors.New("error"))
-				return m
-			},
-			check: func(t *testing.T, vaults []model.Vault, err error) {
-				require.Error(t, err)
-				require.Empty(t, vaults)
-			},
-		},
-	}
-
-	for description, tc := range testCases {
-		t.Run(description, func(t *testing.T) {
-			client := &SDK{
-				client: &sdk.Client{
-					VaultsAPI: tc.mockVaultAPI(),
-				},
-			}
-			vault, err := client.GetVaultsByTitle(context.Background(), VaultTitleEmployee)
-			tc.check(t, vault, err)
-		})
-	}
-}

pkg/onepassword/client/testing/item.go

@@ -1,110 +0,0 @@
-package testing
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/1Password/connect-sdk-go/onepassword"
-	"github.com/1Password/onepassword-operator/pkg/onepassword/model"
-	sdk "github.com/1password/onepassword-sdk-go"
-)
-
-func CreateConnectItem() *onepassword.Item {
-	return &onepassword.Item{
-		ID:      "test-id",
-		Vault:   onepassword.ItemVault{ID: "test-vault-id"},
-		Version: 1,
-		Tags:    []string{"tag1", "tag2"},
-		Fields: []*onepassword.ItemField{
-			{Label: "label1", Value: "value1"},
-			{Label: "label2", Value: "value2"},
-		},
-		Files: []*onepassword.File{
-			{ID: "file-id-1", Name: "file1.txt", Size: 1234},
-			{ID: "file-id-2", Name: "file2.txt", Size: 1234},
-		},
-	}
-}
-
-func CreateSDKItem() *sdk.Item {
-	return &sdk.Item{
-		ID:      "test-id",
-		VaultID: "test-vault-id",
-		Version: 1,
-		Tags:    []string{"tag1", "tag2"},
-		Fields: []sdk.ItemField{
-			{Title: "label1", Value: "value1"},
-			{Title: "label2", Value: "value2"},
-		},
-		Files: []sdk.ItemFile{
-			{Attributes: sdk.FileAttributes{ID: "file-id-1", Name: "file1.txt", Size: 1234}},
-			{Attributes: sdk.FileAttributes{ID: "file-id-2", Name: "file2.txt", Size: 1234}},
-		},
-		CreatedAt: time.Now(),
-	}
-}
-
-func CreateSDKItemOverview() *sdk.ItemOverview {
-	return &sdk.ItemOverview{
-		ID:        "test-id",
-		Title:     "item-title",
-		VaultID:   "test-vault-id",
-		Tags:      []string{"tag1", "tag2"},
-		CreatedAt: time.Now(),
-	}
-}
-
-func CheckConnectItemMapping(t *testing.T, expected *onepassword.Item, actual *model.Item) {
-	t.Helper()
-
-	require.Equal(t, expected.ID, actual.ID)
-	require.Equal(t, expected.Vault.ID, actual.VaultID)
-	require.Equal(t, expected.Version, actual.Version)
-	require.ElementsMatch(t, expected.Tags, actual.Tags)
-
-	for i, field := range expected.Fields {
-		require.Equal(t, field.Label, actual.Fields[i].Label)
-		require.Equal(t, field.Value, actual.Fields[i].Value)
-	}
-
-	for i, file := range expected.Files {
-		require.Equal(t, file.ID, actual.Files[i].ID)
-		require.Equal(t, file.Name, actual.Files[i].Name)
-		require.Equal(t, file.Size, actual.Files[i].Size)
-	}
-
-	require.Equal(t, expected.CreatedAt, actual.CreatedAt)
-}
-
-func CheckSDKItemMapping(t *testing.T, expected *sdk.Item, actual *model.Item) {
-	t.Helper()
-
-	require.Equal(t, expected.ID, actual.ID)
-	require.Equal(t, expected.VaultID, actual.VaultID)
-	require.Equal(t, int(expected.Version), actual.Version)
-	require.ElementsMatch(t, expected.Tags, actual.Tags)
-
-	for i, field := range expected.Fields {
-		require.Equal(t, field.Title, actual.Fields[i].Label)
-		require.Equal(t, field.Value, actual.Fields[i].Value)
-	}
-
-	for i, file := range expected.Files {
-		require.Equal(t, file.Attributes.ID, actual.Files[i].ID)
-		require.Equal(t, file.Attributes.Name, actual.Files[i].Name)
-		require.Equal(t, int(file.Attributes.Size), actual.Files[i].Size)
-	}
-
-	require.Equal(t, expected.CreatedAt, actual.CreatedAt)
-}
-
-func CheckSDKItemOverviewMapping(t *testing.T, expected *sdk.ItemOverview, actual *model.Item) {
-	t.Helper()
-
-	require.Equal(t, expected.ID, actual.ID)
-	require.Equal(t, expected.VaultID, actual.VaultID)
-	require.ElementsMatch(t, expected.Tags, actual.Tags)
-	require.Equal(t, expected.CreatedAt, actual.CreatedAt)
-}

pkg/onepassword/client/testing/mock/connect.go

@@ -1,134 +0,0 @@
-package mock
-
-import (
-	"github.com/stretchr/testify/mock"
-
-	"github.com/1Password/connect-sdk-go/onepassword"
-)
-
-// ConnectClientMock is a mock implementation of the ConnectClient interface
-type ConnectClientMock struct {
-	mock.Mock
-}
-
-func (c *ConnectClientMock) GetVaults() ([]onepassword.Vault, error) {
-	// Only implement this if mocking is needed
-	panic("implement me")
-}
-
-func (c *ConnectClientMock) GetVault(uuid string) (*onepassword.Vault, error) {
-	args := c.Called(uuid)
-	return args.Get(0).(*onepassword.Vault), args.Error(1)
-}
-
-func (c *ConnectClientMock) GetVaultByUUID(uuid string) (*onepassword.Vault, error) {
-	// Only implement this if mocking is needed
-	panic("implement me")
-}
-
-func (c *ConnectClientMock) GetVaultByTitle(title string) (*onepassword.Vault, error) {
-	// Only implement this if mocking is needed
-	panic("implement me")
-}
-
-func (c *ConnectClientMock) GetVaultsByTitle(title string) ([]onepassword.Vault, error) {
-	args := c.Called(title)
-	return args.Get(0).([]onepassword.Vault), args.Error(1)
-}
-
-func (c *ConnectClientMock) GetItems(vaultQuery string) ([]onepassword.Item, error) {
-	// Only implement this if mocking is needed
-	panic("implement me")
-}
-
-func (c *ConnectClientMock) GetItem(itemQuery, vaultQuery string) (*onepassword.Item, error) {
-	// Only implement this if mocking is needed
-	panic("implement me")
-}
-
-func (c *ConnectClientMock) GetItemByUUID(uuid string, vaultQuery string) (*onepassword.Item, error) {
-	args := c.Called(uuid, vaultQuery)
-	return args.Get(0).(*onepassword.Item), args.Error(1)
-}
-
-func (c *ConnectClientMock) GetItemByTitle(title string, vaultQuery string) (*onepassword.Item, error) {
-	// Only implement this if mocking is needed
-	panic("implement me")
-}
-
-func (c *ConnectClientMock) GetItemsByTitle(title string, vaultQuery string) ([]onepassword.Item, error) {
-	args := c.Called(title, vaultQuery)
-	return args.Get(0).([]onepassword.Item), args.Error(1)
-}
-
-func (c *ConnectClientMock) CreateItem(item *onepassword.Item, vaultQuery string) (*onepassword.Item, error) {
-	// Only implement this if mocking is needed
-	panic("implement me")
-}
-
-func (c *ConnectClientMock) UpdateItem(item *onepassword.Item, vaultQuery string) (*onepassword.Item, error) {
-	// Only implement this if mocking is needed
-	panic("implement me")
-}
-
-func (c *ConnectClientMock) DeleteItem(item *onepassword.Item, vaultQuery string) error {
-	// Only implement this if mocking is needed
-	panic("implement me")
-}
-
-func (c *ConnectClientMock) DeleteItemByID(itemUUID string, vaultQuery string) error {
-	// Only implement this if mocking is needed
-	panic("implement me")
-}
-
-func (c *ConnectClientMock) DeleteItemByTitle(title string, vaultQuery string) error {
-	// Only implement this if mocking is needed
-	panic("implement me")
-}
-
-func (c *ConnectClientMock) GetFiles(itemQuery string, vaultQuery string) ([]onepassword.File, error) {
-	// Only implement this if mocking is needed
-	panic("implement me")
-}
-
-func (c *ConnectClientMock) GetFile(uuid string, itemQuery string, vaultQuery string) (*onepassword.File, error) {
-	// Only implement this if mocking is needed
-	panic("implement me")
-}
-
-func (c *ConnectClientMock) GetFileContent(file *onepassword.File) ([]byte, error) {
-	args := c.Called(file)
-	if args.Get(0) == nil {
-		return nil, args.Error(1)
-	}
-	return args.Get(0).([]byte), args.Error(1)
-}
-
-func (c *ConnectClientMock) DownloadFile(
-	file *onepassword.File,
-	targetDirectory string,
-	overwrite bool,
-) (string, error) {
-	// Only implement this if mocking is needed
-	panic("implement me")
-}
-
-func (c *ConnectClientMock) LoadStructFromItemByUUID(config interface{}, itemUUID string, vaultQuery string) error {
-	// Only implement this if mocking is needed
-	panic("implement me")
-}
-
-func (c *ConnectClientMock) LoadStructFromItemByTitle(config interface{}, itemTitle string, vaultQuery string) error {
-	// Only implement this if mocking is needed
-	panic("implement me")
-}
-
-func (c *ConnectClientMock) LoadStructFromItem(config interface{}, itemQuery string, vaultQuery string) error {
-	// Only implement this if mocking is needed
-	panic("implement me")
-}
-
-func (c *ConnectClientMock) LoadStruct(config interface{}) error {
-	// Only implement this if mocking is needed
-	panic("implement me")
-}

pkg/onepassword/client/testing/mock/sdk.go

@@ -1,97 +0,0 @@
-package mock
-
-import (
-	"context"
-
-	"github.com/stretchr/testify/mock"
-
-	sdk "github.com/1password/onepassword-sdk-go"
-)
-
-type VaultAPIMock struct {
-	mock.Mock
-}
-
-func (v *VaultAPIMock) List(ctx context.Context) ([]sdk.VaultOverview, error) {
-	args := v.Called(ctx)
-	return args.Get(0).([]sdk.VaultOverview), args.Error(1)
-}
-
-type ItemAPIMock struct {
-	mock.Mock
-	FilesAPI sdk.ItemsFilesAPI
-}
-
-func (i *ItemAPIMock) Create(ctx context.Context, params sdk.ItemCreateParams) (sdk.Item, error) {
-	// TODO implement me
-	panic("implement me")
-}
-
-func (i *ItemAPIMock) Get(ctx context.Context, vaultID string, itemID string) (sdk.Item, error) {
-	args := i.Called(ctx, vaultID, itemID)
-	return args.Get(0).(sdk.Item), args.Error(1)
-}
-
-func (i *ItemAPIMock) Put(ctx context.Context, item sdk.Item) (sdk.Item, error) {
-	// TODO implement me
-	panic("implement me")
-}
-
-func (i *ItemAPIMock) Delete(ctx context.Context, vaultID string, itemID string) error {
-	// TODO implement me
-	panic("implement me")
-}
-
-func (i *ItemAPIMock) Archive(ctx context.Context, vaultID string, itemID string) error {
-	// TODO implement me
-	panic("implement me")
-}
-
-func (i *ItemAPIMock) List(
-	ctx context.Context,
-	vaultID string,
-	filters ...sdk.ItemListFilter,
-) ([]sdk.ItemOverview, error) {
-	args := i.Called(ctx, vaultID, filters)
-	return args.Get(0).([]sdk.ItemOverview), args.Error(1)
-}
-
-func (i *ItemAPIMock) Shares() sdk.ItemsSharesAPI {
-	// TODO implement me
-	panic("implement me")
-}
-
-func (i *ItemAPIMock) Files() sdk.ItemsFilesAPI {
-	return i.FilesAPI
-}
-
-type FileAPIMock struct {
-	mock.Mock
-}
-
-func (f *FileAPIMock) Attach(ctx context.Context, item sdk.Item, fileParams sdk.FileCreateParams) (sdk.Item, error) {
-	// TODO implement me
-	panic("implement me")
-}
-
-func (f *FileAPIMock) Delete(ctx context.Context, item sdk.Item, sectionID string, fieldID string) (sdk.Item, error) {
-	// TODO implement me
-	panic("implement me")
-}
-
-func (f *FileAPIMock) ReplaceDocument(
-	ctx context.Context,
-	item sdk.Item,
-	docParams sdk.DocumentCreateParams,
-) (sdk.Item, error) {
-	// TODO implement me
-	panic("implement me")
-}
-
-func (f *FileAPIMock) Read(ctx context.Context, vaultID, itemID string, attributes sdk.FileAttributes) ([]byte, error) {
-	args := f.Called(ctx, vaultID, itemID, attributes)
-	if args.Get(0) == nil {
-		return nil, args.Error(1)
-	}
-	return args.Get(0).([]byte), args.Error(1)
-}

pkg/onepassword/connect_setup.go

@@ -2,12 +2,12 @@ package onepassword
 
 import (
 	"context"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"os"
 
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/errors"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	errors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/yaml"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -15,16 +15,16 @@ import (
 )
 
 var logConnectSetup = logf.Log.WithName("ConnectSetup")
-var deploymentPath = "../config/connect/deployment.yaml"
-var servicePath = "../config/connect/service.yaml"
+var deploymentPath = "deploy/connect/deployment.yaml"
+var servicePath = "deploy/connect/service.yaml"
 
-func SetupConnect(ctx context.Context, kubeClient client.Client, deploymentNamespace string) error {
-	err := setupService(ctx, kubeClient, servicePath, deploymentNamespace)
+func SetupConnect(kubeClient client.Client, deploymentNamespace string) error {
+	err := setupService(kubeClient, servicePath, deploymentNamespace)
 	if err != nil {
 		return err
 	}
 
-	err = setupDeployment(ctx, kubeClient, deploymentPath, deploymentNamespace)
+	err = setupDeployment(kubeClient, deploymentPath, deploymentNamespace)
 	if err != nil {
 		return err
 	}
@@ -32,40 +32,27 @@ func SetupConnect(ctx context.Context, kubeClient client.Client, deploymentNames
 	return nil
 }
 
-func setupDeployment(
-	ctx context.Context,
-	kubeClient client.Client,
-	deploymentPath string,
-	deploymentNamespace string,
-) error {
+func setupDeployment(kubeClient client.Client, deploymentPath string, deploymentNamespace string) error {
 	existingDeployment := &appsv1.Deployment{}
 
 	// check if deployment has already been created
-	err := kubeClient.Get(ctx, types.NamespacedName{
-		Name:      "onepassword-connect",
-		Namespace: deploymentNamespace,
-	}, existingDeployment)
+	err := kubeClient.Get(context.Background(), types.NamespacedName{Name: "onepassword-connect", Namespace: deploymentNamespace}, existingDeployment)
 	if err != nil {
 		if errors.IsNotFound(err) {
 			logConnectSetup.Info("No existing Connect deployment found. Creating Deployment")
-			return createDeployment(ctx, kubeClient, deploymentPath, deploymentNamespace)
+			return createDeployment(kubeClient, deploymentPath, deploymentNamespace)
 		}
 	}
 	return err
 }
 
-func createDeployment(
-	ctx context.Context,
-	kubeClient client.Client,
-	deploymentPath string,
-	deploymentNamespace string,
-) error {
+func createDeployment(kubeClient client.Client, deploymentPath string, deploymentNamespace string) error {
 	deployment, err := getDeploymentToCreate(deploymentPath, deploymentNamespace)
 	if err != nil {
 		return err
 	}
 
-	err = kubeClient.Create(ctx, deployment)
+	err = kubeClient.Create(context.Background(), deployment)
 	if err != nil {
 		return err
 	}
@@ -91,29 +78,21 @@ func getDeploymentToCreate(deploymentPath string, deploymentNamespace string) (*
 	return deployment, nil
 }
 
-func setupService(ctx context.Context, kubeClient client.Client, servicePath string, deploymentNamespace string) error {
+func setupService(kubeClient client.Client, servicePath string, deploymentNamespace string) error {
 	existingService := &corev1.Service{}
 
-	// check if service has already been created
-	err := kubeClient.Get(ctx, types.NamespacedName{
-		Name:      "onepassword-connect",
-		Namespace: deploymentNamespace,
-	}, existingService)
+	//check if service has already been created
+	err := kubeClient.Get(context.Background(), types.NamespacedName{Name: "onepassword-connect", Namespace: deploymentNamespace}, existingService)
 	if err != nil {
 		if errors.IsNotFound(err) {
 			logConnectSetup.Info("No existing Connect service found. Creating Service")
-			return createService(ctx, kubeClient, servicePath, deploymentNamespace)
+			return createService(kubeClient, servicePath, deploymentNamespace)
 		}
 	}
 	return err
 }
 
-func createService(
-	ctx context.Context,
-	kubeClient client.Client,
-	servicePath string,
-	deploymentNamespace string,
-) error {
+func createService(kubeClient client.Client, servicePath string, deploymentNamespace string) error {
 	f, err := os.Open(servicePath)
 	if err != nil {
 		return err
@@ -129,7 +108,7 @@ func createService(
 		return err
 	}
 
-	err = kubeClient.Create(ctx, service)
+	err = kubeClient.Create(context.Background(), service)
 	if err != nil {
 		return err
 	}

pkg/onepassword/connect_setup_test.go

@@ -15,7 +15,6 @@ import (
 var defaultNamespacedName = types.NamespacedName{Name: "onepassword-connect", Namespace: "default"}
 
 func TestServiceSetup(t *testing.T) {
-	ctx := context.Background()
 
 	// Register operator types with the runtime scheme.
 	s := scheme.Scheme
@@ -24,9 +23,9 @@ func TestServiceSetup(t *testing.T) {
 	objs := []runtime.Object{}
 
 	// Create a fake client to mock API calls.
-	client := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(objs...).Build()
+	client := fake.NewFakeClientWithScheme(s, objs...)
 
-	err := setupService(ctx, client, "../../config/connect/service.yaml", defaultNamespacedName.Namespace)
+	err := setupService(client, "../../deploy/connect/service.yaml", defaultNamespacedName.Namespace)
 
 	if err != nil {
 		t.Errorf("Error Setting Up Connect: %v", err)
@@ -34,14 +33,13 @@ func TestServiceSetup(t *testing.T) {
 
 	// check that service was created
 	service := &corev1.Service{}
-	err = client.Get(ctx, defaultNamespacedName, service)
+	err = client.Get(context.TODO(), defaultNamespacedName, service)
 	if err != nil {
 		t.Errorf("Error Setting Up Connect service: %v", err)
 	}
 }
 
 func TestDeploymentSetup(t *testing.T) {
-	ctx := context.Background()
 
 	// Register operator types with the runtime scheme.
 	s := scheme.Scheme
@@ -50,9 +48,9 @@ func TestDeploymentSetup(t *testing.T) {
 	objs := []runtime.Object{}
 
 	// Create a fake client to mock API calls.
-	client := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(objs...).Build()
+	client := fake.NewFakeClientWithScheme(s, objs...)
 
-	err := setupDeployment(ctx, client, "../../config/connect/deployment.yaml", defaultNamespacedName.Namespace)
+	err := setupDeployment(client, "../../deploy/connect/deployment.yaml", defaultNamespacedName.Namespace)
 
 	if err != nil {
 		t.Errorf("Error Setting Up Connect: %v", err)
@@ -60,7 +58,7 @@ func TestDeploymentSetup(t *testing.T) {
 
 	// check that deployment was created
 	deployment := &appsv1.Deployment{}
-	err = client.Get(ctx, defaultNamespacedName, deployment)
+	err = client.Get(context.TODO(), defaultNamespacedName, deployment)
 	if err != nil {
 		t.Errorf("Error Setting Up Connect deployment: %v", err)
 	}

pkg/onepassword/containers.go

@@ -28,11 +28,7 @@ func AreContainersUsingSecrets(containers []corev1.Container, secrets map[string
 	return false
 }
 
-func AppendUpdatedContainerSecrets(
-	containers []corev1.Container,
-	secrets map[string]*corev1.Secret,
-	updatedDeploymentSecrets map[string]*corev1.Secret,
-) map[string]*corev1.Secret {
+func AppendUpdatedContainerSecrets(containers []corev1.Container, secrets map[string]*corev1.Secret, updatedDeploymentSecrets map[string]*corev1.Secret) map[string]*corev1.Secret {
 	for i := 0; i < len(containers); i++ {
 		envVariables := containers[i].Env
 		for j := 0; j < len(envVariables); j++ {
@@ -46,7 +42,7 @@ func AppendUpdatedContainerSecrets(
 		envFromVariables := containers[i].EnvFrom
 		for j := 0; j < len(envFromVariables); j++ {
 			if envFromVariables[j].SecretRef != nil {
-				secret, ok := secrets[envFromVariables[j].SecretRef.Name]
+				secret, ok := secrets[envFromVariables[j].SecretRef.LocalObjectReference.Name]
 				if ok {
 					updatedDeploymentSecrets[secret.Name] = secret
 				}

pkg/onepassword/containers_test.go

@@ -9,8 +9,8 @@ import (
 
 func TestAreContainersUsingSecretsFromEnv(t *testing.T) {
 	secretNamesToSearch := map[string]*corev1.Secret{
-		"onepassword-database-secret": {},
-		"onepassword-api-key":         {},
+		"onepassword-database-secret": &corev1.Secret{},
+		"onepassword-api-key":         &corev1.Secret{},
 	}
 
 	containerSecretNames := []string{

pkg/onepassword/deployments.go

@@ -9,15 +9,10 @@ func IsDeploymentUsingSecrets(deployment *appsv1.Deployment, secrets map[string]
 	volumes := deployment.Spec.Template.Spec.Volumes
 	containers := deployment.Spec.Template.Spec.Containers
 	containers = append(containers, deployment.Spec.Template.Spec.InitContainers...)
-	return AreAnnotationsUsingSecrets(deployment.Annotations, secrets) ||
-		AreContainersUsingSecrets(containers, secrets) ||
-		AreVolumesUsingSecrets(volumes, secrets)
+	return AreAnnotationsUsingSecrets(deployment.Annotations, secrets) || AreContainersUsingSecrets(containers, secrets) || AreVolumesUsingSecrets(volumes, secrets)
 }
 
-func GetUpdatedSecretsForDeployment(
-	deployment *appsv1.Deployment,
-	secrets map[string]*corev1.Secret,
-) map[string]*corev1.Secret {
+func GetUpdatedSecretsForDeployment(deployment *appsv1.Deployment, secrets map[string]*corev1.Secret) map[string]*corev1.Secret {
 	volumes := deployment.Spec.Template.Spec.Volumes
 	containers := deployment.Spec.Template.Spec.Containers
 	containers = append(containers, deployment.Spec.Template.Spec.InitContainers...)

pkg/onepassword/deployments_test.go

@@ -9,30 +9,18 @@ import (
 
 func TestIsDeploymentUsingSecretsUsingVolumes(t *testing.T) {
 	secretNamesToSearch := map[string]*corev1.Secret{
-		"onepassword-database-secret":  {},
-		"onepassword-api-key":          {},
-		"onepassword-app-token":        {},
-		"onepassword-user-credentials": {},
+		"onepassword-database-secret": &corev1.Secret{},
+		"onepassword-api-key":         &corev1.Secret{},
 	}
 
 	volumeSecretNames := []string{
 		"onepassword-database-secret",
 		"onepassword-api-key",
+		"some_other_key",
 	}
 
-	volumes := generateVolumes(volumeSecretNames)
-
-	volumeProjectedSecretNames := []string{
-		"onepassword-app-token",
-		"onepassword-user-credentials",
-	}
-
-	volumeProjected := generateVolumesProjected(volumeProjectedSecretNames)
-
-	volumes = append(volumes, volumeProjected)
-
 	deployment := &appsv1.Deployment{}
-	deployment.Spec.Template.Spec.Volumes = volumes
+	deployment.Spec.Template.Spec.Volumes = generateVolumes(volumeSecretNames)
 	if !IsDeploymentUsingSecrets(deployment, secretNamesToSearch) {
 		t.Errorf("Expected that deployment was using secrets but they were not detected.")
 	}
@@ -40,8 +28,8 @@ func TestIsDeploymentUsingSecretsUsingVolumes(t *testing.T) {
 
 func TestIsDeploymentUsingSecretsUsingContainers(t *testing.T) {
 	secretNamesToSearch := map[string]*corev1.Secret{
-		"onepassword-database-secret": {},
-		"onepassword-api-key":         {},
+		"onepassword-database-secret": &corev1.Secret{},
+		"onepassword-api-key":         &corev1.Secret{},
 	}
 
 	containerSecretNames := []string{
@@ -59,8 +47,8 @@ func TestIsDeploymentUsingSecretsUsingContainers(t *testing.T) {
 
 func TestIsDeploymentNotUSingSecrets(t *testing.T) {
 	secretNamesToSearch := map[string]*corev1.Secret{
-		"onepassword-database-secret": {},
-		"onepassword-api-key":         {},
+		"onepassword-database-secret": &corev1.Secret{},
+		"onepassword-api-key":         &corev1.Secret{},
 	}
 
 	deployment := &appsv1.Deployment{}

pkg/onepassword/items.go

@@ -1,44 +1,41 @@
 package onepassword
 
 import (
-	"context"
 	"fmt"
 	"strings"
 
+	"github.com/1Password/connect-sdk-go/connect"
+	"github.com/1Password/connect-sdk-go/onepassword"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
-
-	opclient "github.com/1Password/onepassword-operator/pkg/onepassword/client"
-	"github.com/1Password/onepassword-operator/pkg/onepassword/model"
 )
 
 var logger = logf.Log.WithName("retrieve_item")
 
-func GetOnePasswordItemByPath(ctx context.Context, opClient opclient.Client, path string) (*model.Item, error) {
-	vaultNameOrID, itemNameOrID, err := ParseVaultAndItemFromPath(path)
+func GetOnePasswordItemByPath(opConnectClient connect.Client, path string) (*onepassword.Item, error) {
+	vaultValue, itemValue, err := ParseVaultAndItemFromPath(path)
 	if err != nil {
 		return nil, err
 	}
-	vaultID, err := getVaultID(ctx, opClient, vaultNameOrID)
+	vaultId, err := getVaultId(opConnectClient, vaultValue)
 	if err != nil {
-		return nil, fmt.Errorf("failed to 'getVaultID' for vaultNameOrID='%s': %w", vaultNameOrID, err)
+		return nil, err
 	}
 
-	itemID, err := getItemID(ctx, opClient, vaultID, itemNameOrID)
+	itemId, err := getItemId(opConnectClient, itemValue, vaultId)
 	if err != nil {
-		return nil, fmt.Errorf("faild to 'getItemID' for vaultID='%s' and itemNameOrID='%s': %w", vaultID, itemNameOrID, err)
+		return nil, err
 	}
 
-	item, err := opClient.GetItemByID(ctx, vaultID, itemID)
+	item, err := opConnectClient.GetItem(itemId, vaultId)
 	if err != nil {
-		return nil, fmt.Errorf("faield to 'GetItemByID' for vaultID='%s' and itemID='%s': %w", vaultID, itemID, err)
+		return nil, err
 	}
 
-	for i, file := range item.Files {
-		content, err := opClient.GetFileContent(ctx, vaultID, itemID, file.ID)
+	for _, file := range item.Files {
+		_, err := opConnectClient.GetFileContent(file)
 		if err != nil {
 			return nil, err
 		}
-		item.Files[i].SetContent(content)
 	}
 
 	return item, nil
@@ -49,21 +46,18 @@ func ParseVaultAndItemFromPath(path string) (string, string, error) {
 	if len(splitPath) == 4 && splitPath[0] == "vaults" && splitPath[2] == "items" {
 		return splitPath[1], splitPath[3], nil
 	}
-	return "", "", fmt.Errorf(
-		"%q is not an acceptable path for One Password item. Must be of the format: `vaults/{vault_id}/items/{item_id}`",
-		path,
-	)
+	return "", "", fmt.Errorf("%q is not an acceptable path for One Password item. Must be of the format: `vaults/{vault_id}/items/{item_id}`", path)
 }
 
-func getVaultID(ctx context.Context, client opclient.Client, vaultNameOrID string) (string, error) {
-	if !IsValidClientUUID(vaultNameOrID) {
-		vaults, err := client.GetVaultsByTitle(ctx, vaultNameOrID)
+func getVaultId(client connect.Client, vaultIdentifier string) (string, error) {
+	if !IsValidClientUUID(vaultIdentifier) {
+		vaults, err := client.GetVaultsByTitle(vaultIdentifier)
 		if err != nil {
 			return "", err
 		}
 
 		if len(vaults) == 0 {
-			return "", fmt.Errorf("no vaults found with identifier %q", vaultNameOrID)
+			return "", fmt.Errorf("No vaults found with identifier %q", vaultIdentifier)
 		}
 
 		oldestVault := vaults[0]
@@ -73,24 +67,22 @@ func getVaultID(ctx context.Context, client opclient.Client, vaultNameOrID strin
 					oldestVault = returnedVault
 				}
 			}
-			logger.Info(fmt.Sprintf("%v 1Password vaults found with the title %q. Will use vault %q as it is the oldest.",
-				len(vaults), vaultNameOrID, oldestVault.ID,
-			))
+			logger.Info(fmt.Sprintf("%v 1Password vaults found with the title %q. Will use vault %q as it is the oldest.", len(vaults), vaultIdentifier, oldestVault.ID))
 		}
-		vaultNameOrID = oldestVault.ID
+		vaultIdentifier = oldestVault.ID
 	}
-	return vaultNameOrID, nil
+	return vaultIdentifier, nil
 }
 
-func getItemID(ctx context.Context, client opclient.Client, vaultId, itemNameOrID string) (string, error) {
-	if !IsValidClientUUID(itemNameOrID) {
-		items, err := client.GetItemsByTitle(ctx, vaultId, itemNameOrID)
+func getItemId(client connect.Client, itemIdentifier string, vaultId string) (string, error) {
+	if !IsValidClientUUID(itemIdentifier) {
+		items, err := client.GetItemsByTitle(itemIdentifier, vaultId)
 		if err != nil {
 			return "", err
 		}
 
 		if len(items) == 0 {
-			return "", fmt.Errorf("no items found with identifier %q", itemNameOrID)
+			return "", fmt.Errorf("No items found with identifier %q", itemIdentifier)
 		}
 
 		oldestItem := items[0]
@@ -100,11 +92,9 @@ func getItemID(ctx context.Context, client opclient.Client, vaultId, itemNameOrI
 					oldestItem = returnedItem
 				}
 			}
-			logger.Info(fmt.Sprintf("%v 1Password items found with the title %q. Will use item %q as it is the oldest.",
-				len(items), itemNameOrID, oldestItem.ID,
-			))
+			logger.Info(fmt.Sprintf("%v 1Password items found with the title %q. Will use item %q as it is the oldest.", len(items), itemIdentifier, oldestItem.ID))
 		}
-		itemNameOrID = oldestItem.ID
+		itemIdentifier = oldestItem.ID
 	}
-	return itemNameOrID, nil
+	return itemIdentifier, nil
 }

pkg/onepassword/model/file.go

@@ -1,27 +0,0 @@
-package model
-
-import (
-	"errors"
-)
-
-// File represents a file stored in 1Password.
-type File struct {
-	ID          string
-	Name        string
-	Size        int
-	ContentPath string
-	content     []byte
-}
-
-// Content returns the content of the file if they have been loaded and returns an error if they have not been loaded.
-// Use `client.GetFileContent(file *File)` instead to make sure the content is fetched automatically if not present.
-func (f *File) Content() ([]byte, error) {
-	if f.content == nil {
-		return nil, errors.New("file content not loaded")
-	}
-	return f.content, nil
-}
-
-func (f *File) SetContent(content []byte) {
-	f.content = content
-}

pkg/onepassword/model/item.go

@@ -1,92 +0,0 @@
-package model
-
-import (
-	"time"
-
-	connect "github.com/1Password/connect-sdk-go/onepassword"
-	sdk "github.com/1password/onepassword-sdk-go"
-)
-
-// Item represents 1Password item.
-type Item struct {
-	ID        string
-	VaultID   string
-	Version   int
-	Tags      []string
-	Fields    []ItemField
-	Files     []File
-	CreatedAt time.Time
-}
-
-// FromConnectItem populates the Item from a Connect item.
-func (i *Item) FromConnectItem(item *connect.Item) {
-	i.ID = item.ID
-	i.VaultID = item.Vault.ID
-	i.Version = item.Version
-
-	i.Tags = append(i.Tags, item.Tags...)
-
-	for _, field := range item.Fields {
-		i.Fields = append(i.Fields, ItemField{
-			Label: field.Label,
-			Value: field.Value,
-		})
-	}
-
-	for _, file := range item.Files {
-		i.Files = append(i.Files, File{
-			ID:   file.ID,
-			Name: file.Name,
-			Size: file.Size,
-		})
-	}
-
-	i.CreatedAt = item.CreatedAt
-}
-
-// FromSDKItem populates the Item from an SDK item.
-func (i *Item) FromSDKItem(item *sdk.Item) {
-	i.ID = item.ID
-	i.VaultID = item.VaultID
-	i.Version = int(item.Version)
-
-	i.Tags = make([]string, len(item.Tags))
-	copy(i.Tags, item.Tags)
-
-	for _, field := range item.Fields {
-		i.Fields = append(i.Fields, ItemField{
-			Label: field.Title,
-			Value: field.Value,
-		})
-	}
-
-	for _, file := range item.Files {
-		i.Files = append(i.Files, File{
-			ID:   file.Attributes.ID,
-			Name: file.Attributes.Name,
-			Size: int(file.Attributes.Size),
-		})
-	}
-
-	// Items of 'Document' category keeps file information in the Document field.
-	if item.Category == sdk.ItemCategoryDocument {
-		i.Files = append(i.Files, File{
-			ID:   item.Document.ID,
-			Name: item.Document.Name,
-			Size: int(item.Document.Size),
-		})
-	}
-
-	i.CreatedAt = item.CreatedAt
-}
-
-// FromSDKItemOverview populates the Item from an SDK item overview.
-func (i *Item) FromSDKItemOverview(item *sdk.ItemOverview) {
-	i.ID = item.ID
-	i.VaultID = item.VaultID
-
-	i.Tags = make([]string, len(item.Tags))
-	copy(i.Tags, item.Tags)
-
-	i.CreatedAt = item.CreatedAt
-}