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

Dev 49484 add the rbac for the minishift case #30

Closed
wants to merge 20 commits into from
Closed

Dev 49484 add the rbac for the minishift case #30

wants to merge 20 commits into from

Conversation

JeremyTangCD
Copy link
Contributor

Dev 49484 add the rbac for the minishift case

jeremy added 20 commits October 12, 2018 10:10
…-user-to-specify-a-parent to develop

* commit '0069c29ebac9b26de692b3690c136fefd091e0ff':
  DEV-39965: Allow the user to specify a parent group during installation
  DEV-39965: Allow the user to specify a parent group during installation
  DEV-39965: Allow the user to specify a parent group during installation
…pecifying-an-escalation to develop

* commit '19cb6d08103676af5b9b3cfcf6baf4de2b6853e9':
  DEV-39795: Support specifying an escalation chain for collectors
  DEV-39795: Support specifying an escalation chain for collectors
…onfiguration-support-in to develop

* commit '0f49f008ecf732e7ea47361e6f01a775562132e5':
  DEV-40319: Add new configuration support in helm chart
…the-capitalization-of to develop

* commit '95530db1a8ac6cda72cd025f55ea7eaf99680914':
  DEV-40760: Maintain the capitalization of the cluster name when creating device/collector group
…collector-group-name-s to develop

* commit 'cdc2c497bf71cb50493385d18f4cc0575bd8fdc7':
  DEV-41170: Make the collector group name's casing the same as user defined
…set-controller-allow-user to develop

* commit '8382dde2d8c569c6827481aed5ccd833642046f3':
  DEV-49511 [collectorset-controller] Allow user to select existing Collector Groups for K8s Monitoring
…-add-nodes-stats-to-collector to develop

* commit '0c256b76b68ff1cad7fad7b0a144efc39feed8f2':
  DEV-49484 Check and add nodes/stats to collector ClusterRole in helm charts
@JeremyTangCD
Copy link
Contributor Author

JeremyTangCD commented Mar 20, 2019

@woz5999
I do not know why the change in #28 still exists in this PR.
And I do not have the privilege to resolve the conflicts.
Could you help to check it? Thx

@@ -1,7 +1,7 @@
apiVersion: v1
description: Automated Kubernetes monitoring
name: argus
version: 0.3.0
version: 0.5.0
Copy link
Contributor Author

@JeremyTangCD JeremyTangCD Mar 20, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@woz5999
Pls check if the version change is ok

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why are we skipping a minor version? Should be 0.4.0

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, we had changed the minor version to 0.4.0 in https://github.com/logicmonitor/k8s-helm-charts/pull/28/files
I do not know why the master branch still show the previous file

@@ -1,7 +1,7 @@
apiVersion: v1
description: Automated collector management
name: collectorset-controller
version: 0.1.0
version: 0.2.0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@woz5999
Pls check if the version change is ok

@woz5999
Copy link
Contributor

woz5999 commented Mar 21, 2019

@JeremyTangCD There are merge conflicts that need to resolved

vkumbhar94 pushed a commit that referenced this pull request Sep 2, 2020
…DEV-62719-helm-chart-updates-allow-for-pod-priorityclass to develop

* commit '38aa383f4d7346d74fa17bbebdd6d4ef0a8a29e1':
  DEV-62719 added priorityClassName in Argus & Collectorset-controller helm charts
vkumbhar94 pushed a commit that referenced this pull request Sep 10, 2020
…helm-chart-updates-allow-for-pod-priorityclass to develop

* commit '38aa383f4d7346d74fa17bbebdd6d4ef0a8a29e1':
  DEV-62719 added priorityClassName in Argus & Collectorset-controller helm charts
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