From 61ece23433ef90b228b5c73b4f83986d29309914 Mon Sep 17 00:00:00 2001 From: Harikrishnan Balagopal Date: Sun, 10 Sep 2023 21:07:00 +0530 Subject: [PATCH 1/2] refactor: move operator to UI repo chore: remove links to old repo in README fix: make docker build for operator - copy helm charts folder before building fix: use VERSION for the IMG name while doing docker-build Signed-off-by: Harikrishnan Balagopal --- operator/.dockerignore | 19 ++ operator/.gitignore | 28 ++ operator/Dockerfile | 7 + operator/LICENSE | 202 +++++++++++++++ operator/Makefile | 243 ++++++++++++++++++ operator/PROJECT | 20 ++ operator/README.md | 34 +++ operator/bundle.Dockerfile | 20 ++ .../crd/bases/konveyor.io_move2kubes.yaml | 44 ++++ .../move2kube.konveyor.io_move2kubes.yaml | 44 ++++ operator/config/crd/kustomization.yaml | 6 + operator/config/default/kustomization.yaml | 30 +++ .../default/manager_auth_proxy_patch.yaml | 56 ++++ .../config/default/manager_config_patch.yaml | 10 + operator/config/manager/kustomization.yaml | 8 + operator/config/manager/manager.yaml | 101 ++++++++ ...e2kube-operator.clusterserviceversion.yaml | 82 ++++++ operator/config/manifests/kustomization.yaml | 7 + operator/config/prometheus/kustomization.yaml | 2 + operator/config/prometheus/monitor.yaml | 26 ++ .../rbac/auth_proxy_client_clusterrole.yaml | 16 ++ operator/config/rbac/auth_proxy_role.yaml | 24 ++ .../config/rbac/auth_proxy_role_binding.yaml | 19 ++ operator/config/rbac/auth_proxy_service.yaml | 21 ++ operator/config/rbac/kustomization.yaml | 18 ++ .../config/rbac/leader_election_role.yaml | 44 ++++ .../rbac/leader_election_role_binding.yaml | 19 ++ .../config/rbac/move2kube_editor_role.yaml | 31 +++ .../config/rbac/move2kube_viewer_role.yaml | 27 ++ operator/config/rbac/role.yaml | 83 ++++++ operator/config/rbac/role_binding.yaml | 19 ++ operator/config/rbac/service_account.yaml | 12 + operator/config/samples/kustomization.yaml | 4 + .../samples/move2kube_v1alpha1_move2kube.yaml | 60 +++++ operator/config/scorecard/bases/config.yaml | 7 + operator/config/scorecard/kustomization.yaml | 16 ++ .../scorecard/patches/basic.config.yaml | 10 + .../config/scorecard/patches/olm.config.yaml | 50 ++++ operator/watches.yaml | 6 + 39 files changed, 1475 insertions(+) create mode 100644 operator/.dockerignore create mode 100644 operator/.gitignore create mode 100644 operator/Dockerfile create mode 100644 operator/LICENSE create mode 100644 operator/Makefile create mode 100644 operator/PROJECT create mode 100644 operator/README.md create mode 100644 operator/bundle.Dockerfile create mode 100644 operator/config/crd/bases/konveyor.io_move2kubes.yaml create mode 100644 operator/config/crd/bases/move2kube.konveyor.io_move2kubes.yaml create mode 100644 operator/config/crd/kustomization.yaml create mode 100644 operator/config/default/kustomization.yaml create mode 100644 operator/config/default/manager_auth_proxy_patch.yaml create mode 100644 operator/config/default/manager_config_patch.yaml create mode 100644 operator/config/manager/kustomization.yaml create mode 100644 operator/config/manager/manager.yaml create mode 100644 operator/config/manifests/bases/move2kube-operator.clusterserviceversion.yaml create mode 100644 operator/config/manifests/kustomization.yaml create mode 100644 operator/config/prometheus/kustomization.yaml create mode 100644 operator/config/prometheus/monitor.yaml create mode 100644 operator/config/rbac/auth_proxy_client_clusterrole.yaml create mode 100644 operator/config/rbac/auth_proxy_role.yaml create mode 100644 operator/config/rbac/auth_proxy_role_binding.yaml create mode 100644 operator/config/rbac/auth_proxy_service.yaml create mode 100644 operator/config/rbac/kustomization.yaml create mode 100644 operator/config/rbac/leader_election_role.yaml create mode 100644 operator/config/rbac/leader_election_role_binding.yaml create mode 100644 operator/config/rbac/move2kube_editor_role.yaml create mode 100644 operator/config/rbac/move2kube_viewer_role.yaml create mode 100644 operator/config/rbac/role.yaml create mode 100644 operator/config/rbac/role_binding.yaml create mode 100644 operator/config/rbac/service_account.yaml create mode 100644 operator/config/samples/kustomization.yaml create mode 100644 operator/config/samples/move2kube_v1alpha1_move2kube.yaml create mode 100644 operator/config/scorecard/bases/config.yaml create mode 100644 operator/config/scorecard/kustomization.yaml create mode 100644 operator/config/scorecard/patches/basic.config.yaml create mode 100644 operator/config/scorecard/patches/olm.config.yaml create mode 100644 operator/watches.yaml diff --git a/operator/.dockerignore b/operator/.dockerignore new file mode 100644 index 0000000..8792b34 --- /dev/null +++ b/operator/.dockerignore @@ -0,0 +1,19 @@ +# Copyright IBM Corporation 2020 +# +# 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. + +Dockerfile +deploy +.git +.gitignore +secrets/ diff --git a/operator/.gitignore b/operator/.gitignore new file mode 100644 index 0000000..2ca5a1c --- /dev/null +++ b/operator/.gitignore @@ -0,0 +1,28 @@ +# Copyright IBM Corporation 2020 +# +# 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. + +.vscode +demo_tmp +sample_tmp +work_dir +m2k +m2k_bin +colleted_md +.DS_Store +_dist +bin +.m2k +coverage.txt +.cr-release-packages +secrets/ diff --git a/operator/Dockerfile b/operator/Dockerfile new file mode 100644 index 0000000..bdb4a98 --- /dev/null +++ b/operator/Dockerfile @@ -0,0 +1,7 @@ +# Build the manager binary +FROM quay.io/operator-framework/helm-operator:v1.31.0 + +ENV HOME=/opt/helm +COPY watches.yaml ${HOME}/watches.yaml +COPY helm-charts ${HOME}/helm-charts +WORKDIR ${HOME} diff --git a/operator/LICENSE b/operator/LICENSE new file mode 100644 index 0000000..0dae2b3 --- /dev/null +++ b/operator/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright IBM Corporation [yyyy] + + 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. \ No newline at end of file diff --git a/operator/Makefile b/operator/Makefile new file mode 100644 index 0000000..5011ba1 --- /dev/null +++ b/operator/Makefile @@ -0,0 +1,243 @@ +# 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 ?= v0.3.8 +VERSION_WITHOUT_V := $(VERSION:v%=%) + +info: + @echo VERSION $(VERSION) + @echo VERSION_WITHOUT_V $(VERSION_WITHOUT_V) + +# 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") +# To re-generate a bundle for other specific channels without changing the standard setup, you can: +# - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=candidate,fast,stable) +# - use environment variables to overwrite this value (e.g export CHANNELS="candidate,fast,stable") +ifneq ($(origin CHANNELS), undefined) +BUNDLE_CHANNELS := --channels=$(CHANNELS) +endif + +# DEFAULT_CHANNEL defines the default channel used in the bundle. +# Add a new line here if you would like to change its default config. (E.g DEFAULT_CHANNEL = "stable") +# To re-generate a bundle for any other default channel without changing the default setup, you can: +# - use the DEFAULT_CHANNEL as arg of the bundle target (e.g make bundle DEFAULT_CHANNEL=stable) +# - use environment variables to overwrite this value (e.g export DEFAULT_CHANNEL="stable") +ifneq ($(origin DEFAULT_CHANNEL), undefined) +BUNDLE_DEFAULT_CHANNEL := --default-channel=$(DEFAULT_CHANNEL) +endif +BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL) + +# IMAGE_TAG_BASE defines the docker.io namespace and part of the image name for remote images. +# 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 +# quay.io/konveyor/move2kube-operator-bundle:$VERSION and quay.io/konveyor/move2kube-operator-catalog:$VERSION. +IMAGE_TAG_BASE ?= quay.io/konveyor/move2kube + +# BUNDLE_IMG defines the image:tag used for the bundle. +# You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=/:) +BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION_WITHOUT_V) + +# BUNDLE_GEN_FLAGS are the flags passed to the operator-sdk generate bundle command +BUNDLE_GEN_FLAGS ?= -q --overwrite --version $(VERSION_WITHOUT_V) $(BUNDLE_METADATA_OPTS) + +# USE_IMAGE_DIGESTS defines if images are resolved via tags or digests +# You can enable this value if you would like to use SHA Based Digests +# To enable set flag to true +USE_IMAGE_DIGESTS ?= false +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.31.0 + +# Image URL to use all building/pushing image targets +IMG ?= $(IMAGE_TAG_BASE)-operator:$(VERSION) + +.PHONY: all +all: docker-build + +##@ General + +# 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 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. +# More info on the usage of ANSI control characters for terminal formatting: +# https://en.wikipedia.org/wiki/ANSI_escape_code#SGR_parameters +# More info on the awk command: +# http://linuxcommand.org/lc3_adv_awk.php + +.PHONY: help +help: ## Display this help. + @awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST) + +##@ Build + +.PHONY: run +run: helm-operator ## Run against the configured Kubernetes cluster in ~/.kube/config + $(HELM_OPERATOR) run + +.PHONY: docker-build +docker-build: ## Build docker image with the manager. + cp -r ../helm-charts . + docker build -t ${IMG} . + rm -rf helm-charts + +.PHONY: docker-push +docker-push: ## Push docker image with the manager. + docker push ${IMG} + +# PLATFORMS defines the target platforms for the manager image be build to provide support to multiple +# architectures. (i.e. make docker-buildx IMG=myregistry/mypoperator:0.0.1). To use this option you need to: +# - able to use docker buildx . More info: https://docs.docker.com/build/buildx/ +# - have enable BuildKit, More info: https://docs.docker.com/develop/develop-images/build_enhancements/ +# - be able to push the image for your registry (i.e. if you do not inform a valid value via IMG=> than the export will fail) +# To properly provided solutions that supports more than one platform you should use this option. +PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le +.PHONY: docker-buildx +docker-buildx: test ## 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 + - docker buildx create --name project-v3-builder + docker buildx use project-v3-builder + - docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross . + - docker buildx rm project-v3-builder + rm Dockerfile.cross + +##@ Deployment + +.PHONY: install +install: kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config. + $(KUSTOMIZE) build config/crd | kubectl apply -f - + +.PHONY: uninstall +uninstall: kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config. + $(KUSTOMIZE) build config/crd | kubectl delete -f - + +.PHONY: deploy +deploy: 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 - + +.PHONY: undeploy +undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config. + $(KUSTOMIZE) build config/default | kubectl delete -f - + +OS := $(shell uname -s | tr '[:upper:]' '[:lower:]') +ARCH := $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/') + +.PHONY: kustomize +KUSTOMIZE = $(shell pwd)/bin/kustomize +kustomize: ## Download kustomize locally if necessary. +ifeq (,$(wildcard $(KUSTOMIZE))) +ifeq (,$(shell which kustomize 2>/dev/null)) + @{ \ + set -e ;\ + mkdir -p $(dir $(KUSTOMIZE)) ;\ + curl -sSLo - https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v4.5.7/kustomize_v4.5.7_$(OS)_$(ARCH).tar.gz | \ + tar xzf - -C bin/ ;\ + } +else +KUSTOMIZE = $(shell which kustomize) +endif +endif + +.PHONY: helm-operator +HELM_OPERATOR = $(shell pwd)/bin/helm-operator +helm-operator: ## Download helm-operator locally if necessary, preferring the $(pwd)/bin path over global if both exist. +ifeq (,$(wildcard $(HELM_OPERATOR))) +ifeq (,$(shell which helm-operator 2>/dev/null)) + @{ \ + set -e ;\ + mkdir -p $(dir $(HELM_OPERATOR)) ;\ + curl -sSLo $(HELM_OPERATOR) https://github.com/operator-framework/operator-sdk/releases/download/v1.31.0/helm-operator_$(OS)_$(ARCH) ;\ + chmod +x $(HELM_OPERATOR) ;\ + } +else +HELM_OPERATOR = $(shell which helm-operator) +endif +endif + +.PHONY: operator-sdk +OPERATOR_SDK ?= ./bin/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)) ;\ + 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: kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files. + @echo 'changing the image tag to '${VERSION}' in "containerImage" field in the CSV using yq' + @cat config/manifests/bases/move2kube-operator.clusterserviceversion.yaml + yq eval --exit-status --inplace ".metadata.annotations.containerImage=\"quay.io/konveyor/move2kube-operator:${VERSION}\"" config/manifests/bases/move2kube-operator.clusterserviceversion.yaml + @echo 'after editting the CSV' + @cat config/manifests/bases/move2kube-operator.clusterserviceversion.yaml + $(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 + +.PHONY: bundle-build +bundle-build: ## Build the bundle image. + 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 = ./bin/opm +opm: ## Download opm locally if necessary. +ifeq (,$(wildcard $(OPM))) +ifeq (,$(shell which opm 2>/dev/null)) + @{ \ + set -e ;\ + mkdir -p $(dir $(OPM)) ;\ + curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.23.0/$(OS)-$(ARCH)-opm ;\ + chmod +x $(OPM) ;\ + } +else +OPM = $(shell which opm) +endif +endif + +# A comma-separated list of bundle images (e.g. make catalog-build BUNDLE_IMGS=example.com/operator-bundle:v0.1.0,example.com/operator-bundle:v0.2.0). +# These images MUST exist in a registry and be pull-able. +BUNDLE_IMGS ?= $(BUNDLE_IMG) + +# The image tag given to the resulting catalog image (e.g. make catalog-build CATALOG_IMG=example.com/operator-catalog:v0.2.0). +CATALOG_IMG ?= $(IMAGE_TAG_BASE)-catalog:v$(VERSION_WITHOUT_V) + +# Set CATALOG_BASE_IMG to an existing catalog image tag to add $BUNDLE_IMGS to that image. +ifneq ($(origin CATALOG_BASE_IMG), undefined) +FROM_INDEX_OPT := --from-index $(CATALOG_BASE_IMG) +endif + +# Build a catalog image by adding bundle images to an empty catalog using the operator package manager tool, 'opm'. +# This recipe invokes 'opm' in 'semver' bundle add mode. For more information on add modes, see: +# 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 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) diff --git a/operator/PROJECT b/operator/PROJECT new file mode 100644 index 0000000..9e2c64e --- /dev/null +++ b/operator/PROJECT @@ -0,0 +1,20 @@ +# 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: konveyor.io +layout: +- helm.sdk.operatorframework.io/v1 +plugins: + manifests.sdk.operatorframework.io/v2: {} + scorecard.sdk.operatorframework.io/v2: {} +projectName: move2kube-operator +resources: +- api: + crdVersion: v1 + namespaced: true + domain: konveyor.io + group: move2kube + kind: Move2Kube + version: v1alpha1 +version: "3" diff --git a/operator/README.md b/operator/README.md new file mode 100644 index 0000000..f5bcd4a --- /dev/null +++ b/operator/README.md @@ -0,0 +1,34 @@ +[![Docker Repository on Quay](https://quay.io/repository/konveyor/move2kube-operator/status "Docker Repository on Quay")](https://quay.io/repository/konveyor/move2kube-operator) +[![License](https://img.shields.io/:license-apache-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) +[![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/konveyor/move2kube-ui/pulls) +[](https://kubernetes.slack.com/archives/CR85S82A2) + +# Move2Kube-Operator + +Operator to orchestrate [Move2Kube UI](https://github.com/konveyor/move2kube-ui) and [API](https://github.com/konveyor/move2kube-api). + +## Prerequisites + +- Kubectl +- Helm 3 +- A Kubernetes cluster + +## Usage + +> A new Golang based operator is in the works + +The instructions below are for installing the current Helm based operator: + +1. Deploy the operator either using the OLM tool or directly: + https://sdk.operatorframework.io/docs/building-operators/helm/quickstart/#olm-deployment + https://sdk.operatorframework.io/docs/building-operators/helm/quickstart/#direct-deployment + +1. Then we can apply the CR. Make sure to edit the CR yaml with the proper values before applying. + ```console + $ kubectl apply -f config/samples/demo_v1alpha1_nginx.yaml + ``` + For more details check https://github.com/konveyor/move2kube-ui/blob/main/helm-charts/move2kube/README.md + +## Discussion + +* For any questions reach out to us on any of the communication channels given on our website https://move2kube.konveyor.io/. diff --git a/operator/bundle.Dockerfile b/operator/bundle.Dockerfile new file mode 100644 index 0000000..6a0f4ab --- /dev/null +++ b/operator/bundle.Dockerfile @@ -0,0 +1,20 @@ +FROM scratch + +# Core bundle labels. +LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1 +LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ +LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ +LABEL operators.operatorframework.io.bundle.package.v1=move2kube-operator +LABEL operators.operatorframework.io.bundle.channels.v1=alpha +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.31.0 +LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 +LABEL operators.operatorframework.io.metrics.project_layout=helm.sdk.operatorframework.io/v1 + +# Labels for testing. +LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1 +LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/ + +# Copy files to locations specified by labels. +COPY bundle/manifests /manifests/ +COPY bundle/metadata /metadata/ +COPY bundle/tests/scorecard /tests/scorecard/ diff --git a/operator/config/crd/bases/konveyor.io_move2kubes.yaml b/operator/config/crd/bases/konveyor.io_move2kubes.yaml new file mode 100644 index 0000000..c8bfd3a --- /dev/null +++ b/operator/config/crd/bases/konveyor.io_move2kubes.yaml @@ -0,0 +1,44 @@ +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: move2kubes.konveyor.io +spec: + group: konveyor.io + names: + kind: Move2Kube + listKind: Move2KubeList + plural: move2kubes + singular: move2kube + scope: Namespaced + versions: + - name: v1alpha1 + schema: + openAPIV3Schema: + description: Move2Kube is the Schema for the move2kubes 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: Spec defines the desired state of Move2Kube + type: object + x-kubernetes-preserve-unknown-fields: true + status: + description: Status defines the observed state of Move2Kube + type: object + x-kubernetes-preserve-unknown-fields: true + type: object + served: true + storage: true + subresources: + status: {} diff --git a/operator/config/crd/bases/move2kube.konveyor.io_move2kubes.yaml b/operator/config/crd/bases/move2kube.konveyor.io_move2kubes.yaml new file mode 100644 index 0000000..979b565 --- /dev/null +++ b/operator/config/crd/bases/move2kube.konveyor.io_move2kubes.yaml @@ -0,0 +1,44 @@ +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: move2kubes.move2kube.konveyor.io +spec: + group: move2kube.konveyor.io + names: + kind: Move2Kube + listKind: Move2KubeList + plural: move2kubes + singular: move2kube + scope: Namespaced + versions: + - name: v1alpha1 + schema: + openAPIV3Schema: + description: Move2Kube is the Schema for the move2kubes 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: Spec defines the desired state of Move2Kube + type: object + x-kubernetes-preserve-unknown-fields: true + status: + description: Status defines the observed state of Move2Kube + type: object + x-kubernetes-preserve-unknown-fields: true + type: object + served: true + storage: true + subresources: + status: {} diff --git a/operator/config/crd/kustomization.yaml b/operator/config/crd/kustomization.yaml new file mode 100644 index 0000000..f1928eb --- /dev/null +++ b/operator/config/crd/kustomization.yaml @@ -0,0 +1,6 @@ +# This kustomization.yaml is not intended to be run by itself, +# since it depends on service name and namespace that are out of this kustomize package. +# It should be run by config/default +resources: +- bases/move2kube.konveyor.io_move2kubes.yaml +#+kubebuilder:scaffold:crdkustomizeresource diff --git a/operator/config/default/kustomization.yaml b/operator/config/default/kustomization.yaml new file mode 100644 index 0000000..9942cf5 --- /dev/null +++ b/operator/config/default/kustomization.yaml @@ -0,0 +1,30 @@ +# Adds namespace to all resources. +namespace: move2kube-operator-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: move2kube-operator- + +# Labels to add to all resources and selectors. +#labels: +#- includeSelectors: true +# pairs: +# someName: someValue + +resources: +- ../crd +- ../rbac +- ../manager +# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'. +#- ../prometheus + +patches: +# 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 + + diff --git a/operator/config/default/manager_auth_proxy_patch.yaml b/operator/config/default/manager_auth_proxy_patch.yaml new file mode 100644 index 0000000..39f7d13 --- /dev/null +++ b/operator/config/default/manager_auth_proxy_patch.yaml @@ -0,0 +1,56 @@ +# 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: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.io/arch + operator: In + values: + - amd64 + - arm64 + - ppc64le + - s390x + - key: kubernetes.io/os + operator: In + values: + - linux + containers: + - name: kube-rbac-proxy + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - "ALL" + image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1 + 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" + - "--leader-election-id=move2kube-operator" diff --git a/operator/config/default/manager_config_patch.yaml b/operator/config/default/manager_config_patch.yaml new file mode 100644 index 0000000..f6f5891 --- /dev/null +++ b/operator/config/default/manager_config_patch.yaml @@ -0,0 +1,10 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: controller-manager + namespace: system +spec: + template: + spec: + containers: + - name: manager diff --git a/operator/config/manager/kustomization.yaml b/operator/config/manager/kustomization.yaml new file mode 100644 index 0000000..64e844e --- /dev/null +++ b/operator/config/manager/kustomization.yaml @@ -0,0 +1,8 @@ +resources: +- manager.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +images: +- name: controller + newName: quay.io/konveyor/move2kube-operator + newTag: v0.3.10-rc.0 diff --git a/operator/config/manager/manager.yaml b/operator/config/manager/manager.yaml new file mode 100644 index 0000000..276a651 --- /dev/null +++ b/operator/config/manager/manager.yaml @@ -0,0 +1,101 @@ +apiVersion: v1 +kind: Namespace +metadata: + labels: + control-plane: controller-manager + app.kubernetes.io/name: namespace + app.kubernetes.io/instance: system + app.kubernetes.io/component: manager + app.kubernetes.io/created-by: move2kube-operator + app.kubernetes.io/part-of: move2kube-operator + app.kubernetes.io/managed-by: kustomize + name: system +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + 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: move2kube-operator + app.kubernetes.io/part-of: move2kube-operator + app.kubernetes.io/managed-by: kustomize +spec: + selector: + matchLabels: + control-plane: controller-manager + replicas: 1 + template: + metadata: + annotations: + kubectl.kubernetes.io/default-container: manager + labels: + 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: + - args: + - --leader-elect + - --leader-election-id=move2kube-operator + image: controller:latest + name: manager + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - "ALL" + livenessProbe: + httpGet: + path: /healthz + port: 8081 + initialDelaySeconds: 15 + periodSeconds: 20 + readinessProbe: + httpGet: + path: /readyz + port: 8081 + initialDelaySeconds: 5 + periodSeconds: 10 + # TODO(user): Configure the resources accordingly based on the project requirements. + # More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + resources: + limits: + cpu: 1 + memory: 1Gi + requests: + cpu: 100m + memory: 128Mi + serviceAccountName: controller-manager + terminationGracePeriodSeconds: 10 diff --git a/operator/config/manifests/bases/move2kube-operator.clusterserviceversion.yaml b/operator/config/manifests/bases/move2kube-operator.clusterserviceversion.yaml new file mode 100644 index 0000000..05c2539 --- /dev/null +++ b/operator/config/manifests/bases/move2kube-operator.clusterserviceversion.yaml @@ -0,0 +1,82 @@ +apiVersion: operators.coreos.com/v1alpha1 +kind: ClusterServiceVersion +metadata: + annotations: + alm-examples: '[]' + capabilities: Seamless Upgrades + categories: Modernization & Migration + containerImage: quay.io/konveyor/move2kube-operator:v0.3.10-rc.0 + description: Konveyor Move2Kube is an open source tool that helps migrate your + app to run on Kubernetes/Openshift. + repository: https://github.com/konveyor/move2kube-operator + support: https://github.com/konveyor/move2kube-operator/issues + name: move2kube-operator.v0.0.0 + namespace: placeholder +spec: + apiservicedefinitions: {} + customresourcedefinitions: {} + description: | + Konveyor Move2Kube is a tool that uses source files such as Docker Compose files or Cloud Foundry manifest files, and even source code, to generate Kubernetes deployment files including object yaml, Helm charts, and operators. + + This operator can be used to start an instance of the Move2Kube UI. + + ### Install + + Once you have successfully installed the Operator, proceed to deploy components by creating the required Move2Kube CR. + + By default the operator installs a StatefulSet that brings up a Pod that serves the UI. + See https://move2kube.konveyor.io/tutorials/ui for a tutorial on how to use the UI. + + Data persistence can be enabled by setting the `persistentVolumeClaim.enable` field to `true` in the CR `spec`. https://github.com/konveyor/move2kube-operator/blob/0e79476bcd873d3272164a47af31b00590dacfb1/helm-charts/move2kube/values.yaml#L26 + + ### Documentation + + See https://move2kube.konveyor.io/ for more details. + + ### Getting help + + If you encounter any issues while using this operator, you can create an issue on our [Github repo](https://github.com/konveyor/move2kube-operator/issues), for bugs, enhancements or other requests. + Or reach out to us in [#konveyor](https://kubernetes.slack.com/archives/CR85S82A2) on kubernetes.slack.com + + ### Contributing + + You can contribute by making PRs to our Github repo https://github.com/konveyor/move2kube-operator + displayName: Konveyor Move2Kube + icon: + - base64data: <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="60mm"
   height="60mm"
   viewBox="0 0 60 60"
   version="1.1"
   id="svg64973"
   sodipodi:docname="konveyor-logo-move2kube.svg"
   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
  <defs
     id="defs64967" />
  <sodipodi:namedview
     id="base"
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="1.4142136"
     inkscape:cx="780.09858"
     inkscape:cy="282.80935"
     inkscape:document-units="mm"
     inkscape:current-layer="layer1"
     inkscape:document-rotation="0"
     showgrid="false"
     fit-margin-top="6"
     lock-margins="true"
     fit-margin-left="6"
     fit-margin-right="6"
     fit-margin-bottom="6"
     inkscape:window-width="3840"
     inkscape:window-height="1136"
     inkscape:window-x="0"
     inkscape:window-y="27"
     inkscape:window-maximized="1"
     inkscape:snap-page="true" />
  <metadata
     id="metadata64970">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <g
     inkscape:label="Layer 1"
     inkscape:groupmode="layer"
     id="layer1"
     transform="translate(-4.3148108,-7.706439)">
    <rect
       style="fill:#333481;fill-opacity:1;stroke-width:0.110915;stroke-linecap:round;stop-color:#000000"
       id="rect1021"
       width="60"
       height="60"
       x="4.3148108"
       y="7.706439" />
    <g
       id="g69575"
       transform="translate(-255.45756,-11.335622)">
      <g
         aria-label="MOVE2KUBE"
         transform="matrix(1.0317449,0,0,0.96923184,0,5.2916666)"
         id="text3286"
         style="font-style:normal;font-weight:normal;font-size:5.49378px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.201069">
        <path
           d="m 266.27379,60.142433 v -2.054674 l -0.65376,1.444865 h -0.57135 l -0.65376,-1.444865 v 2.054674 h -1.07129 v -3.900584 h 1.17018 l 0.84054,1.834923 0.84605,-1.834923 h 1.16468 v 3.900584 z"
           style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:Raleway;-inkscape-font-specification:'Raleway Heavy';text-align:center;text-anchor:middle;fill:#ffffff;stroke-width:0.201069"
           id="path65735" />
        <path
           d="m 269.77332,60.175396 q -0.445,0 -0.80759,-0.170307 -0.36259,-0.170308 -0.62079,-0.444997 -0.25821,-0.280182 -0.40105,-0.637278 -0.14284,-0.357096 -0.14284,-0.736167 0,-0.384564 0.14833,-0.74166 0.14834,-0.357096 0.41204,-0.626291 0.26919,-0.274689 0.63178,-0.434008 0.36808,-0.164814 0.80209,-0.164814 0.445,0 0.80759,0.170307 0.36259,0.170308 0.6208,0.45049 0.2582,0.280183 0.39555,0.637279 0.14284,0.357096 0.14284,0.730673 0,0.384564 -0.14834,0.74166 -0.14833,0.351602 -0.41203,0.626291 -0.2637,0.269195 -0.63178,0.434008 -0.36259,0.164814 -0.7966,0.164814 z m -0.8845,-1.977761 q 0,0.197776 0.0549,0.384565 0.0549,0.181294 0.16481,0.324133 0.10988,0.142838 0.27469,0.230738 0.17031,0.0879 0.40105,0.0879 0.23073,0 0.40104,-0.0879 0.17031,-0.09339 0.27469,-0.236232 0.10988,-0.148332 0.15932,-0.335121 0.0549,-0.186788 0.0549,-0.379071 0,-0.197776 -0.0549,-0.37907 -0.0549,-0.186789 -0.17031,-0.324133 -0.10987,-0.142839 -0.28018,-0.225245 -0.16481,-0.0879 -0.39006,-0.0879 -0.23074,0 -0.40104,0.0879 -0.16482,0.0879 -0.27469,0.236232 -0.10988,0.142838 -0.16482,0.329627 -0.0494,0.181295 -0.0494,0.373577 z"
           style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:Raleway;-inkscape-font-specification:'Raleway Heavy';text-align:center;text-anchor:middle;fill:#ffffff;stroke-width:0.201069"
           id="path65737" />
        <path
           d="m 272.81686,56.241849 0.76364,2.554608 0.75264,-2.554608 h 1.12623 l -1.43388,3.900584 h -0.88999 l -1.45036,-3.900584 z"
           style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:Raleway;-inkscape-font-specification:'Raleway Heavy';text-align:center;text-anchor:middle;fill:#ffffff;stroke-width:0.201069"
           id="path65739" />
        <path
           d="m 278.53588,59.208491 v 0.933942 h -2.77985 v -3.900584 h 2.73041 v 0.933943 h -1.65913 v 0.549378 h 1.4174 v 0.868017 h -1.4174 v 0.615304 z"
           style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:Raleway;-inkscape-font-specification:'Raleway Heavy';text-align:center;text-anchor:middle;fill:#ffffff;stroke-width:0.201069"
           id="path65741" />
        <path
           d="m 279.03088,60.407016 q 0,-0.397933 0.0593,-0.7112 0.0593,-0.313267 0.2032,-0.567267 0.14393,-0.262466 0.38947,-0.4826 0.24553,-0.220133 0.61806,-0.4318 0.39794,-0.220133 0.6604,-0.364067 0.27094,-0.143933 0.42334,-0.254 0.16086,-0.110067 0.2286,-0.194733 0.0677,-0.09313 0.0677,-0.211667 0,-0.237067 -0.16933,-0.381 -0.16934,-0.143934 -0.4826,-0.143934 -0.3556,0 -0.61807,0.1778 -0.26247,0.169334 -0.508,0.448734 l -0.8636,-0.999067 q 0.13547,-0.1524 0.36407,-0.296334 0.2286,-0.143933 0.51646,-0.254 0.28787,-0.118533 0.62654,-0.186266 0.34713,-0.06773 0.71966,-0.06773 0.9144,0 1.397,0.397934 0.49107,0.397933 0.49107,1.075267 0,0.2794 -0.0931,0.499533 -0.0847,0.220134 -0.2286,0.397934 -0.14394,0.169333 -0.32174,0.3048 -0.1778,0.127 -0.36406,0.237067 -0.127,0.0762 -0.3048,0.1778 -0.1778,0.1016 -0.3556,0.211667 -0.16934,0.1016 -0.32174,0.211666 -0.14393,0.1016 -0.22013,0.186267 h 2.30293 v 1.2192 z"
           style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:8.46667px;font-family:Raleway;-inkscape-font-specification:'Raleway Ultra-Bold';stroke-width:0.201069"
           id="path65743" />
        <path
           d="m 283.94647,60.142433 v -3.900584 h 1.07129 v 1.483321 l 1.18666,-1.483321 h 1.20863 l -1.4174,1.747022 1.51628,2.153562 h -1.2306 l -0.96691,-1.433876 -0.29666,0.307651 v 1.126225 z"
           style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:Raleway;-inkscape-font-specification:'Raleway Heavy';text-align:center;text-anchor:middle;fill:#ffffff;stroke-width:0.201069"
           id="path65745" />
        <path
           d="m 289.44024,59.224972 q 0.18679,0 0.31864,-0.08241 0.13185,-0.08241 0.21426,-0.214257 0.0824,-0.137345 0.12086,-0.313146 0.0385,-0.175801 0.0385,-0.368083 v -2.00523 h 1.07129 v 2.00523 q 0,0.40654 -0.10438,0.763635 -0.10439,0.351602 -0.32414,0.60981 -0.21975,0.258208 -0.55487,0.40654 -0.32963,0.148332 -0.78012,0.148332 -0.46697,0 -0.80209,-0.153826 -0.32962,-0.15932 -0.54388,-0.423021 -0.21426,-0.263702 -0.31315,-0.60981 -0.0989,-0.351602 -0.0989,-0.74166 v -2.00523 h 1.07129 v 2.00523 q 0,0.192282 0.0385,0.373577 0.0384,0.175801 0.12086,0.313146 0.0824,0.13185 0.20877,0.214257 0.13185,0.07691 0.31863,0.07691 z"
           style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:Raleway;-inkscape-font-specification:'Raleway Heavy';text-align:center;text-anchor:middle;fill:#ffffff;stroke-width:0.201069"
           id="path65747" />
        <path
           d="m 295.13728,59.142565 q 0,0.263702 -0.10987,0.455984 -0.10988,0.186788 -0.30216,0.307652 -0.19228,0.120863 -0.45049,0.181294 -0.25271,0.05494 -0.53839,0.05494 h -1.91733 v -3.900584 h 2.26344 q 0.20327,0 0.36808,0.0879 0.16481,0.0879 0.28018,0.230739 0.11537,0.137344 0.1758,0.318639 0.0659,0.175801 0.0659,0.362589 0,0.274689 -0.14284,0.527403 -0.13734,0.24722 -0.41753,0.373577 0.33512,0.09889 0.52741,0.346108 0.19777,0.241727 0.19777,0.65376 z m -1.08777,-0.219751 q 0,-0.142838 -0.0769,-0.236233 -0.0769,-0.09889 -0.19777,-0.09889 h -0.8845 v 0.65376 h 0.84604 q 0.13185,0 0.21975,-0.08241 0.0934,-0.08241 0.0934,-0.236233 z m -1.15918,-1.768997 v 0.598822 h 0.73067 q 0.10988,0 0.19778,-0.06043 0.0934,-0.06043 0.0934,-0.241726 0,-0.15932 -0.0769,-0.225245 -0.0769,-0.07142 -0.1813,-0.07142 z"
           style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:Raleway;-inkscape-font-specification:'Raleway Heavy';text-align:center;text-anchor:middle;fill:#ffffff;stroke-width:0.201069"
           id="path65749" />
        <path
           d="m 298.38959,59.208491 v 0.933942 h -2.77985 v -3.900584 h 2.73041 v 0.933943 h -1.65912 v 0.549378 h 1.41739 v 0.868017 h -1.41739 v 0.615304 z"
           style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:Raleway;-inkscape-font-specification:'Raleway Heavy';text-align:center;text-anchor:middle;fill:#ffffff;stroke-width:0.201069"
           id="path65751" />
      </g>
      <g
         id="g69386"
         transform="translate(0,2.6458333)">
        <path
           style="color:#000000;display:inline;overflow:visible;vector-effect:none;fill:#ac9565;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.0479311;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
           d="m 291.7963,40.783495 c 0.11248,0.0463 0.16582,0.17459 0.11949,0.28698 l -3.26517,7.92349 c -0.0465,0.11237 -0.17457,0.16579 -0.28697,0.11947 l -7.92339,-3.26541 c -0.11242,-0.0464 -0.16528,-0.17437 -0.11896,-0.28677 l 3.26517,-7.92349 c 0.0465,-0.11237 0.17399,-0.16603 0.28646,-0.11968 z m -3.41553,-0.0934 -2.01829,-0.83175 c -0.18185,-0.075 -0.38833,0.011 -0.46326,0.19286 -0.075,0.18185 0.0111,0.38831 0.19285,0.46326 l 2.0183,0.83175 c 0.18185,0.075 0.3888,-0.0108 0.46376,-0.19265 0.075,-0.18185 -0.0114,-0.38852 -0.19336,-0.46347 z"
           id="path3298"
           inkscape:connector-curvature="0"
           sodipodi:nodetypes="sccssccssccsccsc" />
        <path
           style="fill:none;stroke:#ffffff;stroke-width:0.897001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
           d="m 301.67275,32.246715 -4.95281,1.96963 c -0.42831,0.17204 -0.80421,0.57966 -1.05426,1.16545 l -6.44565,15.38579 -5.96474,-2.39722"
           id="path3300"
           sodipodi:nodetypes="ccccc" />
        <path
           id="circle3304"
           style="fill:none;stroke:#ffffff;stroke-width:1.23487;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:59.5276;paint-order:stroke fill markers;stop-color:#000000"
           d="m 295.3574,50.206536 a 1.8489143,1.8489143 0 0 1 -1.78196,1.913529 1.8489143,1.8489143 0 0 1 -1.91352,-1.781957 1.8489143,1.8489143 0 0 1 1.78195,-1.913529 1.8489143,1.8489143 0 0 1 1.91353,1.781957 z" />
        <path
           style="fill:none;stroke:#ffffff;stroke-width:1.297;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
           d="m 301.67275,32.246715 -3.66294,1.45668"
           id="path3318"
           sodipodi:nodetypes="cc" />
        <path
           style="fill:#ffffff;stroke:none;stroke-width:1.43581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
           d="m 292.66289,43.625465 0.93062,3.64478 c -0.28585,-0.006 -0.60269,0.0207 -0.79671,0.0536 l -0.64352,-2.67028 z"
           id="path2572-1"
           sodipodi:nodetypes="ccccc" />
        <path
           style="fill:#ffffff;stroke:none;stroke-width:1.43581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
           d="m 289.21016,51.215405 1.49656,-0.002 c -0.0771,-0.27532 -0.1298,-0.58892 -0.14615,-0.78503 l -1.03648,0.0153 z"
           id="path3341"
           sodipodi:nodetypes="ccccc" />
      </g>
      <g
         id="g69339"
         transform="matrix(0.54535504,0,0,0.54535504,235.65024,-41.621421)">
        <g
           style="display:inline"
           id="g69337"
           transform="matrix(0.36700213,0,0,0.36700213,22.822023,85.613794)">
          <g
             id="g69335"
             style="fill:#ffffff"
             transform="matrix(1.0329332,0,0,1.0329332,103.14109,74.914583)">
            <path
               inkscape:connector-curvature="0"
               id="path69319"
               d="m 27.732234,175.75993 c -3.167626,0 -5.763897,2.59627 -5.763897,5.76389 0,3.16765 2.596271,5.76349 5.763897,5.76349 3.167648,0 5.763897,-2.59584 5.763897,-5.76349 0,-3.16762 -2.596249,-5.76389 -5.763897,-5.76389 z m 0,2.63951 c 1.741224,0 3.124407,1.38316 3.124407,3.12438 0,1.74125 -1.383183,3.12441 -3.124407,3.12441 -1.741224,0 -3.124385,-1.38316 -3.124385,-3.12441 0,-1.74122 1.383161,-3.12438 3.124385,-3.12438 z"
               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.63935;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
            <path
               inkscape:connector-curvature="0"
               id="path69321"
               style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:64.0488px;line-height:1.25;font-family:Raleway;-inkscape-font-specification:'Raleway Heavy';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.345676"
               d="m 14.236107,186.43228 v -9.8172 h 2.696268 v 3.7333 l 2.986652,-3.7333 h 3.041939 l -3.567376,4.39699 3.816267,5.42021 h -3.097248 l -2.43356,-3.60886 -0.746674,0.77432 v 2.83454 z" />
            <path
               inkscape:connector-curvature="0"
               id="path69323"
               style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:64.0488px;line-height:1.25;font-family:Raleway;-inkscape-font-specification:'Raleway Heavy';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.345676"
               d="m 37.033673,181.60664 v 4.82564 h -2.69629 v -9.8172 h 2.101727 l 3.940703,4.99156 v -4.99156 h 2.696268 v 9.8172 h -2.143198 z" />
            <path
               inkscape:connector-curvature="0"
               id="path69325"
               style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:64.0488px;line-height:1.25;font-family:Raleway;-inkscape-font-specification:'Raleway Heavy';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.345676"
               d="m 46.657273,176.61508 1.921962,6.42957 1.894306,-6.42957 h 2.834541 l -3.608848,9.8172 h -2.239999 l -3.650319,-9.8172 z" />
            <path
               inkscape:connector-curvature="0"
               id="path69327"
               style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:64.0488px;line-height:1.25;font-family:Raleway;-inkscape-font-specification:'Raleway Heavy';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.345676"
               d="m 61.051214,184.08169 v 2.35059 h -6.99648 v -9.8172 h 6.872024 v 2.3506 h -4.175756 v 1.3827 h 3.567376 v 2.18467 h -3.567376 v 1.54864 z" />
            <path
               inkscape:connector-curvature="0"
               id="path69329"
               style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:64.0488px;line-height:1.25;font-family:Raleway;-inkscape-font-specification:'Raleway Heavy';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.345676"
               d="m 64.30053,176.61508 1.756034,4.2449 1.797526,-4.2449 h 2.931321 l -3.387611,6.56785 v 3.24935 h -2.682451 v -3.27701 l -3.332323,-6.54019 z" />
            <path
               inkscape:connector-curvature="0"
               id="path69331"
               style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:64.0488px;line-height:1.25;font-family:Raleway;-inkscape-font-specification:'Raleway Heavy';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.345676"
               d="m 82.15587,186.43228 v -9.8172 h 4.507611 q 0.719019,0 1.327398,0.3042 0.60838,0.29036 1.037036,0.77431 0.442452,0.47013 0.691343,1.09234 0.248892,0.60838 0.248892,1.2306 0,0.85729 -0.373326,1.60394 -0.373348,0.73284 -1.037036,1.20295 l 2.07405,3.60886 h -3.041939 l -1.728379,-3.0143 h -1.009382 v 3.0143 z m 2.696268,-5.3649 h 1.700725 q 0.248891,0 0.456289,-0.27652 0.221237,-0.27655 0.221237,-0.77433 0,-0.5116 -0.248891,-0.77431 -0.24887,-0.27654 -0.497761,-0.27654 h -1.631599 z" />
            <path
               inkscape:connector-curvature="0"
               id="path69333"
               d="m 75.651884,175.75993 c -3.167627,0 -5.763897,2.59627 -5.763897,5.76389 0,3.16765 2.59627,5.76349 5.763897,5.76349 3.167648,0 5.763897,-2.59584 5.763897,-5.76349 0,-3.16762 -2.596249,-5.76389 -5.763897,-5.76389 z m 0,2.63951 c 1.741224,0 3.124406,1.38316 3.124406,3.12438 0,1.74125 -1.383182,3.12441 -3.124406,3.12441 -1.741224,0 -3.124385,-1.38316 -3.124385,-3.12441 0,-1.74122 1.383161,-3.12438 3.124385,-3.12438 z"
               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.63935;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
          </g>
        </g>
      </g>
    </g>
  </g>
