Skip to content

Commit

Permalink
Merge pull request #12 from openshift-cloud-team/rebase-bot-master
Browse files Browse the repository at this point in the history
  • Loading branch information
openshift-merge-robot committed Jan 10, 2022
2 parents 7c2d3f0 + afd0d59 commit 25b98d3
Show file tree
Hide file tree
Showing 2,646 changed files with 313,062 additions and 25,951 deletions.
25 changes: 0 additions & 25 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

125 changes: 125 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.yaml
@@ -0,0 +1,125 @@
name: Bug Report
description: Report a bug encountered while operating Kubernetes
labels: kind/bug
body:
- type: textarea
id: problem
attributes:
label: What happened?
description: |
Please provide as much info as possible. Not doing so may result in your bug not being addressed in a timely manner.
If this matter is security related, please disclose it privately via https://kubernetes.io/security
validations:
required: true

- type: textarea
id: expected
attributes:
label: What did you expect to happen?
validations:
required: true

- type: textarea
id: repro
attributes:
label: How can we reproduce it (as minimally and precisely as possible)?
validations:
required: true

- type: textarea
id: additional
attributes:
label: Anything else we need to know (please consider providing level 4 or above logs of CPI)?

- type: textarea
id: kubeVersion
attributes:
label: Kubernetes version
value: |
<details>
```console
$ kubectl version
# paste output here
```
</details>
validations:
required: true

- type: textarea
id: cloudProvider
attributes:
label: Cloud provider or hardware configuration
value: |
<details>
</details>
validations:
required: true

- type: textarea
id: osVersion
attributes:
label: OS version
value: |
<details>
```console
# On Linux:
$ cat /etc/os-release
# paste output here
$ uname -a
# paste output here
# On Windows:
C:\> wmic os get Caption, Version, BuildNumber, OSArchitecture
# paste output here
```
</details>
- type: textarea
id: kernel
attributes:
label: Kernel (e.g. `uname -a`)
value: |
<details>
</details>
- type: textarea
id: installer
attributes:
label: Install tools
value: |
<details>
</details>
- type: textarea
id: runtime
attributes:
label: Container runtime (CRI) and and version (if applicable)
value: |
<details>
</details>
- type: textarea
id: plugins
attributes:
label: Related plugins (CNI, CSI, ...) and versions (if applicable)
value: |
<details>
</details>
- type: textarea
id: others
attributes:
label: Others
value: |
<details>
</details>
4 changes: 4 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,4 @@
contact_links:
- name: Support Request
url: https://discuss.kubernetes.io
about: Support request or question relating to Kubernetes
21 changes: 21 additions & 0 deletions .github/ISSUE_TEMPLATE/enhancement.yaml
@@ -0,0 +1,21 @@
name: Enhancement Tracking Issue
description: Provide supporting details for a feature in development
labels: kind/feature
body:
- type: textarea
id: feature
attributes:
label: What would you like to be added?
description: |
Feature requests are unlikely to make progress as issues. Please consider engaging with SIGs on slack and mailing lists, instead.
A proposal that works through the design along with the implications of the change can be opened as a KEP.
See https://git.k8s.io/enhancements/keps#kubernetes-enhancement-proposals-keps
validations:
required: true

- type: textarea
id: rationale
attributes:
label: Why is this needed?
validations:
required: true
48 changes: 48 additions & 0 deletions .github/ISSUE_TEMPLATE/failing-test.yaml
@@ -0,0 +1,48 @@
name: Failing Test
description: Report continuously failing tests or jobs in Kubernetes CI
labels: kind/failing-test
body:
- type: textarea
id: jobs
attributes:
label: Which jobs are failing?
placeholder: |
Please only use this template for submitting reports about continuously failing tests or jobs in Kubernetes CI.
validations:
required: true

- type: textarea
id: tests
attributes:
label: Which tests are failing?
validations:
required: true

- type: textarea
id: since
attributes:
label: Since when has it been failing?
validations:
required: true

- type: input
id: testgrid
attributes:
label: Testgrid link

- type: textarea
id: reason
attributes:
label: Reason for failure (if possible)

- type: textarea
id: additional
attributes:
label: Anything else we need to know?

