Skip to content

Commit

Permalink
Merge pull request #663 from lubronzhan/bump_1.25.0
Browse files Browse the repository at this point in the history
Bump to 1.25.0
  • Loading branch information
k8s-ci-robot authored Oct 19, 2022
2 parents 63d85e3 + 03c2371 commit dd98e0a
Show file tree
Hide file tree
Showing 9 changed files with 301 additions and 19 deletions.
Binary file added charts/vsphere-cpi-1.25.0.tgz
Binary file not shown.
4 changes: 2 additions & 2 deletions charts/vsphere-cpi/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
appVersion: 1.24.2
appVersion: 1.25.0
description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI)
name: vsphere-cpi
version: 1.24.2
version: 1.25.0
keywords:
- vsphere
- vmware
Expand Down
2 changes: 1 addition & 1 deletion charts/vsphere-cpi/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ helm repo add vsphere-cpi https://kubernetes.github.io/cloud-provider-vsphere
helm repo update

# Package CPI Chart
VERSION=1.24.2
VERSION=1.25.0
cd charts
helm package vsphere-cpi --version $VERSION --app-version $VERSION

Expand Down
18 changes: 10 additions & 8 deletions charts/vsphere-cpi/templates/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,6 @@ spec:
{{- toYaml .Values.daemonset.podLabels | nindent 8 }}
{{- end }}
spec:
nodeSelector:
{{- if .Values.daemonset.nodeSelector }}
{{- with .Values.daemonset.nodeSelector }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- else }}
node-role.kubernetes.io/control-plane: "true"
{{- end }}
tolerations:
- key: node.cloudprovider.kubernetes.io/uninitialized
value: "true"
Expand Down Expand Up @@ -93,3 +85,13 @@ spec:
- name: vsphere-config-volume
configMap:
name: {{ if .Values.config.enabled }}{{- .Values.config.name }}{{- else }}cloud-config{{- end }}
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: node-role.kubernetes.io/control-plane
operator: Exists
- matchExpressions:
- key: node-role.kubernetes.io/master
operator: Exists
4 changes: 1 addition & 3 deletions charts/vsphere-cpi/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ serviceAccount:
daemonset:
annotations: {}
image: gcr.io/cloud-provider-vsphere/cpi/release/manager
tag: v1.24.2
tag: v1.25.0
pullPolicy: IfNotPresent
dnsPolicy: ClusterFirst
cmdline:
Expand All @@ -80,7 +80,5 @@ daemonset:
## Additional pod labels
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
podLabels: {}
## Allows for the default selector to be replaced with user-defined ones
nodeSelector: {}
## Allows for the default tolerations to be replaced with user-defined ones
tolerations: []
2 changes: 1 addition & 1 deletion cluster/images/controller-manager/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ARG DISTROLESS_IMAGE=gcr.io/distroless/static@sha256:9b60270ec0991bc4f14bda475e8
FROM ${GOLANG_IMAGE} as builder

# This build arg is the version to embed in the CPI binary
ARG VERSION=1.24.2
ARG VERSION=1.25.0

