From 086202c3e877f83447e5b3a78040f241c7e37507 Mon Sep 17 00:00:00 2001 From: Maho Takara Date: Fri, 16 Feb 2024 17:13:09 +0900 Subject: [PATCH] update --- Makefile | 8 +++--- takara/README.md | 16 ------------ takara/values.yaml | 61 ---------------------------------------------- 3 files changed, 3 insertions(+), 82 deletions(-) delete mode 100644 takara/README.md delete mode 100644 takara/values.yaml diff --git a/Makefile b/Makefile index dc6a2843f..49695e5cc 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Current Operator version -VERSION ?= 0.15.2 +VERSION ?= 0.15.1 # Default bundle image tag BUNDLE_IMG ?= controller-bundle:$(VERSION) # Options for 'bundle-build' @@ -12,9 +12,7 @@ endif BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL) # Image URL to use all building/pushing image targets -#IMG ?= quay.io/opstree/redis-operator:v$(VERSION) -IMG ?= ghcr.io/takara9/redis-operator:v$(VERSION) - +IMG ?= quay.io/opstree/redis-operator:v$(VERSION) # Produce CRDs that work back to Kubernetes 1.11 (no version conversion) CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false" @@ -154,4 +152,4 @@ e2e-test: e2e-kind-setup install-kuttl .PHONY: integration-test-setup integration-test-setup: - ./hack/integrationSetup.sh + ./hack/integrationSetup.sh \ No newline at end of file diff --git a/takara/README.md b/takara/README.md deleted file mode 100644 index 855b1ba7f..000000000 --- a/takara/README.md +++ /dev/null @@ -1,16 +0,0 @@ - -minikube start - -minikube addons enable volumesnapshots -minikube addons enable csi-hostpath-driver -minikube addons disable storage-provisioner -minikube addons disable default-storageclass -kubectl patch storageclass csi-hostpath-sc -p '{"metadata": {"annotations":{"storageclass.kubernetes.io/is-default-class":"true"}}}' - - -kubectl create ns ot-operators -helm install redis-operator ot-helm/redis-operator --namespace ot-operators -f values.yaml -helm install redis-replication ot-helm/redis-replication --set redisreplication.clusterSize=3 --namespace ot-operators -helm install redis-sentinel ot-helm/redis-sentinel --set redissentinel.clusterSize=3 --namespace ot-operators --set redisSentinelConfig.redisReplicationName="redis-replication" - -minikube delete diff --git a/takara/values.yaml b/takara/values.yaml deleted file mode 100644 index dbe71a895..000000000 --- a/takara/values.yaml +++ /dev/null @@ -1,61 +0,0 @@ ---- -redisOperator: - name: redis-operator - imageName: ghcr.io/takara9/redis-operator - # Overrides the image tag whose default is the chart appVersion. - imageTag: "v0.15.2" - imagePullPolicy: Always - - # Additional pod annotations - podAnnotations: {} - # Additional Pod labels (e.g. for filtering Pod by custom labels) - podLabels: {} - - # Additional arguments for redis-operator container - extraArgs: [] - - # - -zap-log-level=error - watch_namespace: "" - env: [] - webhook: false - - -resources: - limits: - cpu: 500m - memory: 500Mi - requests: - cpu: 500m - memory: 500Mi - -replicas: 1 - -serviceAccountName: redis-operator - -service: - name: webhook-service - namespace: redis-operator - -certificate: - name: serving-cert - secretName: webhook-server-cert - -issuer: - type: selfSigned - name: redis-operator-issuer - email: shubham.gupta@opstree.com - server: https://acme-v02.api.letsencrypt.org/directory - privateKeySecretName: letsencrypt-prod - solver: - enabled: true - ingressClass: nginx - -certmanager: - enabled: false - -priorityClassName: "" -nodeSelector: {} -tolerateAllTaints: false -tolerations: [] -affinity: {} -