diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0342943313..c2a5bd21ee 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -49,7 +49,7 @@ jobs: needs: [get-version, publish-python-sdk] strategy: matrix: - component: [feature-server, feature-server-java, feature-transformation-server, feast-operator] + component: [feature-server, feature-server-java, feature-transformation-server, feast-helm-operator] env: MAVEN_CACHE: gs://feast-templocation-kf-feast/.m2.2020-08-19.tar REGISTRY: feastdev diff --git a/.releaserc.js b/.releaserc.js index ee9c62a04d..60084dc24f 100644 --- a/.releaserc.js +++ b/.releaserc.js @@ -66,7 +66,7 @@ module.exports = { "CHANGELOG.md", "java/pom.xml", "infra/charts/**/*.*", - "infra/feast-operator/**/*", + "infra/feast-helm-operator/**/*", "ui/package.json", "sdk/python/feast/ui/package.json", "sdk/python/feast/ui/yarn.lock" diff --git a/Makefile b/Makefile index 6831a58337..10187b8ebc 100644 --- a/Makefile +++ b/Makefile @@ -430,15 +430,15 @@ build-feature-server-java-docker: -t $(REGISTRY)/feature-server-java:$(VERSION) \ -f java/infra/docker/feature-server/Dockerfile --load . -push-feast-operator-docker: - cd infra/feast-operator && \ - IMAGE_TAG_BASE=$(REGISTRY)/feast-operator \ +push-feast-helm-operator-docker: + cd infra/feast-helm-operator && \ + IMAGE_TAG_BASE=$(REGISTRY)/feast-helm-operator \ VERSION=$(VERSION) \ $(MAKE) docker-push -build-feast-operator-docker: - cd infra/feast-operator && \ - IMAGE_TAG_BASE=$(REGISTRY)/feast-operator \ +build-feast-helm-operator-docker: + cd infra/feast-helm-operator && \ + IMAGE_TAG_BASE=$(REGISTRY)/feast-helm-operator \ VERSION=$(VERSION) \ $(MAKE) docker-build diff --git a/docs/how-to-guides/running-feast-in-production.md b/docs/how-to-guides/running-feast-in-production.md index dc8b87e34f..021a10ac1c 100644 --- a/docs/how-to-guides/running-feast-in-production.md +++ b/docs/how-to-guides/running-feast-in-production.md @@ -225,7 +225,7 @@ helm install feast-release feast-charts/feast-feature-server \ This will deploy a single service. The service must have read access to the registry file on cloud storage and to the online store (e.g. via [podAnnotations](https://kubernetes-on-aws.readthedocs.io/en/latest/user-guide/iam-roles.html)). It will keep a copy of the registry in their memory and periodically refresh it, so expect some delays in update propagation in exchange for better performance. -> Alternatively, deploy the same helm chart with a [Kubernetes Operator](/infra/feast-operator). +> Alternatively, deploy the same helm chart with a [Kubernetes Operator](/infra/feast-helm-operator). ## 5. Using environment variables in your yaml configuration diff --git a/infra/feast-operator/.gitignore b/infra/feast-helm-operator/.gitignore similarity index 100% rename from infra/feast-operator/.gitignore rename to infra/feast-helm-operator/.gitignore diff --git a/infra/feast-operator/Dockerfile b/infra/feast-helm-operator/Dockerfile similarity index 100% rename from infra/feast-operator/Dockerfile rename to infra/feast-helm-operator/Dockerfile diff --git a/infra/feast-operator/Makefile b/infra/feast-helm-operator/Makefile similarity index 98% rename from infra/feast-operator/Makefile rename to infra/feast-helm-operator/Makefile index f52911f432..6712a37b4a 100644 --- a/infra/feast-operator/Makefile +++ b/infra/feast-helm-operator/Makefile @@ -28,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 -# feastdev/feast-operator-bundle:$VERSION and feastdev/feast-operator-catalog:$VERSION. -IMAGE_TAG_BASE ?= feastdev/feast-operator +# feastdev/feast-helm-operator-bundle:$VERSION and feastdev/feast-helm-operator-catalog:$VERSION. +IMAGE_TAG_BASE ?= feastdev/feast-helm-operator # BUNDLE_IMG defines the image:tag used for the bundle. # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=/:) diff --git a/infra/feast-operator/PROJECT b/infra/feast-helm-operator/PROJECT similarity index 94% rename from infra/feast-operator/PROJECT rename to infra/feast-helm-operator/PROJECT index 56b2532d85..fefe00db1e 100644 --- a/infra/feast-operator/PROJECT +++ b/infra/feast-helm-operator/PROJECT @@ -8,7 +8,7 @@ layout: plugins: manifests.sdk.operatorframework.io/v2: {} scorecard.sdk.operatorframework.io/v2: {} -projectName: feast-operator +projectName: feast-helm-operator resources: - api: crdVersion: v1 diff --git a/infra/feast-operator/README.md b/infra/feast-helm-operator/README.md similarity index 100% rename from infra/feast-operator/README.md rename to infra/feast-helm-operator/README.md diff --git a/infra/feast-operator/config/crd/bases/charts.feast.dev_feastfeatureservers.yaml b/infra/feast-helm-operator/config/crd/bases/charts.feast.dev_feastfeatureservers.yaml similarity index 100% rename from infra/feast-operator/config/crd/bases/charts.feast.dev_feastfeatureservers.yaml rename to infra/feast-helm-operator/config/crd/bases/charts.feast.dev_feastfeatureservers.yaml diff --git a/infra/feast-operator/config/crd/kustomization.yaml b/infra/feast-helm-operator/config/crd/kustomization.yaml similarity index 100% rename from infra/feast-operator/config/crd/kustomization.yaml rename to infra/feast-helm-operator/config/crd/kustomization.yaml diff --git a/infra/feast-operator/config/default/kustomization.yaml b/infra/feast-helm-operator/config/default/kustomization.yaml similarity index 85% rename from infra/feast-operator/config/default/kustomization.yaml rename to infra/feast-helm-operator/config/default/kustomization.yaml index 6cd524d519..3252e11de8 100644 --- a/infra/feast-operator/config/default/kustomization.yaml +++ b/infra/feast-helm-operator/config/default/kustomization.yaml @@ -1,12 +1,12 @@ # Adds namespace to all resources. -namespace: feast-operator-system +namespace: feast-helm-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: feast-operator- +namePrefix: feast-helm-operator- # Labels to add to all resources and selectors. #labels: diff --git a/infra/feast-operator/config/manager/kustomization.yaml b/infra/feast-helm-operator/config/manager/kustomization.yaml similarity index 77% rename from infra/feast-operator/config/manager/kustomization.yaml rename to infra/feast-helm-operator/config/manager/kustomization.yaml index aba3224be6..0d27c2149d 100644 --- a/infra/feast-operator/config/manager/kustomization.yaml +++ b/infra/feast-helm-operator/config/manager/kustomization.yaml @@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: - name: controller - newName: feastdev/feast-operator + newName: feastdev/feast-helm-operator newTag: 0.40.0 diff --git a/infra/feast-operator/config/manager/manager.yaml b/infra/feast-helm-operator/config/manager/manager.yaml similarity index 92% rename from infra/feast-operator/config/manager/manager.yaml rename to infra/feast-helm-operator/config/manager/manager.yaml index d65e8a7890..03f1fe173d 100644 --- a/infra/feast-operator/config/manager/manager.yaml +++ b/infra/feast-helm-operator/config/manager/manager.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/name: namespace app.kubernetes.io/instance: system app.kubernetes.io/component: manager - app.kubernetes.io/created-by: feast-operator - app.kubernetes.io/part-of: feast-operator + app.kubernetes.io/created-by: feast-helm-operator + app.kubernetes.io/part-of: feast-helm-operator app.kubernetes.io/managed-by: kustomize name: system --- @@ -21,8 +21,8 @@ metadata: app.kubernetes.io/name: deployment app.kubernetes.io/instance: controller-manager app.kubernetes.io/component: manager - app.kubernetes.io/created-by: feast-operator - app.kubernetes.io/part-of: feast-operator + app.kubernetes.io/created-by: feast-helm-operator + app.kubernetes.io/part-of: feast-helm-operator app.kubernetes.io/managed-by: kustomize spec: selector: @@ -68,7 +68,7 @@ spec: containers: - args: - --leader-elect - - --leader-election-id=feast-operator + - --leader-election-id=feast-helm-operator image: controller:latest name: manager securityContext: diff --git a/infra/feast-operator/config/manifests/kustomization.yaml b/infra/feast-helm-operator/config/manifests/kustomization.yaml similarity index 76% rename from infra/feast-operator/config/manifests/kustomization.yaml rename to infra/feast-helm-operator/config/manifests/kustomization.yaml index 392c30f6b6..90dccb22c3 100644 --- a/infra/feast-operator/config/manifests/kustomization.yaml +++ b/infra/feast-helm-operator/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/feast-operator.clusterserviceversion.yaml +- bases/feast-helm-operator.clusterserviceversion.yaml - ../default - ../samples - ../scorecard diff --git a/infra/feast-operator/config/rbac/feastfeatureserver_editor_role.yaml b/infra/feast-helm-operator/config/rbac/feastfeatureserver_editor_role.yaml similarity index 87% rename from infra/feast-operator/config/rbac/feastfeatureserver_editor_role.yaml rename to infra/feast-helm-operator/config/rbac/feastfeatureserver_editor_role.yaml index f03ac20fdd..4749204cf7 100644 --- a/infra/feast-operator/config/rbac/feastfeatureserver_editor_role.yaml +++ b/infra/feast-helm-operator/config/rbac/feastfeatureserver_editor_role.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/name: clusterrole app.kubernetes.io/instance: feastfeatureserver-editor-role app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: feast-operator - app.kubernetes.io/part-of: feast-operator + app.kubernetes.io/created-by: feast-helm-operator + app.kubernetes.io/part-of: feast-helm-operator app.kubernetes.io/managed-by: kustomize name: feastfeatureserver-editor-role rules: diff --git a/infra/feast-operator/config/rbac/feastfeatureserver_editor_rolebinding.yaml b/infra/feast-helm-operator/config/rbac/feastfeatureserver_editor_rolebinding.yaml similarity index 82% rename from infra/feast-operator/config/rbac/feastfeatureserver_editor_rolebinding.yaml rename to infra/feast-helm-operator/config/rbac/feastfeatureserver_editor_rolebinding.yaml index 054eb5a1a2..66c985fd00 100644 --- a/infra/feast-operator/config/rbac/feastfeatureserver_editor_rolebinding.yaml +++ b/infra/feast-helm-operator/config/rbac/feastfeatureserver_editor_rolebinding.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/name: clusterrole app.kubernetes.io/instance: feastfeatureserver-editor-role app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: feast-operator - app.kubernetes.io/part-of: feast-operator + app.kubernetes.io/created-by: feast-helm-operator + app.kubernetes.io/part-of: feast-helm-operator app.kubernetes.io/managed-by: kustomize name: feastfeatureserver-editor-rolebinding roleRef: diff --git a/infra/feast-operator/config/rbac/kustomization.yaml b/infra/feast-helm-operator/config/rbac/kustomization.yaml similarity index 100% rename from infra/feast-operator/config/rbac/kustomization.yaml rename to infra/feast-helm-operator/config/rbac/kustomization.yaml diff --git a/infra/feast-operator/config/rbac/leader_election_role.yaml b/infra/feast-helm-operator/config/rbac/leader_election_role.yaml similarity index 86% rename from infra/feast-operator/config/rbac/leader_election_role.yaml rename to infra/feast-helm-operator/config/rbac/leader_election_role.yaml index 0adc316dd3..f2523c129f 100644 --- a/infra/feast-operator/config/rbac/leader_election_role.yaml +++ b/infra/feast-helm-operator/config/rbac/leader_election_role.yaml @@ -6,8 +6,8 @@ metadata: app.kubernetes.io/name: role app.kubernetes.io/instance: leader-election-role app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: feast-operator - app.kubernetes.io/part-of: feast-operator + app.kubernetes.io/created-by: feast-helm-operator + app.kubernetes.io/part-of: feast-helm-operator app.kubernetes.io/managed-by: kustomize name: leader-election-role rules: diff --git a/infra/feast-operator/config/rbac/leader_election_role_binding.yaml b/infra/feast-helm-operator/config/rbac/leader_election_role_binding.yaml similarity index 81% rename from infra/feast-operator/config/rbac/leader_election_role_binding.yaml rename to infra/feast-helm-operator/config/rbac/leader_election_role_binding.yaml index f745675c0e..b56c410167 100644 --- a/infra/feast-operator/config/rbac/leader_election_role_binding.yaml +++ b/infra/feast-helm-operator/config/rbac/leader_election_role_binding.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/name: rolebinding app.kubernetes.io/instance: leader-election-rolebinding app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: feast-operator - app.kubernetes.io/part-of: feast-operator + app.kubernetes.io/created-by: feast-helm-operator + app.kubernetes.io/part-of: feast-helm-operator app.kubernetes.io/managed-by: kustomize name: leader-election-rolebinding roleRef: diff --git a/infra/feast-operator/config/rbac/role.yaml b/infra/feast-helm-operator/config/rbac/role.yaml similarity index 82% rename from infra/feast-operator/config/rbac/role.yaml rename to infra/feast-helm-operator/config/rbac/role.yaml index 2469689484..ffc8227483 100644 --- a/infra/feast-operator/config/rbac/role.yaml +++ b/infra/feast-helm-operator/config/rbac/role.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/name: clusterrole app.kubernetes.io/instance: manager-role app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: feast-operator - app.kubernetes.io/part-of: feast-operator + app.kubernetes.io/created-by: feast-helm-operator + app.kubernetes.io/part-of: feast-helm-operator app.kubernetes.io/managed-by: kustomize name: manager-role rules: diff --git a/infra/feast-operator/config/rbac/role_binding.yaml b/infra/feast-helm-operator/config/rbac/role_binding.yaml similarity index 81% rename from infra/feast-operator/config/rbac/role_binding.yaml rename to infra/feast-helm-operator/config/rbac/role_binding.yaml index 3359e91169..9aa7f4264f 100644 --- a/infra/feast-operator/config/rbac/role_binding.yaml +++ b/infra/feast-helm-operator/config/rbac/role_binding.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/name: clusterrolebinding app.kubernetes.io/instance: manager-rolebinding app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: feast-operator - app.kubernetes.io/part-of: feast-operator + app.kubernetes.io/created-by: feast-helm-operator + app.kubernetes.io/part-of: feast-helm-operator app.kubernetes.io/managed-by: kustomize name: manager-rolebinding roleRef: diff --git a/infra/feast-operator/config/rbac/service_account.yaml b/infra/feast-helm-operator/config/rbac/service_account.yaml similarity index 72% rename from infra/feast-operator/config/rbac/service_account.yaml rename to infra/feast-helm-operator/config/rbac/service_account.yaml index 7ba6f27c60..b2ab5d5e91 100644 --- a/infra/feast-operator/config/rbac/service_account.yaml +++ b/infra/feast-helm-operator/config/rbac/service_account.yaml @@ -5,8 +5,8 @@ metadata: app.kubernetes.io/name: serviceaccount app.kubernetes.io/instance: controller-manager-sa app.kubernetes.io/component: rbac - app.kubernetes.io/created-by: feast-operator - app.kubernetes.io/part-of: feast-operator + app.kubernetes.io/created-by: feast-helm-operator + app.kubernetes.io/part-of: feast-helm-operator app.kubernetes.io/managed-by: kustomize name: controller-manager namespace: system diff --git a/infra/feast-operator/config/samples/charts_v1alpha1_feastfeatureserver.yaml b/infra/feast-helm-operator/config/samples/charts_v1alpha1_feastfeatureserver.yaml similarity index 100% rename from infra/feast-operator/config/samples/charts_v1alpha1_feastfeatureserver.yaml rename to infra/feast-helm-operator/config/samples/charts_v1alpha1_feastfeatureserver.yaml diff --git a/infra/feast-operator/config/samples/kustomization.yaml b/infra/feast-helm-operator/config/samples/kustomization.yaml similarity index 100% rename from infra/feast-operator/config/samples/kustomization.yaml rename to infra/feast-helm-operator/config/samples/kustomization.yaml diff --git a/infra/feast-operator/config/scorecard/bases/config.yaml b/infra/feast-helm-operator/config/scorecard/bases/config.yaml similarity index 100% rename from infra/feast-operator/config/scorecard/bases/config.yaml rename to infra/feast-helm-operator/config/scorecard/bases/config.yaml diff --git a/infra/feast-operator/config/scorecard/kustomization.yaml b/infra/feast-helm-operator/config/scorecard/kustomization.yaml similarity index 100% rename from infra/feast-operator/config/scorecard/kustomization.yaml rename to infra/feast-helm-operator/config/scorecard/kustomization.yaml diff --git a/infra/feast-operator/config/scorecard/patches/basic.config.yaml b/infra/feast-helm-operator/config/scorecard/patches/basic.config.yaml similarity index 100% rename from infra/feast-operator/config/scorecard/patches/basic.config.yaml rename to infra/feast-helm-operator/config/scorecard/patches/basic.config.yaml diff --git a/infra/feast-operator/config/scorecard/patches/olm.config.yaml b/infra/feast-helm-operator/config/scorecard/patches/olm.config.yaml similarity index 100% rename from infra/feast-operator/config/scorecard/patches/olm.config.yaml rename to infra/feast-helm-operator/config/scorecard/patches/olm.config.yaml diff --git a/infra/feast-operator/helm-charts/feast-feature-server b/infra/feast-helm-operator/helm-charts/feast-feature-server similarity index 100% rename from infra/feast-operator/helm-charts/feast-feature-server rename to infra/feast-helm-operator/helm-charts/feast-feature-server diff --git a/infra/feast-operator/watches.yaml b/infra/feast-helm-operator/watches.yaml similarity index 100% rename from infra/feast-operator/watches.yaml rename to infra/feast-helm-operator/watches.yaml diff --git a/infra/scripts/release/files_to_bump.txt b/infra/scripts/release/files_to_bump.txt index 505ef87b24..4b3967b23e 100644 --- a/infra/scripts/release/files_to_bump.txt +++ b/infra/scripts/release/files_to_bump.txt @@ -10,7 +10,7 @@ infra/charts/feast/README.md 11 68 69 infra/charts/feast-feature-server/Chart.yaml 5 infra/charts/feast-feature-server/README.md 3 infra/charts/feast-feature-server/values.yaml 12 -infra/feast-operator/Makefile 6 -infra/feast-operator/config/manager/kustomization.yaml 8 +infra/feast-helm-operator/Makefile 6 +infra/feast-helm-operator/config/manager/kustomization.yaml 8 java/pom.xml 38 ui/package.json 3