- type: textarea
id: sigs
attributes:
label: Relevant SIG(s)
description: You can identify the SIG from the "prowjob_config_url" on the testgrid dashboard for a test.
value: /sig
50 changes: 50 additions & 0 deletions .github/ISSUE_TEMPLATE/flaking-test.yaml
@@ -0,0 +1,50 @@
name: Flaking Test
description: Report flaky tests or jobs in Kubernetes CI
labels: kind/flake
body:
- type: textarea
id: jobs
attributes:
label: Which jobs are flaking?
description: |
Please only use this template for submitting reports about flaky tests or jobs (pass or fail with no underlying change in code) in Kubernetes CI.
Links to go.k8s.io/triage and/or links to specific failures in spyglass are appreciated.
Please see the deflaking doc (https://github.com/kubernetes/community/blob/master/contributors/devel/sig-testing/flaky-tests.md) for more guidance.
validations:
required: true

- type: textarea
id: tests
attributes:
label: Which tests are flaking?
validations:
required: true

- type: textarea
id: since
attributes:
label: Since when has it been flaking?
validations:
required: true

- type: input
id: testgrid
attributes:
label: Testgrid link

- type: textarea
id: reason
attributes:
label: Reason for failure (if possible)

- type: textarea
id: additional
attributes:
label: Anything else we need to know?

- type: textarea
id: sigs
attributes:
label: Relevant SIG(s)
description: You can identify the SIG from the "prowjob_config_url" on the testgrid dashboard for a test.
value: /sig
9 changes: 8 additions & 1 deletion .gitignore
Expand Up @@ -4,6 +4,9 @@
# Ignore the build output.
/.build

# Ignore tooling binaries.
/hack/tools/bin

# Ignore the environment variable and Prow configuration files at
# the root of the project.
/config.env
Expand All @@ -24,7 +27,6 @@
*.sublime-workspace
*.swp
.idea
.DS_Store

# OSX leaves these everywhere on SMB shares
._*
Expand Down Expand Up @@ -145,6 +147,7 @@ zz_generated.openapi.go
/.make/
# Just in time generated data in the source, should never be committed
/test/e2e/generated/bindata.go
/test/e2e/data

# This file used by some vendor repos (e.g. github.com/go-openapi/...) to store secret variables and should not be ignored
!\.drone\.sec
Expand All @@ -155,5 +158,9 @@ zz_generated.openapi.go
/bazel-*
*.pyc

# Output artifacts & logs from e2e
/_e2e-logs/
/_e2e_artifacts/

# binaries
/vsphere-cloud-controller-manager
19 changes: 18 additions & 1 deletion Makefile
Expand Up @@ -93,6 +93,14 @@ build build-bins: $(CCM_BIN)
build-with-docker:
hack/make.sh

# Tooling binaries for e2e
TOOLS_DIR := $(abspath hack/tools)
TOOLS_BIN_DIR := $(TOOLS_DIR)/bin
GINKGO := $(TOOLS_BIN_DIR)/ginkgo
KIND := $(TOOLS_BIN_DIR)/kind
TOOLING_BINARIES := $(GINKGO) $(KIND)
E2E_DIR := $(abspath test/e2e)

################################################################################
## DIST ##
################################################################################
Expand Down Expand Up @@ -204,7 +212,7 @@ endif # ifndef X_BUILD_DISABLED
## TESTING ##
################################################################################
ifndef PKGS_WITH_TESTS
export PKGS_WITH_TESTS := $(sort $(shell find . -name "*_test.go" -type f -exec dirname \{\} \;))
export PKGS_WITH_TESTS := $(sort $(shell find ./pkg -name "*_test.go" -type f -exec dirname \{\} \;))
endif
TEST_FLAGS ?= -v
.PHONY: unit build-unit-tests
Expand All @@ -225,6 +233,15 @@ build-tests: build-unit-tests
cover: TEST_FLAGS += -cover
cover: test

tools: $(TOOLING_BINARIES) ## Build tooling binaries
.PHONY: $(TOOLING_BINARIES)
$(TOOLING_BINARIES):
make -C $(TOOLS_DIR) $(@F)

.PHONY: test-e2e
test-e2e:
make -C $(E2E_DIR) run

.PHONY: integration-test
integration-test: | $(DOCKER_SOCK)
$(MAKE) -C test/integration
Expand Down
6 changes: 6 additions & 0 deletions README.md
Expand Up @@ -23,10 +23,16 @@ Version matrix:

| Kubernetes Version | vSphere Cloud Provider Release Version | Cloud Provider Branch |
| ----------- | ----------- | ----------- |
| v1.22.X | v1.22.X | release-1.22 |
| v1.21.X | v1.21.X | release-1.21 |
| v1.20.X | v1.20.X | release-1.20 |
| v1.19.X | v1.19.X | release-1.19 |
| v1.18.X | v1.18.X | release-1.18 |

Our current support policy is that when a new Kubernetes release comes out, we will bump our k8s dependencies to the new version and cut a new release for CPI, e.g. CPI v1.22.x was released after k8s v1.22 comes out.

The latest CPI version is ![GitHub release (latest SemVer including pre-releases](https://img.shields.io/github/v/release/kubernetes/cloud-provider-vsphere?include_prereleases). The recommended way to upgrade CPI can be found on [this page](https://github.com/kubernetes/cloud-provider-vsphere/blob/master/releases/README.md).

## Quickstart

Get started with Cloud controller manager for vSphere with Kubeadm with this [quickstart](https://cloud-provider-vsphere.sigs.k8s.io/tutorials/kubernetes-on-vsphere-with-kubeadm.html).
Expand Down
2 changes: 1 addition & 1 deletion charts/vsphere-cpi/Chart.yaml
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 1.21.0
appVersion: 1.22.2
description: A Helm chart for vSphere Cloud Provider Interface Manager (CPI)
name: vsphere-cpi
version: 1.0.0
Expand Down

0 comments on commit 25b98d3

Please sign in to comment.