mirror of https://git.rancher.io/charts
(dev-v2.6-archive) Bump aks-operator to 1.0.1-rc17
(partially cherry picked from commit 6de0eb4728)
pull/1680/head
Donnie Adams
Arvind Iyengar
parent
a4e77bcf6f
commit
032cefcf0a
|
|
@ -1,2 +1,2 @@
|
|||
url: https://github.com/rancher/aks-operator/releases/download/v1.0.1-rc14/rancher-aks-operator-crd-1.0.1-rc14.tgz
|
||||
url: https://github.com/rancher/aks-operator/releases/download/v1.0.1-rc17/rancher-aks-operator-crd-1.0.1-rc17.tgz
|
||||
version: 100.0.0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
url: https://github.com/rancher/aks-operator/releases/download/v1.0.1-rc14/rancher-aks-operator-1.0.1-rc14.tgz
|
||||
url: https://github.com/rancher/aks-operator/releases/download/v1.0.1-rc17/rancher-aks-operator-1.0.1-rc17.tgz
|
||||
version: 100.0.0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
url: https://github.com/rancher/eks-operator/releases/download/v1.1.1-rc5/rancher-eks-operator-crd-1.1.1-rc5.tgz
|
||||
url: https://github.com/rancher/eks-operator/releases/download/v1.1.1-rc7/rancher-eks-operator-crd-1.1.1-rc7.tgz
|
||||
version: 100.0.0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
url: https://github.com/rancher/eks-operator/releases/download/v1.1.1-rc5/rancher-eks-operator-1.1.1-rc5.tgz
|
||||
url: https://github.com/rancher/eks-operator/releases/download/v1.1.1-rc7/rancher-eks-operator-1.1.1-rc7.tgz
|
||||
version: 100.0.0
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
--- charts-original/Chart.yaml
|
||||
+++ charts/Chart.yaml
|
||||
@@ -3,12 +3,12 @@
|
||||
catalog.cattle.io/display-name: External IP Webhook
|
||||
catalog.cattle.io/namespace: cattle-externalip-system
|
||||
catalog.cattle.io/os: linux
|
||||
- catalog.cattle.io/release-name: rancher-externalip-webhook
|
||||
- catalog.cattle.io/ui-component: rancher-externalip-webhook
|
||||
+ catalog.cattle.io/release-name: rancher-external-ip-webhook
|
||||
+ catalog.cattle.io/ui-component: rancher-external-ip-webhook
|
||||
apiVersion: v1
|
||||
appVersion: v1.0.0
|
||||
description: |
|
||||
- Deploy the externalip-webhook to mitigate k8s CVE-2020-8554
|
||||
+ Deploy the external-ip-webhook to mitigate k8s CVE-2020-8554
|
||||
home: https://github.com/rancher/externalip-webhook
|
||||
keywords:
|
||||
- cve
|
||||
@@ -18,7 +18,7 @@
|
||||
maintainers:
|
||||
- email: raul@rancher.com
|
||||
name: rawmind0
|
||||
-name: rancher-externalip-webhook
|
||||
+name: rancher-external-ip-webhook
|
||||
sources:
|
||||
- https://github.com/rancher/externalip-webhook
|
||||
version: 1.0.0
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- charts-original/values.yaml
|
||||
+++ charts/values.yaml
|
||||
@@ -30,7 +30,7 @@
|
||||
image:
|
||||
pullPolicy: IfNotPresent
|
||||
pullSecrets: []
|
||||
- repository: rancher/kube-rbac-proxy
|
||||
+ repository: rancher/mirrored-kube-rbac-proxy
|
||||
tag: v0.5.0
|
||||
resources:
|
||||
limits:
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
url: https://github.com/rancher/externalip-webhook/releases/download/v1.0.0/rancher-externalip-webhook-1.0.0.tgz
|
||||
version: 1.0.0
|
||||
|
|
@ -1,2 +1,2 @@
|
|||
url: https://github.com/rancher/gke-operator/releases/download/v1.1.1-rc7/rancher-gke-operator-crd-1.1.1-rc7.tgz
|
||||
url: https://github.com/rancher/gke-operator/releases/download/v1.1.1-rc8/rancher-gke-operator-crd-1.1.1-rc8.tgz
|
||||
version: 100.0.0
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
url: https://github.com/rancher/gke-operator/releases/download/v1.1.1-rc7/rancher-gke-operator-1.1.1-rc7.tgz
|
||||
url: https://github.com/rancher/gke-operator/releases/download/v1.1.1-rc8/rancher-gke-operator-1.1.1-rc8.tgz
|
||||
version: 100.0.0
|
||||
|
|
|
|||
|
|
@ -1,4 +1,15 @@
|
|||
questions:
|
||||
- variable: clusterType
|
||||
label: Cluster Type
|
||||
description: Select the type of the cluster where vSphere CPI will be deployed
|
||||
type: enum
|
||||
default: "rke"
|
||||
options:
|
||||
- "rke"
|
||||
- "rke2"
|
||||
- "other"
|
||||
group: Configuration
|
||||
|
||||
- variable: vCenter.host
|
||||
label: vCenter Host
|
||||
description: IP address or FQDN of the vCenter
|
||||
|
|
|
|||
|
|
@ -5,29 +5,33 @@ metadata:
|
|||
annotations:
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ""
|
||||
labels:
|
||||
component: cloud-controller-manager
|
||||
component: {{ .Chart.Name }}-cloud-controller-manager
|
||||
tier: control-plane
|
||||
k8s-app: vsphere-cloud-controller-manager
|
||||
name: vsphere-cloud-controller-manager
|
||||
k8s-app: {{ .Chart.Name }}-cloud-controller-manager
|
||||
name: {{ .Chart.Name }}-cloud-controller-manager
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
k8s-app: vsphere-cloud-controller-manager
|
||||
k8s-app: {{ .Chart.Name }}-cloud-controller-manager
|
||||
updateStrategy:
|
||||
type: RollingUpdate
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
k8s-app: vsphere-cloud-controller-manager
|
||||
k8s-app: {{ .Chart.Name }}-cloud-controller-manager
|
||||
spec:
|
||||
nodeSelector:
|
||||
{{- if .Values.cloudControllerManager.nodeSelector }}
|
||||
nodeSelector:
|
||||
{{- with .Values.cloudControllerManager.nodeSelector }}
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- else }}
|
||||
{{- else if eq .Values.clusterType "rke" }}
|
||||
nodeSelector:
|
||||
node-role.kubernetes.io/controlplane: "true"
|
||||
{{- else if eq .Values.clusterType "rke2" }}
|
||||
nodeSelector:
|
||||
node-role.kubernetes.io/control-plane: "true"
|
||||
{{- end }}
|
||||
securityContext:
|
||||
runAsUser: 1001
|
||||
|
|
@ -36,9 +40,9 @@ spec:
|
|||
operator: Exists
|
||||
- effect: NoSchedule
|
||||
operator: Exists
|
||||
serviceAccountName: cloud-controller-manager
|
||||
serviceAccountName: {{ .Chart.Name }}-cloud-controller-manager
|
||||
containers:
|
||||
- name: vsphere-cloud-controller-manager
|
||||
- name: {{ .Chart.Name }}-cloud-controller-manager
|
||||
image: "{{ template "system_default_registry" . }}{{ .Values.cloudControllerManager.image.repository }}:{{ .Values.cloudControllerManager.image.tag }}"
|
||||
args:
|
||||
- --v=2
|
||||
|
|
@ -61,8 +65,8 @@ apiVersion: v1
|
|||
kind: Service
|
||||
metadata:
|
||||
labels:
|
||||
component: cloud-controller-manager
|
||||
name: vsphere-cloud-controller-manager
|
||||
component: {{ .Chart.Name }}-cloud-controller-manager
|
||||
name: {{ .Chart.Name }}-cloud-controller-manager
|
||||
namespace: {{ .Release.Namespace }}
|
||||
spec:
|
||||
type: NodePort
|
||||
|
|
@ -71,4 +75,4 @@ spec:
|
|||
protocol: TCP
|
||||
targetPort: 43001
|
||||
selector:
|
||||
component: cloud-controller-manager
|
||||
component: {{ .Chart.Name }}-cloud-controller-manager
|
||||
|
|
|
|||
|
|
@ -1,14 +1,15 @@
|
|||
{{- if .Values.cloudControllerManager.rbac.enabled -}}
|
||||
# Source: https://github.com/kubernetes/cloud-provider-vsphere/blob/master/releases/v1.19/vsphere-cloud-controller-manager.yaml
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
name: cloud-controller-manager
|
||||
name: {{ .Chart.Name }}-cloud-controller-manager
|
||||
namespace: {{ .Release.Namespace }}
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: ClusterRole
|
||||
metadata:
|
||||
name: cloud-controller-manager
|
||||
name: {{ .Chart.Name }}-cloud-controller-manager
|
||||
rules:
|
||||
- apiGroups:
|
||||
- ""
|
||||
|
|
@ -105,23 +106,24 @@ roleRef:
|
|||
subjects:
|
||||
- apiGroup: ""
|
||||
kind: ServiceAccount
|
||||
name: cloud-controller-manager
|
||||
name: {{ .Chart.Name }}-cloud-controller-manager
|
||||
namespace: {{ .Release.Namespace }}
|
||||
- apiGroup: ""
|
||||
kind: User
|
||||
name: cloud-controller-manager
|
||||
name: {{ .Chart.Name }}-cloud-controller-manager
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: ClusterRoleBinding
|
||||
metadata:
|
||||
name: cloud-controller-manager
|
||||
name: {{ .Chart.Name }}-cloud-controller-manager
|
||||
roleRef:
|
||||
apiGroup: rbac.authorization.k8s.io
|
||||
kind: ClusterRole
|
||||
name: cloud-controller-manager
|
||||
name: {{ .Chart.Name }}-cloud-controller-manager
|
||||
subjects:
|
||||
- kind: ServiceAccount
|
||||
name: cloud-controller-manager
|
||||
name: {{ .Chart.Name }}-cloud-controller-manager
|
||||
namespace: {{ .Release.Namespace }}
|
||||
- kind: User
|
||||
name: cloud-controller-manager
|
||||
name: {{ .Chart.Name }}-cloud-controller-manager
|
||||
{{- end -}}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,11 @@ cloudControllerManager:
|
|||
repository: rancher/mirrored-cloud-provider-vsphere-cpi-release-manager
|
||||
tag: v1.2.1
|
||||
nodeSelector: {}
|
||||
rbac:
|
||||
enabled: true
|
||||
|
||||
# Set to "rke" or "rke2" to apply the node selector label appropriate for the cluster
|
||||
clusterType: "rke"
|
||||
|
||||
global:
|
||||
cattle:
|
||||
|
|
|
|||
Loading…
Reference in New Issue