Skip to content

Commit

Permalink
Merge pull request #1 from cilium/master
Browse files Browse the repository at this point in the history
pull request
  • Loading branch information
konghui committed Sep 25, 2020
2 parents e9bb6e7 + 5c6aad6 commit 98871ec
Show file tree
Hide file tree
Showing 8,943 changed files with 1,247,709 additions and 851,203 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
87 changes: 87 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
# Compiled Object files, Static and Dynamic libs (Shared Objects)
*.o
*.a
*.so
*.so.*

# LLVM IR files
*.ll
*.ll-*

# Folders
_obj
_test
_build/

# Architecture specific extensions/prefixes
*.cgo1.go
*.cgo2.c
_cgo_defun.c
_cgo_gotypes.go
_cgo_export.*

_testmain.go

*.exe
*.test
*.prof

*.swn
*.swp
.vagrant
vagrant.kubeconfig
coverage.out
coverage-all.out
coverage-all.html

.DS_Store
.idea/
*.plist

*_bash_completion
*.swo
outgoing

*cscope.files
*cscope.out
*cscope.in.out
*cscope.po.out
*tags
.gdb_history

man/

tests/cilium-files
test/test_results*
test/.vagrant
test/tmp.yaml
test/*_manifest.yaml
test/*.xml
test/*.json
test/*.log
test/bpf/_results
test/cilium-[0-9a-f]*.yaml
test/*tmp
test/cilium-istioctl

# generated test files
test/k8sT/manifests/cnp-second-namespaces.yaml
test/cilium.conf.ginkgo

# GKE temporary files
test/gke/cluster-name
test/gke/cluster-uri
test/gke/cluster-version
test/gke/gke-kubeconfig
test/gke/resize-kubeconfig
test/gke/registry-adder.yaml

# Emacs backup files
*~

# generated from make targets
*.ok
*.build_all

# In GIT but ignored for docker
hack/
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
go.sum linguist-generated
examples/kubernetes/connectivity-check/connectivity-*.yaml linguist-generated
examples/crds/*.yaml linguist-generated
Documentation/cmdref/** linguist-generated
9 changes: 5 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: Bug Report
about: Report a bug encountered while operating Cilium
title: ''
labels: ''
labels: 'kind/bug'
assignees: ''

---
Expand Down Expand Up @@ -33,9 +33,10 @@ security@cilium.io - first, before disclosing them in any public forums.
- Kernel version (run `uname -a`)
- Orchestration system version in use (e.g. `kubectl version`, Mesos, ...)
- Link to relevant artifacts (policies, deployments scripts, ...)
- Upload a system dump (run `curl -sLO
releases.cilium.io/tools/cluster-diagnosis.zip &&
python cluster-diagnosis.zip sysdump` and then attach the generated zip file)
- Generate and upload a system zip:
```
curl -sLO https://git.io/cilium-sysdump-latest.zip && python cilium-sysdump-latest.zip
```

**How to reproduce the issue**

Expand Down
11 changes: 6 additions & 5 deletions .github/ISSUE_TEMPLATE/failing_test_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
name: Failing Test
about: Report test failures in Cilium CI jobs
title: 'CI: '
labels: area/CI
labels: area/CI, project/ci-force
assignees: ''

---

## CI failure

- Set title to be in the format `CI: <test-name>`
- Copy-paste the output the test failure
- Upload the zip file generated from that test failure
- Copy-paste the link of the CI build where that test failure has happen
- Set title to be in the format `CI: <test-name>`.
- Copy-paste the output the test failure.
- Upload the zip file generated from that test failure.
- Copy-paste the link of the CI build where that test failure has happen.
- Include any output from logs that you think may be relevant (to ease GitHub searches).
18 changes: 0 additions & 18 deletions .github/ISSUE_TEMPLATE/issue_template.md

This file was deleted.

72 changes: 72 additions & 0 deletions .github/ISSUE_TEMPLATE/release_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
---
name: Release a new version of Cilium
about: Create a checklist for an upcoming release
title: 'vX.Y.Z release'
labels: kind/release
assignees: ''

---

## Pre-release

- [ ] Create a [new project] for the next release version
- [ ] Add build targets for the new release on [Docker Hub]
- All versions:
- [cilium](https://hub.docker.com/repository/docker/cilium/cilium/builds/edit)
- [operator](https://hub.docker.com/repository/docker/cilium/operator/builds/edit)
- [docker-plugin](https://hub.docker.com/repository/docker/cilium/docker-plugin/builds/edit)
- Cilium v1.8 or later:
- [operator-generic](https://hub.docker.com/repository/docker/cilium/operator-generic/builds/edit)
- [operator-aws](https://hub.docker.com/repository/docker/cilium/operator-aws/builds/edit)
- [operator-azure](https://hub.docker.com/repository/docker/cilium/operator-azure/builds/edit)
- [hubble-relay](https://hub.docker.com/repository/docker/cilium/hubble-relay/builds/edit)
- [ ] Check that there are no [release blockers] for the targeted release version
- [ ] Ensure that outstanding [backport PRs] are merged
- [ ] Consider building new [cilium-runtime images] and bumping the base image
versions on this branch
- [ ] Move any unresolved issues/PRs from old release project into the newly
created release project
- [ ] Push a PR including the changes necessary for the new release:
- [ ] Pull latest branch
- [ ] Run `contrib/release/start-release.sh'
- [ ] (If applicable) Update the `cilium_version` and `cilium_tag` in
`examples/getting-started/Vagrantfile`
- [ ] Commit all changes with title `Prepare for release vX.Y.Z`
- [ ] Submit PR (`contrib/release/submit-release.sh`)
- [ ] Merge PR
- [ ] Create and push *both* tags to GitHub (`vX.Y.Z`, `X.Y.Z`)
- Pull latest branch locally and run `contrib/release/tag-release.sh`
- [ ] Wait for docker builds to complete
- [cilium](https://hub.docker.com/repository/docker/cilium/cilium/builds)
- [operator](https://hub.docker.com/repository/docker/cilium/operator/builds)
- [docker-plugin](https://hub.docker.com/repository/docker/cilium/docker-plugin/builds)
- [ ] Create helm charts artifacts in [Cilium charts] repository using
[cilium helm release tool] for both the `vX.Y.Z` release and `vX.Y` branch
& push to repository
- [ ] Run sanity check of Helm install using connectivity-check script.
Suggested approach: Follow the full [GKE getting started guide].
- [ ] Check draft release from [releases] page and publish the release
- [ ] Announce the release in #general on Slack (only [@]channel for vX.Y.0)

## Post-release

- [ ] Prepare post-release changes to master branch using `contrib/release/bump-readme.sh`
- [ ] Update the `stable` tags for each Cilium image on Docker Hub (if applicable)
- [ ] Update external tools and guides to point to the new Cilium version:
- [ ] [kops]
- [ ] [kubespray]


[release blockers]: https://github.com/cilium/cilium/labels/priority%2Frelease-blocker
[backport PRs]: https://github.com/cilium/cilium/pulls?utf8=%E2%9C%93&q=is%3Aopen+is%3Apr+backports
[new project]: https://github.com/cilium/cilium/projects/new
[Cilium release-notes tool]: https://github.com/cilium/release
[Docker Hub]: https://hub.docker.com/orgs/cilium/repositories
[Cilium charts]: https://github.com/cilium/charts
[releases]: https://github.com/cilium/cilium/releases
[Stable releases]: https://github.com/cilium/cilium#stable-releases
[kops]: https://github.com/kubernetes/kops/
[kubespray]: https://github.com/kubernetes-sigs/kubespray/
[cilium helm release tool]: https://github.com/cilium/charts/blob/master/prepare_artifacts.sh
[GKE getting started guide]: https://docs.cilium.io/en/stable/gettingstarted/k8s-install-gke/
[cilium-runtime images]: https://quay.io/repository/cilium/cilium-runtime
46 changes: 46 additions & 0 deletions .github/cilium-actions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
project: "https://github.com/cilium/cilium/projects/113"
column: "In progress"
move-to-projects-for-labels-xored:
v1.8:
needs-backport/1.8:
project: "https://github.com/cilium/cilium/projects/125"
column: "Needs backport from master"
backport-pending/1.8:
project: "https://github.com/cilium/cilium/projects/125"
column: "Backport pending to v1.8"
backport-done/1.8:
project: "https://github.com/cilium/cilium/projects/125"
column: "Backport done to v1.8"
v1.7:
needs-backport/1.7:
project: "https://github.com/cilium/cilium/projects/126"
column: "Needs backport from master"
backport-pending/1.7:
project: "https://github.com/cilium/cilium/projects/126"
column: "Backport pending to v1.7"
backport-done/1.7:
project: "https://github.com/cilium/cilium/projects/126"
column: "Backport done to v1.7"
v1.6:
needs-backport/1.6:
project: "https://github.com/cilium/cilium/projects/122"
column: "Needs backport from master"
backport-pending/1.6:
project: "https://github.com/cilium/cilium/projects/122"
column: "Backport pending to v1.6"
backport-done/1.6:
project: "https://github.com/cilium/cilium/projects/122"
column: "Backport done to v1.6"
require-msgs-in-commit:
- msg: "Signed-off-by"
helper: "https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin"
set-labels:
- "dont-merge/needs-sign-off"
block-pr-with:
labels-unset:
- regex-label: "release-note/.*"
set-labels:
- "dont-merge/needs-release-note-label"
labels-set:
- regex-label: "dont-merge/.*"
helper: "Blocking mergeability of PR as 'dont-merge/.*' labels are set"
20 changes: 20 additions & 0 deletions .github/kind-config-ipv6.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
nodes:
- role: control-plane
image: kindest/node:v1.19.1
kubeadmConfigPatches:
# To make sure that there is no taint for master node.
# Otherwise additional worker node might be required for conformance testing.
- |
apiVersion: kubeadm.k8s.io/v1beta2
kind: InitConfiguration
nodeRegistration:
taints: []
- role: worker
image: kindest/node:v1.19.1
networking:
ipFamily: ipv6
disableDefaultCNI: true
podSubnet: "fd00:10:244::/64"
serviceSubnet: "fd00:10:96::/112"
19 changes: 19 additions & 0 deletions .github/kind-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
nodes:
- role: control-plane
image: kindest/node:v1.19.1
kubeadmConfigPatches:
# To make sure that there is no taint for master node.
# Otherwise additional worker node might be required for conformance testing.
- |
apiVersion: kubeadm.k8s.io/v1beta2
kind: InitConfiguration
nodeRegistration:
taints: []
- role: worker
image: kindest/node:v1.19.1
networking:
disableDefaultCNI: true
podSubnet: "10.244.0.0/16"
serviceSubnet: "10.245.0.0/16"
8 changes: 4 additions & 4 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Please ensure your pull request adheres to the following guidelines:

- [ ] For first time contributors, read [Submitting a pull request](http://docs.cilium.io/en/stable/contributing/#submitting-a-pull-request)
- [ ] For first time contributors, read [Submitting a pull request](https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#submitting-a-pull-request)
- [ ] All code is covered by unit and/or runtime tests where feasible.
- [ ] All commits contain a well written commit description including a title,
description and a `Fixes: #XXX` line if the commit addresses a particular
GitHub issue.
- [ ] All commits are signed off. See the section [Developer’s Certificate of Origin](http://docs.cilium.io/en/stable/contributing/#dev-coo).
GitHub issue.
- [ ] All commits are signed off. See the section [Developer’s Certificate of Origin](https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#dev-coo)
- [ ] Provide a title or release-note blurb suitable for the release notes.
- [ ] Thanks for contributing!

Expand All @@ -14,5 +14,5 @@ Please ensure your pull request adheres to the following guidelines:
Fixes: #issue-number

```release-note
<!-- Enter the release note text here if needed -->
<!-- Enter the release note text here if needed or remove this section! -->
```
59 changes: 59 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# Configuration for probot-stale - https://github.com/probot/stale

# Number of days of inactivity before an Issue or Pull Request becomes stale
daysUntilStale: 60

# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
daysUntilClose: 14

# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
onlyLabels: []

# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
exemptLabels:
- pinned
- security

# Set to true to ignore issues in a project (defaults to false)
exemptProjects: false

# Set to true to ignore issues in a milestone (defaults to false)
exemptMilestones: false

# Set to true to ignore issues with an assignee (defaults to false)
exemptAssignees: true

# Label to use when marking as stale
staleLabel: stale

# Comment to post when marking as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs.
# Comment to post when removing the stale label.
# unmarkComment: >
# Your comment here.

# Comment to post when closing a stale Issue or Pull Request.
closeComment: >
This issue has not seen any activity since it was marked stale. Closing.
# Limit the number of actions per hour, from 1-30. Default is 30
limitPerRun: 30

# Limit to only `issues` or `pulls`
# only: issues

# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
pulls:
daysUntilStale: 30
markComment: >
This pull request has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
# issues:
# exemptLabels:
# - confirmed
Loading

0 comments on commit 98871ec

Please sign in to comment.