Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add annotation label for operator pods #452

Merged
merged 1 commit into from
Feb 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GOPATH := $(shell go env GOPATH)
GOARCH := $(shell go env GOARCH)
GOOS := $(shell go env GOOS)

KUSTOMIZE_HOME=operator-kustomize
KUSTOMIZE_HOME=resources
KUSTOMIZE_CRDS=$(KUSTOMIZE_HOME)/base/crds/

PLUGIN_HOME=kubectl-minio
Expand Down Expand Up @@ -58,8 +58,8 @@ regen-crd:
@echo "WARNING: for the time being, you need to clone and build github.com/minio/controller-tools/cmd/controller-gen@v0.4.6"
@echo "Any other controller-gen will cause the generated CRD to lose the volumeClaimTemplate metadata to be lost"
@controller-gen crd:maxDescLen=0,generateEmbeddedObjectMeta=true paths="./..." output:crd:artifacts:config=$(KUSTOMIZE_CRDS)
@kustomize build operator-kustomize/patch-crd > $(TMPFILE)
@mv -f $(TMPFILE) operator-kustomize/base/crds/minio.min.io_tenants.yaml
@kustomize build resources/patch-crd > $(TMPFILE)
@mv -f $(TMPFILE) resources/base/crds/minio.min.io_tenants.yaml

regen-crd-docs:
@which crd-ref-docs 1>/dev/null || (echo "Installing crd-ref-docs" && GO111MODULE=on go get github.com/elastic/crd-ref-docs)
Expand Down Expand Up @@ -88,6 +88,6 @@ logsearchapi:

getconsoleuiyaml:
@echo "Getting the latest Console UI"
@kustomize build github.com/minio/console/k8s/operator-console/base > operator-kustomize/console-ui.yaml
@kustomize build github.com/minio/console/k8s/operator-console/base > resources/console-ui.yaml
@make statik
@echo "Done"
27 changes: 12 additions & 15 deletions kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

# Configure repo and tag of MinIO Operator Image
images:
- name: minio/operator
newName: minio/operator
newTag: v4.0.0

namespace: minio-operator
commonAnnotations:
operator.min.io/authors: "MinIO, Inc."
operator.min.io/license: "AGPLv3"
operator.min.io/support: "https://subnet.min.io"

resources:
- operator-kustomize/namespace.yaml
- operator-kustomize/service-account.yaml
- operator-kustomize/cluster-role.yaml
- operator-kustomize/cluster-role-binding.yaml
- operator-kustomize/base/crds/minio.min.io_tenants.yaml
- operator-kustomize/service.yaml
- operator-kustomize/deployment.yaml
- operator-kustomize/console-ui.yaml
- resources/namespace.yaml
- resources/service-account.yaml
- resources/cluster-role.yaml
- resources/cluster-role-binding.yaml
- resources/base/crds/minio.min.io_tenants.yaml
- resources/service.yaml
- resources/deployment.yaml
- resources/console-ui.yaml
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.