Skip to content

chart updates for rbac api version change #660

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.

Sign up for GitHub

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

Merged
ganga1980 merged 2 commits into from
Oct 7, 2021
Merged

chart updates for rbac api version change #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
413925b
chart updates for rbac api version change
ganga1980 Oct 4, 2021
b2f3ef5
include windows ds for arc
ganga1980 Oct 7, 2021
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
2 changes: 1 addition & 1 deletion charts/azuremonitor-containers/templates/omsagent-crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if semverCompare "<1.19-0" .Capabilities.KubeVersion.GitVersion }}
{{- if semverCompare "<1.19-0" .Capabilities.KubeVersion.Version }}
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
Expand Down
4 changes: 2 additions & 2 deletions charts/azuremonitor-containers/templates/omsagent-daemonset-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if and (ne .Values.omsagent.secret.key "<your_workspace_key>") (ne .Values.omsagent.secret.wsid "<your_workspace_id>") (or (ne .Values.omsagent.env.clusterName "<your_cluster_name>") (ne .Values.omsagent.env.clusterId "<your_cluster_id>"))}}
{{- if and (ne .Values.omsagent.secret.key "<your_workspace_key>") (ne .Values.omsagent.secret.wsid "<your_workspace_id>") (or (ne .Values.omsagent.env.clusterName "<your_cluster_name>") (ne .Values.omsagent.env.clusterId "<your_cluster_id>") (ne .Values.Azure.Cluster.ResourceId "<your_cluster_id>") )}}
apiVersion: apps/v1
kind: DaemonSet
metadata:
Expand Down Expand Up @@ -32,7 +32,7 @@ spec:
options:
- name: ndots
value: "3"
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion }}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.Version }}
nodeSelector:
kubernetes.io/os: windows
{{- else }}
Expand Down
10 changes: 9 additions & 1 deletion charts/azuremonitor-containers/templates/omsagent-rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ metadata:
heritage: {{ .Release.Service }}
---
kind: ClusterRole
{{- if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1" }}
apiVersion: rbac.authorization.k8s.io/v1
{{- else }}
apiVersion: rbac.authorization.k8s.io/v1beta1
{{- end }}
metadata:
name: omsagent-reader
labels:
Expand All @@ -33,7 +37,7 @@ rules:
verbs: ["get", "create", "patch"]
- nonResourceURLs: ["/metrics"]
verbs: ["get"]
#arc k8s extension model grants access as part of the extension msi
#arc k8s extension model grants access as part of the extension msi
#remove this explicit permission once the extension available in public preview
{{- if (empty .Values.Azure.Extension.Name) }}
- apiGroups: [""]
Expand All @@ -43,7 +47,11 @@ rules:
{{- end }}
---
kind: ClusterRoleBinding
{{- if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1" }}
apiVersion: rbac.authorization.k8s.io/v1
{{- else }}
apiVersion: rbac.authorization.k8s.io/v1beta1
{{- end }}
metadata:
name: omsagentclusterrolebinding
labels:
Expand Down