Just for diff view

.gitignore

@@ -0,0 +1 @@
+.build/

BUILD.md

@@ -0,0 +1,156 @@
+# Overview
+
+This repo is for building and deploying [Redis Enterprise](https://github.com/RedisLabs/redis-enterprise-k8s-docs) for GKE Market Place.   
+
+## Design
+
+### Solution Information
+
+Redis-Enterprise cluster is deployed within a Kubernetes StatefulSet.
+
+The deployment creates two services:
+
+- A client-facing one, designed to be used for client connections to the Redis-Enterprise
+  cluster with port forwarding or using a LoadBalancer,
+- Service discovery: a headless service for connections between
+  the Redis-Enterprise nodes.
+
+# Build instructions
+
+## Quick install with Google Cloud Marketplace
+
+Get up and running with a few clicks! Install this Redis Enterprise app to a
+Google Kubernetes Engine cluster using Google Cloud Marketplace. You can do this from the Applications tab in the GKE page in the Cloud Console.
+
+### Prerequisites
+
+#### Set up command-line tools
+
+You'll need the following tools in your development environment:
+
+- [gcloud](https://cloud.google.com/sdk/gcloud/)
+- [kubectl](https://kubernetes.io/docs/reference/kubectl/overview/)
+- [docker](https://docs.docker.com/install/)
+- [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
+- [marketplace tools](https://github.com/GoogleCloudPlatform/marketplace-k8s-app-tools/blob/master/docs/tool-prerequisites.md)
+
+Configure `gcloud` as a Docker credential helper:
+
+```shell
+gcloud auth login
+gcloud auth configure-docker
+```
+
+#### Permissions
+
+User who builds and deploys the solution would need "Kubernetes Engine Admin" and "Editor" permissions.
+
+#### Create a Google Kubernetes Engine cluster
+
+Create a new cluster from the command line. The command is idempotent so runs after the first are not needed, but do no harm.
+
+```shell
+export CLUSTER=redis-cluster
+export ZONE=us-west1-a
+gcloud container clusters create "$CLUSTER" --zone "$ZONE"
+```
+
+Configure `kubectl` to connect to the new cluster. The following is optional as by default cluster create adds credentials to local kube config.
+
+```shell
+gcloud container clusters get-credentials "$CLUSTER" --zone "$ZONE"
+```
+Create a namespace where redis cluster and database should be created
+
+```shell
+kubectl create namespace redis
+```
+
+#### Clone the repos 
+
+
+```shell
+git clone https://github.com/GoogleCloudPlatform/click-to-deploy
+cd k8s
+git clone https://github.com/RedisLabs/gkemarketplace
+```
+
+Optional:  For reference, you can get  RedisLabs Enterprise K8s Operator code (i.e., unrelated to Google MP)
+
+```shell
+git clone https://github.com/RedisLabs/redis-enterprise-k8s-docs.git
+```
+
+Optional: For reference, you can get  MP K8s tools, examples, and instructions
+
+```shell
+git clone https://github.com/GoogleCloudPlatform/marketplace-k8s-app-tools
+```
+
+#### Building
+
+```shell
+cd gkemarketplace
+make clean
+make app/build
+```
+
+#### Deploying to GKE
+
+An Application resource is an addition to the Kubernetes metamodel: A collection of individual Kubernetes components, such as Services, Deployments, etc, that you can manage as a group.
+
+The Application resource is defined by the [Kubernetes SIG-apps](https://github.com/kubernetes/community/tree/master/sig-apps) community. The source code can be found on
+[github.com/kubernetes-sigs/application](https://github.com/kubernetes-sigs/application).
+
+
+```shell
+make crd/install
+mpdev install --deployer=<deployer-repo> --parameters='{"name": "redis-enterprise-operator", "namespace": "redis", "operator.nodeCpu": 5000, "operator.nodeMem": 16, "reportingSecret": "gs://cloud-marketplace-tools/reporting_secrets/fake_reporting_secret.yaml"}
+```
+
+#### View the app in the Google Cloud Platform Console
+
+Get the Google Cloud Console URL for your app, then open this URL in your browser:
+
+```shell
+echo "https://console.cloud.google.com/kubernetes/application/${ZONE}/${CLUSTER}/${NAMESPACE}/${APP_INSTANCE_NAME}"
+```
+
+#### Get the status of the cluster
+
+By default, the application does not have an external IP address. Use `kubectl port-forward` to access the dashboard on the master
+node at `localhost`.
+
+```
+kubectl port-forward redis-enterprise-cluster-0 8443
+
+```
+
+#### Getting the Admin Password
+
+See [instructions here](https://docs.redislabs.com/latest/rs/faqs/) under "How to retrieve the username/password for a Redis Enterprise Cluster?"
+
+In summary, `kubectl get secret redis-enterprise -o yaml|grep password|cut -d':' -f 2|base64 --decode` should get you the password, and you should already know the username (default `[email protected]`)
+
+####  Access the Redis-Enterprise service externally
+
+```
+kubectl get services -n $NAMESPACE
+```
+
+**NOTE:**
+
+1. It might take some time for the external IP to be provisioned.
+2. This works out-of-the-box in GKE but not in Anthos, where special measures are needed to configure the Load Balancer.
+
+
+# Uninstall the Application
+
+## Using the Google Cloud Platform Console
+
+1. In the GCP Console, open [Kubernetes Applications](https://console.cloud.google.com/kubernetes/application).
+
+1. From the list of applications, click **Redis-Enterprise**.
+
+1. On the Application Details page, click **Delete**.
+

Makefile

@@ -1,65 +1,125 @@
-include helper/app.Makefile
-include helper/crd.Makefile
-include helper/gcloud.Makefile
-include helper/var.Makefile
-
-
-TAG ?= 1.9
-REGISTRY ?= gcr.io/proven-reality-226706
-METRICS_EXPORTER_TAG ?= v0.7.1
-
-$(info ---- TAG = $(TAG))
-
-APP_DEPLOYER_IMAGE ?= $(REGISTRY)/redislabs/deployer:$(TAG)
-NAME ?= redislabs-1
-
-ifdef METRICS_EXPORTER_ENABLED
-  METRICS_EXPORTER_ENABLED_FIELD = , "metrics.enabled": "$(METRICS_EXPORTER_ENABLED)"
-endif
+# app.Makefile provides the main targets for installing the application.
+# It requires several APP_* variables defined as followed.
+include ../app.Makefile
+# crd.Makefile provides targets to install Application CRD.
+include ../crd.Makefile
+# Production repo
+#REGISTRY ?= marketplace.gcr.io/google/redis-enterprise-operator
+# Artifact repo
+#REGISTRY := us-central1-docker.pkg.dev/proven-reality-226706/redis-market-place
+# the repo the publish copies from?
+REGISTRY := gcr.io/proven-reality-226706/redislabs
+# CI registry
+# REGISTRY ?= gcr.io/redislabs-k8s-dev-238506/gkemp-redis-ci
+# gcloud.Makefile provides default values for REGISTRY and NAMESPACE derived from local
+# gcloud and kubectl environments.
+include ../gcloud.Makefile
+include ../var.Makefile
+
+$(info ---- REGISTRY = $(REGISTRY))
+
+CHART_NAME := redis-operator
+$(info ---- CHART_NAME = $(CHART_NAME))
+
+REDIS_TAG ?= 7.8.2-34
+$(info ---- REDIS_TAG = $(REDIS_TAG))
+
+OPERATOR_TAG ?= 7.8.2-6
+$(info ---- OPERATOR_TAG = $(OPERATOR_TAG))
+
+# The repo to pull the operator image from Docker Hub registry.
+OPERATOR_REPO ?= operator
+$(info ---- OPERATOR_REPO = $(OPERATOR_REPO))
+
+# Deployer tag is used for displaying versions in Producer Portal.
+# Producer Portal requires a minor version tag, and it follow the semver.org officially recommended regex: (/^(0|[1-9]\d*)\.(0|[1-9]\d*)$
+# please view: https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
+# the operator tag is converted to the <major ver>.<minorver without dots><build number>
+# i.e.: 6.2.10-34 is converted to 6.2.1034.
+# This can also have a different patch number from the OPERATOR_TAG to indicate
+# a marketplace-only change
+DEPLOYER_TAG ?= 6.021001
+$(info ---- DEPLOYER_TAG = $(DEPLOYER_TAG))
+
+# Tag the deployer image with modified version.
+APP_DEPLOYER_IMAGE := $(REGISTRY)/deployer:$(DEPLOYER_TAG)
+
+NAME ?= redis-enterprise-operator-ci
+NAMESPACE ?= redis
 
 APP_PARAMETERS ?= { \
   "APP_INSTANCE_NAME": "$(NAME)", \
-  "NAMESPACE": "$(NAMESPACE)", \
-  "REPORTING_SECRET": "test-value" \
-  $(METRICS_EXPORTER_ENABLED_FIELD) \
+  "NAMESPACE": "$(NAMESPACE)" \
 }
 
-TESTER_IMAGE ?= $(REGISTRY)/redislabs/tester:$(TAG)
+TESTER_IMAGE ?= $(REGISTRY)/tester:$(OPERATOR_TAG)
 
+.PHONY: dev/install
+dev/install: crd/install | .build/app/dev
+	.build/app/dev install \
+	--deployer='$(APP_DEPLOYER_IMAGE)' --parameters='{"name": "redis-enterprise-operator", "namespace": "$(NAMESPACE)", "operator.nodeCpu": 5000, "operator.nodeMem": 16, "reportingSecret": "gs://cloud-marketplace-tools/reporting_secrets/fake_reporting_secret.yaml"}' | tee install.log
 
-app/build:: .build/redislabs/deployer \
-            .build/redislabs/redislabs \
 
+app/build:: .build/redis-enterprise-operator/deployer \
+			.build/redis-enterprise-operator/primary \
+			.build/redis-enterprise-operator/usage-meter \
+            .build/redis-enterprise-operator/tester
 
-.build/redislabs: | .build
-	mkdir -p "$@"
 
+.build/redis-enterprise-operator: | .build
+	mkdir -p "$@"
 
-.build/redislabs/deployer: deployer/* \
-                           schema.yaml \
-                           .build/var/APP_DEPLOYER_IMAGE \
-                           .build/var/MARKETPLACE_TOOLS_TAG \
-                           .build/var/REGISTRY \
-                           .build/var/TAG \
-                           | .build/redislabs
+.build/redis-enterprise-operator/deployer: deployer/* \
+								  chart/**/* \
+                                  schema.yaml \
+								  .build/var/DEPLOYER_TAG \
+                                  .build/var/APP_DEPLOYER_IMAGE \
+                                  .build/var/MARKETPLACE_TOOLS_TAG \
+                                  .build/var/REGISTRY \
+                                  .build/var/OPERATOR_TAG \
+								  .build/var/CHART_NAME \
+                                  | .build/redis-enterprise-operator
+	$(call print_target, $@)
 	docker build \
-	    --build-arg REGISTRY="$(REGISTRY)/redislabs" \
-	    --build-arg TAG="$(TAG)" \
+	    --build-arg REGISTRY="$(REGISTRY)" \
+	    --build-arg TAG="$(OPERATOR_TAG)" \
+	    --build-arg CHART_NAME="$(CHART_NAME)" \
 	    --build-arg MARKETPLACE_TOOLS_TAG="$(MARKETPLACE_TOOLS_TAG)" \
 	    --tag "$(APP_DEPLOYER_IMAGE)" \
 	    -f deployer/Dockerfile \
 	    .
 	docker push "$(APP_DEPLOYER_IMAGE)"
 	@touch "$@"
 
-
-.build/redislabs/redislabs: .build/var/REGISTRY \
-                            .build/var/TAG \
-                            | .build/redislabs
-	docker pull redislabs/operator:498_f987b08
-	docker tag  redislabs/operator:498_f987b08 \
-	    "$(REGISTRY)/redislabs:$(TAG)"
-	docker push "$(REGISTRY)/redislabs:$(TAG)"
+# Operator image is the primary image for Redis Enterprise.
+# Label the primary image with the same tag as deployer image.
+# From the partner portal, primary image is queried using the same tag
+# as deployer image. When pulling the image from docker hub use
+# the redis native tag and push that image as primary image with deployer tag.
+.build/redis-enterprise-operator/primary: .build/var/REGISTRY \
+										  .build/var/OPERATOR_TAG \
+                                          .build/var/DEPLOYER_TAG \
+                                          | .build/redis-enterprise-operator
+	$(call print_target, $@)
+	docker pull redislabs/$(OPERATOR_REPO):$(OPERATOR_TAG)
+	docker tag redislabs/$(OPERATOR_REPO):$(OPERATOR_TAG) "$(REGISTRY):$(OPERATOR_TAG)"
+	docker push "$(REGISTRY):$(OPERATOR_TAG)"
 	@touch "$@"
 
+.build/redis-enterprise-operator/usage-meter: usage-meter/* \
+										  .build/var/REGISTRY \
+                                          .build/var/OPERATOR_TAG \
+                                | .build/redis-enterprise-operator
+	$(call print_target, $@)
+	cd usage-meter \
+	    && docker build --tag "$(REGISTRY)/usagemeter:$(OPERATOR_TAG)" .
+	docker push "$(REGISTRY)/usagemeter:$(OPERATOR_TAG)"
+	@touch "$@"
 
+.build/redis-enterprise-operator/tester: apptest/**/* \
+                                | .build/redis-enterprise-operator
+	$(call print_target, $@)
+	cd apptest/tester \
+	    && docker build --tag "$(TESTER_IMAGE)" .
+	docker push "$(TESTER_IMAGE)"
+	@touch "$@"