# This build arg controls the GOPROXY setting
ARG GOPROXY
Expand Down
2 changes: 1 addition & 1 deletion docs/book/tutorials/disable-node-deletion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ spec:
priorityClassName: system-node-critical
containers:
- name: vsphere-cloud-controller-manager
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.24.2
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.25.0
args:
- --cloud-provider=vsphere
- --v=2
Expand Down
25 changes: 22 additions & 3 deletions index.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,28 @@
apiVersion: v1
entries:
vsphere-cpi:
- apiVersion: v2
appVersion: 1.25.0
created: "2022-10-18T18:31:05.010977-07:00"
description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI)
digest: 3d48df49fdfb8bda6b5cec1d9e9f566183a150c8c01e111eec5e22ab1f557e31
home: https://github.com/kubernetes/cloud-provider-vsphere
icon: https://raw.githubusercontent.com/kubernetes/cloud-provider-vsphere/master/docs/vmware_logo.png
keywords:
- vsphere
- vmware
- cloud
- provider
- cpi
name: vsphere-cpi
sources:
- https://github.com/kubernetes/cloud-provider-vsphere
urls:
- https://kubernetes.github.io/cloud-provider-vsphere/charts/vsphere-cpi-1.25.0.tgz
version: 1.25.0
- apiVersion: v2
appVersion: 1.24.2
created: "2022-09-23T14:57:24.196241-07:00"
created: "2022-10-18T18:31:05.010225-07:00"
description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI)
digest: d0bfaf8a081128f9477b8d8ff00079f8506d4aa2ea899f55511d06400179b159
home: https://github.com/kubernetes/cloud-provider-vsphere
Expand All @@ -22,7 +41,7 @@ entries:
version: 1.24.2
- apiVersion: v2
appVersion: 1.24.1
created: "2022-09-23T14:57:24.194759-07:00"
created: "2022-10-18T18:31:05.008975-07:00"
description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI)
digest: 6e9dec3e4c6aaeed0d7f95aa2beade986d5a0a2261509b11479ceb1a51312096
home: https://github.com/kubernetes/cloud-provider-vsphere
Expand All @@ -39,4 +58,4 @@ entries:
urls:
- https://kubernetes.github.io/cloud-provider-vsphere/charts/vsphere-cpi-1.24.1.tgz
version: 1.24.1
generated: "2022-09-23T14:57:24.192074-07:00"
generated: "2022-10-18T18:31:05.006999-07:00"
263 changes: 263 additions & 0 deletions releases/v1.25/vsphere-cloud-controller-manager.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,263 @@
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: cloud-controller-manager
labels:
vsphere-cpi-infra: service-account
component: cloud-controller-manager
namespace: kube-system
---
apiVersion: v1
kind: Secret
metadata:
name: vsphere-cloud-secret
labels:
vsphere-cpi-infra: secret
component: cloud-controller-manager
namespace: kube-system
# NOTE: this is just an example configuration, update with real values based on your environment
stringData:
10.0.0.1.username: "<ENTER_YOUR_VCENTER_USERNAME>"
10.0.0.1.password: "<ENTER_YOUR_VCENTER_PASSWORD>"
1.2.3.4.username: "<ENTER_YOUR_VCENTER_USERNAME>"
1.2.3.4.password: "<ENTER_YOUR_VCENTER_PASSWORD>"
---
apiVersion: v1
kind: ConfigMap
metadata:
name: vsphere-cloud-config
labels:
vsphere-cpi-infra: config
component: cloud-controller-manager
namespace: kube-system
data:
# NOTE: this is just an example configuration, update with real values based on your environment
vsphere.conf: |
# Global properties in this section will be used for all specified vCenters unless overriden in VirtualCenter section.
global:
port: 443
# set insecureFlag to true if the vCenter uses a self-signed cert
insecureFlag: true
# settings for using k8s secret
secretName: vsphere-cloud-secret
secretNamespace: kube-system
# vcenter section
vcenter:
your-vcenter-name-here:
server: 10.0.0.1
user: use-your-vcenter-user-here
password: use-your-vcenter-password-here
datacenters:
- hrwest
- hreast
could-be-a-tenant-label:
server: 1.2.3.4
datacenters:
- mytenantdc
secretName: cpi-engineering-secret
secretNamespace: kube-system
# labels for regions and zones
labels:
region: k8s-region
zone: k8s-zone
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: servicecatalog.k8s.io:apiserver-authentication-reader
labels:
vsphere-cpi-infra: role-binding
component: cloud-controller-manager
namespace: kube-system
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: extension-apiserver-authentication-reader
subjects:
- apiGroup: ""
kind: ServiceAccount
name: cloud-controller-manager
namespace: kube-system
- apiGroup: ""
kind: User
name: cloud-controller-manager
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: system:cloud-controller-manager
labels:
vsphere-cpi-infra: cluster-role-binding
component: cloud-controller-manager
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: system:cloud-controller-manager
subjects:
- kind: ServiceAccount
name: cloud-controller-manager
namespace: kube-system
- kind: User
name: cloud-controller-manager
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: system:cloud-controller-manager
labels:
vsphere-cpi-infra: role
component: cloud-controller-manager
rules:
- apiGroups:
- ""
resources:
- events
verbs:
- create
- patch
- update
- apiGroups:
- ""
resources:
- nodes
verbs:
- "*"
- apiGroups:
- ""
resources:
- nodes/status
verbs:
- patch
- apiGroups:
- ""
resources:
- services
verbs:
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
- services/status
verbs:
- patch
- apiGroups:
- ""
resources:
- serviceaccounts
verbs:
- create
- get
- list
- watch
- update
- apiGroups:
- ""
resources:
- persistentvolumes
verbs:
- get
- list
- update
- watch
- apiGroups:
- ""
resources:
- endpoints
verbs:
- create
- get
- list
- watch
- update
- apiGroups:
- ""
resources:
- secrets
verbs:
- get
- list
- watch
- apiGroups:
- "coordination.k8s.io"
resources:
- leases
verbs:
- create
- get
- list
- watch
- update
---
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: vsphere-cloud-controller-manager
labels:
component: cloud-controller-manager
tier: control-plane
namespace: kube-system
spec:
selector:
matchLabels:
name: vsphere-cloud-controller-manager
updateStrategy:
type: RollingUpdate
template:
metadata:
labels:
name: vsphere-cloud-controller-manager
component: cloud-controller-manager
tier: control-plane
spec:
tolerations:
- key: node.cloudprovider.kubernetes.io/uninitialized
value: "true"
effect: NoSchedule
- key: node-role.kubernetes.io/master
effect: NoSchedule
operator: Exists
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
operator: Exists
- key: node.kubernetes.io/not-ready
effect: NoSchedule
operator: Exists
securityContext:
runAsUser: 1001
serviceAccountName: cloud-controller-manager
priorityClassName: system-node-critical
containers:
- name: vsphere-cloud-controller-manager
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.25.0
args:
- --cloud-provider=vsphere
- --v=2
- --cloud-config=/etc/cloud/vsphere.conf
volumeMounts:
- mountPath: /etc/cloud
name: vsphere-config-volume
readOnly: true
resources:
requests:
cpu: 200m
hostNetwork: true
volumes:
- name: vsphere-config-volume
configMap:
name: vsphere-cloud-config
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: node-role.kubernetes.io/control-plane
operator: Exists
- matchExpressions:
- key: node-role.kubernetes.io/master
operator: Exists

0 comments on commit dd98e0a

Please sign in to comment.