</svg>
 + mediatype: image/svg+xml + install: + spec: + deployments: null + strategy: "" + installModes: + - supported: false + type: OwnNamespace + - supported: false + type: SingleNamespace + - supported: false + type: MultiNamespace + - supported: true + type: AllNamespaces + keywords: + - kubernetes + - modernization + - replatform + - move2kube + - konveyor + - migration + links: + - name: Documentation + url: https://move2kube.konveyor.io/ + - name: Move2Kube Operator + url: https://github.com/konveyor/move2kube-operator + maintainers: + - email: harikrishmenon@gmail.com + name: Harikrishnan Balagopal + - email: seshapad@in.ibm.com + name: Padmanabha V Seshadri + maturity: alpha + provider: + name: Konveyor + url: https://konveyor.io + version: 0.0.0 diff --git a/operator/config/manifests/kustomization.yaml b/operator/config/manifests/kustomization.yaml new file mode 100644 index 0000000..eea628d --- /dev/null +++ b/operator/config/manifests/kustomization.yaml @@ -0,0 +1,7 @@ +# These resources constitute the fully configured set of manifests +# used to generate the 'manifests/' directory in a bundle. +resources: +- bases/move2kube-operator.clusterserviceversion.yaml +- ../default +- ../samples +- ../scorecard diff --git a/operator/config/prometheus/kustomization.yaml b/operator/config/prometheus/kustomization.yaml new file mode 100644 index 0000000..ed13716 --- /dev/null +++ b/operator/config/prometheus/kustomization.yaml @@ -0,0 +1,2 @@ +resources: +- monitor.yaml diff --git a/operator/config/prometheus/monitor.yaml b/operator/config/prometheus/monitor.yaml new file mode 100644 index 0000000..7bbb9c2 --- /dev/null +++ b/operator/config/prometheus/monitor.yaml @@ -0,0 +1,26 @@ + +# Prometheus Monitor Service (Metrics) +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + labels: + control-plane: controller-manager + app.kubernetes.io/name: servicemonitor + app.kubernetes.io/instance: controller-manager-metrics-monitor + app.kubernetes.io/component: metrics + app.kubernetes.io/created-by: move2kube-operator + app.kubernetes.io/part-of: move2kube-operator + app.kubernetes.io/managed-by: kustomize + name: controller-manager-metrics-monitor + namespace: system +spec: + endpoints: + - path: /metrics + port: https + scheme: https + bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token + tlsConfig: + insecureSkipVerify: true + selector: + matchLabels: + control-plane: controller-manager diff --git a/operator/config/rbac/auth_proxy_client_clusterrole.yaml b/operator/config/rbac/auth_proxy_client_clusterrole.yaml new file mode 100644 index 0000000..4674928 --- /dev/null +++ b/operator/config/rbac/auth_proxy_client_clusterrole.yaml @@ -0,0 +1,16 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + labels: + app.kubernetes.io/name: clusterrole + app.kubernetes.io/instance: metrics-reader + app.kubernetes.io/component: kube-rbac-proxy + app.kubernetes.io/created-by: move2kube-operator + app.kubernetes.io/part-of: move2kube-operator + app.kubernetes.io/managed-by: kustomize + name: metrics-reader +rules: +- nonResourceURLs: + - "/metrics" + verbs: + - get diff --git a/operator/config/rbac/auth_proxy_role.yaml b/operator/config/rbac/auth_proxy_role.yaml new file mode 100644 index 0000000..f6905fb --- /dev/null +++ b/operator/config/rbac/auth_proxy_role.yaml @@ -0,0 +1,24 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + labels: + app.kubernetes.io/name: clusterrole + app.kubernetes.io/instance: proxy-role + app.kubernetes.io/component: kube-rbac-proxy + app.kubernetes.io/created-by: move2kube-operator + app.kubernetes.io/part-of: move2kube-operator + app.kubernetes.io/managed-by: kustomize + name: proxy-role +rules: +- apiGroups: + - authentication.k8s.io + resources: + - tokenreviews + verbs: + - create +- apiGroups: + - authorization.k8s.io + resources: + - subjectaccessreviews + verbs: + - create diff --git a/operator/config/rbac/auth_proxy_role_binding.yaml b/operator/config/rbac/auth_proxy_role_binding.yaml new file mode 100644 index 0000000..bc3ca8c --- /dev/null +++ b/operator/config/rbac/auth_proxy_role_binding.yaml @@ -0,0 +1,19 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + labels: + app.kubernetes.io/name: clusterrolebinding + app.kubernetes.io/instance: proxy-rolebinding + app.kubernetes.io/component: kube-rbac-proxy + app.kubernetes.io/created-by: move2kube-operator + app.kubernetes.io/part-of: move2kube-operator + app.kubernetes.io/managed-by: kustomize + name: proxy-rolebinding +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: proxy-role +subjects: +- kind: ServiceAccount + name: controller-manager + namespace: system diff --git a/operator/config/rbac/auth_proxy_service.yaml b/operator/config/rbac/auth_proxy_service.yaml new file mode 100644 index 0000000..e2799ec --- /dev/null +++ b/operator/config/rbac/auth_proxy_service.yaml @@ -0,0 +1,21 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + control-plane: controller-manager + app.kubernetes.io/name: service + app.kubernetes.io/instance: controller-manager-metrics-service + app.kubernetes.io/component: kube-rbac-proxy + app.kubernetes.io/created-by: move2kube-operator + app.kubernetes.io/part-of: move2kube-operator + app.kubernetes.io/managed-by: kustomize + name: controller-manager-metrics-service + namespace: system +spec: + ports: + - name: https + port: 8443 + protocol: TCP + targetPort: https + selector: + control-plane: controller-manager diff --git a/operator/config/rbac/kustomization.yaml b/operator/config/rbac/kustomization.yaml new file mode 100644 index 0000000..731832a --- /dev/null +++ b/operator/config/rbac/kustomization.yaml @@ -0,0 +1,18 @@ +resources: +# All RBAC will be applied under this service account in +# the deployment namespace. You may comment out this resource +# if your manager will use a service account that exists at +# runtime. Be sure to update RoleBinding and ClusterRoleBinding +# subjects if changing service account names. +- service_account.yaml +- role.yaml +- role_binding.yaml +- leader_election_role.yaml +- leader_election_role_binding.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 diff --git a/operator/config/rbac/leader_election_role.yaml b/operator/config/rbac/leader_election_role.yaml new file mode 100644 index 0000000..45caac0 --- /dev/null +++ b/operator/config/rbac/leader_election_role.yaml @@ -0,0 +1,44 @@ +# permissions to do leader election. +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: move2kube-operator + app.kubernetes.io/part-of: move2kube-operator + app.kubernetes.io/managed-by: kustomize + name: leader-election-role +rules: +- apiGroups: + - "" + resources: + - configmaps + verbs: + - get + - list + - watch + - create + - update + - patch + - delete +- apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - get + - list + - watch + - create + - update + - patch + - delete +- apiGroups: + - "" + resources: + - events + verbs: + - create + - patch diff --git a/operator/config/rbac/leader_election_role_binding.yaml b/operator/config/rbac/leader_election_role_binding.yaml new file mode 100644 index 0000000..ceee280 --- /dev/null +++ b/operator/config/rbac/leader_election_role_binding.yaml @@ -0,0 +1,19 @@ +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: move2kube-operator + app.kubernetes.io/part-of: move2kube-operator + app.kubernetes.io/managed-by: kustomize + name: leader-election-rolebinding +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: leader-election-role +subjects: +- kind: ServiceAccount + name: controller-manager + namespace: system diff --git a/operator/config/rbac/move2kube_editor_role.yaml b/operator/config/rbac/move2kube_editor_role.yaml new file mode 100644 index 0000000..66f5051 --- /dev/null +++ b/operator/config/rbac/move2kube_editor_role.yaml @@ -0,0 +1,31 @@ +# permissions for end users to edit move2kubes. +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + labels: + app.kubernetes.io/name: clusterrole + app.kubernetes.io/instance: move2kube-editor-role + app.kubernetes.io/component: rbac + app.kubernetes.io/created-by: move2kube-operator + app.kubernetes.io/part-of: move2kube-operator + app.kubernetes.io/managed-by: kustomize + name: move2kube-editor-role +rules: +- apiGroups: + - move2kube.konveyor.io + resources: + - move2kubes + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - move2kube.konveyor.io + resources: + - move2kubes/status + verbs: + - get diff --git a/operator/config/rbac/move2kube_viewer_role.yaml b/operator/config/rbac/move2kube_viewer_role.yaml new file mode 100644 index 0000000..8db1607 --- /dev/null +++ b/operator/config/rbac/move2kube_viewer_role.yaml @@ -0,0 +1,27 @@ +# permissions for end users to view move2kubes. +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + labels: + app.kubernetes.io/name: clusterrole + app.kubernetes.io/instance: move2kube-viewer-role + app.kubernetes.io/component: rbac + app.kubernetes.io/created-by: move2kube-operator + app.kubernetes.io/part-of: move2kube-operator + app.kubernetes.io/managed-by: kustomize + name: move2kube-viewer-role +rules: +- apiGroups: + - move2kube.konveyor.io + resources: + - move2kubes + verbs: + - get + - list + - watch +- apiGroups: + - move2kube.konveyor.io + resources: + - move2kubes/status + verbs: + - get diff --git a/operator/config/rbac/role.yaml b/operator/config/rbac/role.yaml new file mode 100644 index 0000000..6c4abed --- /dev/null +++ b/operator/config/rbac/role.yaml @@ -0,0 +1,83 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: manager-role +rules: +## +## Base operator rules +## +# We need to get namespaces so the operator can read namespaces to ensure they exist +- apiGroups: + - "" + resources: + - namespaces + verbs: + - get +# We need to manage Helm release secrets +- apiGroups: + - "" + resources: + - secrets + verbs: + - "*" +# We need to create events on CRs about things happening during reconciliation +- apiGroups: + - "" + resources: + - events + verbs: + - create + +## +## Rules for move2kube.konveyor.io/v1alpha1, Kind: Move2Kube +## +- apiGroups: + - move2kube.konveyor.io + resources: + - move2kubes + - move2kubes/status + - move2kubes/finalizers + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- verbs: + - "*" + apiGroups: + - "networking.k8s.io" + resources: + - "ingresses" +- verbs: + - "*" + apiGroups: + - "" + resources: + - "persistentvolumeclaims" + - "serviceaccounts" + - "services" + - "configmaps" +- verbs: + - "*" + apiGroups: + - "apps" + resources: + - "deployments" + - "statefulsets" +- verbs: + - "*" + apiGroups: + - "route.openshift.io" + resources: + - "routes" +- verbs: + - "*" + apiGroups: + - "security.openshift.io" + resources: + - "securitycontextconstraints" + +#+kubebuilder:scaffold:rules diff --git a/operator/config/rbac/role_binding.yaml b/operator/config/rbac/role_binding.yaml new file mode 100644 index 0000000..d21fc0a --- /dev/null +++ b/operator/config/rbac/role_binding.yaml @@ -0,0 +1,19 @@ +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: move2kube-operator + app.kubernetes.io/part-of: move2kube-operator + app.kubernetes.io/managed-by: kustomize + name: manager-rolebinding +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: manager-role +subjects: +- kind: ServiceAccount + name: controller-manager + namespace: system diff --git a/operator/config/rbac/service_account.yaml b/operator/config/rbac/service_account.yaml new file mode 100644 index 0000000..bed384a --- /dev/null +++ b/operator/config/rbac/service_account.yaml @@ -0,0 +1,12 @@ +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: move2kube-operator + app.kubernetes.io/part-of: move2kube-operator + app.kubernetes.io/managed-by: kustomize + name: controller-manager + namespace: system diff --git a/operator/config/samples/kustomization.yaml b/operator/config/samples/kustomization.yaml new file mode 100644 index 0000000..16511bd --- /dev/null +++ b/operator/config/samples/kustomization.yaml @@ -0,0 +1,4 @@ +## Append samples of your project ## +resources: +- move2kube_v1alpha1_move2kube.yaml +#+kubebuilder:scaffold:manifestskustomizesamples diff --git a/operator/config/samples/move2kube_v1alpha1_move2kube.yaml b/operator/config/samples/move2kube_v1alpha1_move2kube.yaml new file mode 100644 index 0000000..b55de4d --- /dev/null +++ b/operator/config/samples/move2kube_v1alpha1_move2kube.yaml @@ -0,0 +1,60 @@ +apiVersion: move2kube.konveyor.io/v1alpha1 +kind: Move2Kube +metadata: + name: move2kube-sample +spec: + # Default values copied from /helm-charts/move2kube/values.yaml + deployment: + api: + cpu: 300m + imageTag: "" + initContainer: false + memory: 1Gi + privilegedPods: false + replicas: 1 + authServer: + cpu: 300m + enable: false + memory: 1Gi + replicas: 1 + database: + cpu: 300m + enable: false + memory: 1Gi + replicas: 1 + startEmpty: true + ingress: + enable: true + host: mydomain.com + preferRoute: false + tlsSecretName: "" + persistentVolumeClaim: + createNew: true + enable: false + name: "" + readWriteMany: true + storageClassName: "" + storageSize: 1Gi + secret: + api: + configYAML: "" + createNew: true + enable: false + name: "" + authServer: + adminPassword: password + adminUsername: admin + createNew: true + databasePassword: password + databaseUsername: auth-server + name: "" + realmJSON: "" + standaloneHAXML: "" + securityContextContraints: + enable: false + serviceAccount: + createNew: true + enable: false + name: "" + + diff --git a/operator/config/scorecard/bases/config.yaml b/operator/config/scorecard/bases/config.yaml new file mode 100644 index 0000000..c770478 --- /dev/null +++ b/operator/config/scorecard/bases/config.yaml @@ -0,0 +1,7 @@ +apiVersion: scorecard.operatorframework.io/v1alpha3 +kind: Configuration +metadata: + name: config +stages: +- parallel: true + tests: [] diff --git a/operator/config/scorecard/kustomization.yaml b/operator/config/scorecard/kustomization.yaml new file mode 100644 index 0000000..50cd2d0 --- /dev/null +++ b/operator/config/scorecard/kustomization.yaml @@ -0,0 +1,16 @@ +resources: +- bases/config.yaml +patchesJson6902: +- path: patches/basic.config.yaml + target: + group: scorecard.operatorframework.io + version: v1alpha3 + kind: Configuration + name: config +- path: patches/olm.config.yaml + target: + group: scorecard.operatorframework.io + version: v1alpha3 + kind: Configuration + name: config +#+kubebuilder:scaffold:patchesJson6902 diff --git a/operator/config/scorecard/patches/basic.config.yaml b/operator/config/scorecard/patches/basic.config.yaml new file mode 100644 index 0000000..04b59f3 --- /dev/null +++ b/operator/config/scorecard/patches/basic.config.yaml @@ -0,0 +1,10 @@ +- op: add + path: /stages/0/tests/- + value: + entrypoint: + - scorecard-test + - basic-check-spec + image: quay.io/operator-framework/scorecard-test:v1.31.0 + labels: + suite: basic + test: basic-check-spec-test diff --git a/operator/config/scorecard/patches/olm.config.yaml b/operator/config/scorecard/patches/olm.config.yaml new file mode 100644 index 0000000..8f1c952 --- /dev/null +++ b/operator/config/scorecard/patches/olm.config.yaml @@ -0,0 +1,50 @@ +- op: add + path: /stages/0/tests/- + value: + entrypoint: + - scorecard-test + - olm-bundle-validation + image: quay.io/operator-framework/scorecard-test:v1.31.0 + labels: + suite: olm + test: olm-bundle-validation-test +- op: add + path: /stages/0/tests/- + value: + entrypoint: + - scorecard-test + - olm-crds-have-validation + image: quay.io/operator-framework/scorecard-test:v1.31.0 + labels: + suite: olm + test: olm-crds-have-validation-test +- op: add + path: /stages/0/tests/- + value: + entrypoint: + - scorecard-test + - olm-crds-have-resources + image: quay.io/operator-framework/scorecard-test:v1.31.0 + labels: + suite: olm + test: olm-crds-have-resources-test +- op: add + path: /stages/0/tests/- + value: + entrypoint: + - scorecard-test + - olm-spec-descriptors + image: quay.io/operator-framework/scorecard-test:v1.31.0 + labels: + suite: olm + test: olm-spec-descriptors-test +- op: add + path: /stages/0/tests/- + value: + entrypoint: + - scorecard-test + - olm-status-descriptors + image: quay.io/operator-framework/scorecard-test:v1.31.0 + labels: + suite: olm + test: olm-status-descriptors-test diff --git a/operator/watches.yaml b/operator/watches.yaml new file mode 100644 index 0000000..8577f86 --- /dev/null +++ b/operator/watches.yaml @@ -0,0 +1,6 @@ +# Use the 'create api' subcommand to add watches to this file. +- group: move2kube.konveyor.io + version: v1alpha1 + kind: Move2Kube + chart: helm-charts/move2kube +#+kubebuilder:scaffold:watch From 2082f947460da3f9e32713e2f54776e2920a3268 Mon Sep 17 00:00:00 2001 From: Harikrishnan Balagopal Date: Wed, 13 Sep 2023 16:11:55 +0530 Subject: [PATCH 2/2] feat: add operator image build to workflows Signed-off-by: Harikrishnan Balagopal --- .github/workflows/build.yml | 5 +++++ .github/workflows/release.yml | 15 +++++++++++++++ operator/.gitignore | 1 + operator/Makefile | 4 +++- 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f7dba3c..f1e6eb0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,6 +59,11 @@ jobs: uses: docker/setup-buildx-action@v2 - name: build image run: VERSION='${{ steps.image_tag.outputs.tag }}' make cmultibuildpush + - name: build and push the operator container image + run: | + cd operator/ || exit 1 + VERSION='${{ steps.image_tag.outputs.tag }}' make docker-build + VERSION='${{ steps.image_tag.outputs.tag }}' make docker-push - name: success slack notification uses: rtCamp/action-slack-notify@v2 env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d42c9e5..a12a9f9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -158,6 +158,21 @@ jobs: uses: docker/setup-buildx-action@v2 - name: build container image run: VERSION='${{ github.event.inputs.tag }}' make cmultibuildpush + # build the operator bundle and container images + - name: install-yq + run: | + echo "installing yq..." + curl -L https://github.com/mikefarah/yq/releases/download/v4.13.5/yq_linux_amd64 -o /usr/local/bin/yq && chmod +x /usr/local/bin/yq + echo "yq installed" + - name: build the operator bundle and container images and push the images to quay + run: | + cd operator/ || exit 1 + VERSION='${{ github.event.inputs.tag }}' make docker-build + VERSION='${{ github.event.inputs.tag }}' make docker-push + VERSION='${{ github.event.inputs.tag }}' make bundle + VERSION='${{ github.event.inputs.tag }}' make bundle-build + VERSION='${{ github.event.inputs.tag }}' make bundle-push + # build the operator bundle and container images - name: success slack notification uses: rtCamp/action-slack-notify@v2 env: diff --git a/operator/.gitignore b/operator/.gitignore index 2ca5a1c..69d0ff6 100644 --- a/operator/.gitignore +++ b/operator/.gitignore @@ -26,3 +26,4 @@ bin coverage.txt .cr-release-packages secrets/ +/helm-charts/ diff --git a/operator/Makefile b/operator/Makefile index 5011ba1..0142abc 100644 --- a/operator/Makefile +++ b/operator/Makefile @@ -39,7 +39,7 @@ IMAGE_TAG_BASE ?= quay.io/konveyor/move2kube # BUNDLE_IMG defines the image:tag used for the bundle. # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=/:) -BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION_WITHOUT_V) +BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:$(VERSION) # BUNDLE_GEN_FLAGS are the flags passed to the operator-sdk generate bundle command BUNDLE_GEN_FLAGS ?= -q --overwrite --version $(VERSION_WITHOUT_V) $(BUNDLE_METADATA_OPTS) @@ -184,6 +184,7 @@ endif .PHONY: bundle bundle: kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files. + cp -r ../helm-charts . @echo 'changing the image tag to '${VERSION}' in "containerImage" field in the CSV using yq' @cat config/manifests/bases/move2kube-operator.clusterserviceversion.yaml yq eval --exit-status --inplace ".metadata.annotations.containerImage=\"quay.io/konveyor/move2kube-operator:${VERSION}\"" config/manifests/bases/move2kube-operator.clusterserviceversion.yaml @@ -193,6 +194,7 @@ bundle: kustomize operator-sdk ## Generate bundle manifests and metadata, then v 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 + rm -rf helm-charts .PHONY: bundle-build bundle-build: ## Build the bundle image.