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 support for custom annotations #310

Merged
merged 3 commits into from
May 31, 2019

Conversation

komljen
Copy link
Contributor

@komljen komljen commented May 30, 2019

I needed this feature for kube2iam, hope it is useful for others as well.
Example:

apiVersion: enterprises.upmc.com/v1
kind: ElasticsearchCluster
metadata:
  name: example-es-cluster
spec:
  elastic-search-image: upmcenterprises/docker-elasticsearch-kubernetes:6.1.3_0
  client-node-replicas: 1
  master-node-replicas: 1
  data-node-replicas: 1
  network-host: 0.0.0.0
  annotations:
    iam.amazonaws.com/role: k8s-test-es
  zones: []
  data-volume-size: 15Gi
  java-options: "-Xms512m -Xmx512m"
  snapshot:
    scheduler-enabled: false
  storage:
    type: gp2
    storage-class-provisioner: kubernetes.io/aws-ebs
  resources:
    requests:
      memory: 512Mi
      cpu: 500m
    limits:
      memory: 1024Mi
      cpu: '1'

The annotations are applied to master, data and client pods.

@komljen
Copy link
Contributor Author

komljen commented May 30, 2019

@stevesloka I already tested this PR, and also this one #308. Both PRs are merged in this image komljen/elasticsearch-operator:0.3.0-2 if someone wants to test it.

@stevesloka
Copy link
Member

@komljen could you rebase?

@komljen
Copy link
Contributor Author

komljen commented May 31, 2019

@stevesloka done!

@stevesloka stevesloka merged commit 1aeeb9e into upmc-enterprises:master May 31, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants