Skip to content

Commit 19db81f

Browse files
committed
docs: Content changes to merge after transfer to Kubernetes SIGs
Update copyright and add kubernetes-template files before donating to kubernetes-sigs As part of https://github.com/kubernetes/community/blob/master/github-management/kubernetes-repositories.md#rules-for-donated-repositories we need to make sure our project contains template files as per the https://github.com/kubernetes/kubernetes-template-project
1 parent b5cca41 commit 19db81f

File tree

88 files changed

+755
-652
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+755
-652
lines changed

OWNERS

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
2+
3+
approvers:
4+
- sig-cluster-lifecycle-leads
5+
- cluster-api-admins
6+
- cluster-api-maintainers
7+
- cluster-api-oci-maintainers
8+
9+
reviewers:
10+
- cluster-api-oci-maintainers
11+
- cluster-api-oci-reviewers

LICENSE.txt LICENSE

File renamed without changes.

Makefile

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#
2-
# Copyright (c) 2021, 2022 Oracle and/or its affiliates.
1+
# Copyright 2022 The Kubernetes Authors.
32
#
43
# Licensed under the Apache License, Version 2.0 (the "License");
54
# you may not use this file except in compliance with the License.
@@ -12,7 +11,6 @@
1211
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1312
# See the License for the specific language governing permissions and
1413
# limitations under the License.
15-
#
1614

1715
SHELL:=/usr/bin/env bash
1816

NOTICE.txt

-13
This file was deleted.

OWNERS_ALIASES

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# See the OWNERS_ALIASES docs: https://git.k8s.io/community/contributors/guide/owners.md#owners_aliases
2+
3+
aliases:
4+
sig-cluster-lifecycle-leads:
5+
- fabriziopandini
6+
- justinsb
7+
- neolit123
8+
- timothysc
9+
cluster-api-admins:
10+
- CecileRobertMichon
11+
- vincepri
12+
cluster-api-maintainers:
13+
- CecileRobertMichon
14+
- enxebre
15+
- fabriziopandini
16+
- sbueringer
17+
- vincepri
18+
cluster-api-oci-maintainers:
19+
- shyamradhakrishnan
20+
- arindam-bandyopadhyay
21+
- joekr
22+
cluster-api-oci-reviewers:
23+
- shyamradhakrishnan
24+
- arindam-bandyopadhyay
25+
- joekr

RELEASE.md

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Release Process
2+
3+
The Kubernetes Template Project is released on an as-needed basis. The process is as follows:
4+
5+
1. An issue is proposing a new release with a changelog since the last release
6+
1. All [OWNERS](OWNERS) must LGTM this release
7+
1. An OWNER runs `git tag -s $VERSION` and inserts the changelog and pushes the tag with `git push $VERSION`
8+
1. The release issue is closed
9+
1. An announcement email is sent to `[email protected]` with the subject `[ANNOUNCE] kubernetes-template-project $VERSION is released`

SECURITY.md

+22-40
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,22 @@
1-
# Reporting security vulnerabilities
2-
3-
Oracle values the independent security research community and believes that
4-
responsible disclosure of security vulnerabilities helps us ensure the security
5-
and privacy of all our users.
6-
7-
Please do NOT raise a GitHub Issue to report a security vulnerability. If you
8-
believe you have found a security vulnerability, please submit a report to
9-
[[email protected]][1] preferably with a proof of concept. Please review
10-
some additional information on [how to report security vulnerabilities to Oracle][2].
11-
We encourage people who contact Oracle Security to use email encryption using
12-
[our encryption key][3].
13-
14-
We ask that you do not use other channels or contact the project maintainers
15-
directly.
16-
17-
Non-vulnerability related security issues including ideas for new or improved
18-
security features are welcome on GitHub Issues.
19-
20-
## Security updates, alerts and bulletins
21-
22-
Security updates will be released on a regular cadence. Many of our projects
23-
will typically release security fixes in conjunction with the
24-
[Oracle Critical Patch Update][3] program. Security updates are released on the
25-
Tuesday closest to the 17th day of January, April, July and October. A pre-release
26-
announcement will be published on the Thursday preceding each release. Additional
27-
information, including past advisories, is available on our [security alerts][4]
28-
page.
29-
30-
## Security-related information
31-
32-
We will provide security related information such as a threat model, considerations
33-
for secure use, or any known security issues in our documentation. Please note
34-
that labs and sample code are intended to demonstrate a concept and may not be
35-
sufficiently hardened for production use.
36-
37-
[1]: mailto:[email protected]
38-
[2]: https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html
39-
[3]: https://www.oracle.com/security-alerts/encryptionkey.html
40-
[4]: https://www.oracle.com/security-alerts/
1+
# Security Policy
2+
3+
## Security Announcements
4+
5+
Join the [kubernetes-security-announce] group for security and vulnerability announcements.
6+
7+
You can also subscribe to an RSS feed of the above using [this link][kubernetes-security-announce-rss].
8+
9+
## Reporting a Vulnerability
10+
11+
Instructions for reporting a vulnerability can be found on the
12+
[Kubernetes Security and Disclosure Information] page.
13+
14+
## Supported Versions
15+
16+
Information about supported Kubernetes versions can be found on the
17+
[Kubernetes version and version skew support policy] page on the Kubernetes website.
18+
19+
[kubernetes-security-announce]: https://groups.google.com/forum/#!forum/kubernetes-security-announce
20+
[kubernetes-security-announce-rss]: https://groups.google.com/forum/feed/kubernetes-security-announce/msgs/rss_v2_0.xml?num=50
21+
[Kubernetes version and version skew support policy]: https://kubernetes.io/docs/setup/release/version-skew-policy/#supported-versions
22+
[Kubernetes Security and Disclosure Information]: https://kubernetes.io/docs/reference/issues-security/security/#report-a-vulnerability

SECURITY_CONTACTS

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Defined below are the security contacts for this repo.
2+
#
3+
# They are the contact point for the Security Response Committee to reach out
4+
# to for triaging and handling of incoming issues.
5+
#
6+
# The below names agree to abide by the
7+
# [Embargo Policy](https://git.k8s.io/security/private-distributors-list.md#embargo-policy)
8+
# and will be removed and replaced if they violate that agreement.
9+
#
10+
# DO NOT REPORT SECURITY VULNERABILITIES DIRECTLY TO THESE NAMES, FOLLOW THE
11+
# INSTRUCTIONS AT https://kubernetes.io/security/
12+
13+
shyamradhakrishnan
14+
joekr

api/v1beta1/conditions_consts.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
/*
2-
Copyright (c) 2021, 2022 Oracle and/or its affiliates.
2+
Copyright 2022 The Kubernetes Authors.
33
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
77
8-
https://www.apache.org/licenses/LICENSE-2.0
8+
http://www.apache.org/licenses/LICENSE-2.0
99
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
1515
*/
1616

1717
package v1beta1

api/v1beta1/groupversion_info.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2021, 2022 Oracle and/or its affiliates.
2+
Copyright 2022 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

api/v1beta1/ocicluster_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2021, 2022 Oracle and/or its affiliates.
2+
Copyright 2022 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

api/v1beta1/ocicluster_webhook.go

+14-17
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
/*
2-
*
3-
* Copyright (c) 2022, Oracle and/or its affiliates.
4-
*
5-
* Licensed under the Apache License, Version 2.0 (the "License");
6-
* you may not use this file except in compliance with the License.
7-
* You may obtain a copy of the License at
8-
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
16-
* /
17-
*
18-
*/
2+
Copyright 2022 The Kubernetes Authors.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
1916

2017
package v1beta1
2118

api/v1beta1/ocicluster_webhook_test.go

+14-17
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
/*
2-
*
3-
* Copyright (c) 2022, Oracle and/or its affiliates.
4-
*
5-
* Licensed under the Apache License, Version 2.0 (the "License");
6-
* you may not use this file except in compliance with the License.
7-
* You may obtain a copy of the License at
8-
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
16-
* /
17-
*
18-
*/
2+
Copyright 2022 The Kubernetes Authors.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
1916

2017
package v1beta1
2118

api/v1beta1/ociclustertemplate_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2022, Oracle and/or its affiliates.
2+
Copyright 2022 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

api/v1beta1/ocimachine_types.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2021, 2022 Oracle and/or its affiliates.
2+
Copyright 2022 The Kubernetes Authors.
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

api/v1beta1/ocimachinetemplate_types.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
/*
2-
Copyright (c) 2021, 2022 Oracle and/or its affiliates.
2+
Copyright 2022 The Kubernetes Authors.
33
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
77
8-
https://www.apache.org/licenses/LICENSE-2.0
8+
http://www.apache.org/licenses/LICENSE-2.0
99
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
1515
*/
1616

1717
package v1beta1

api/v1beta1/ocimachinetemplate_webhook.go

+14-17
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
/*
2-
*
3-
* Copyright (c) 2022, Oracle and/or its affiliates.
4-
*
5-
* Licensed under the Apache License, Version 2.0 (the "License");
6-
* you may not use this file except in compliance with the License.
7-
* You may obtain a copy of the License at
8-
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
16-
* /
17-
*
18-
*/
2+
Copyright 2022 The Kubernetes Authors.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
1916

2017
package v1beta1
2118

api/v1beta1/ocimachinetemplate_webhook_test.go

+14-17
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
/*
2-
*
3-
* Copyright (c) 2022, Oracle and/or its affiliates.
4-
*
5-
* Licensed under the Apache License, Version 2.0 (the "License");
6-
* you may not use this file except in compliance with the License.
7-
* You may obtain a copy of the License at
8-
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
16-
* /
17-
*
18-
*/
2+
Copyright 2022 The Kubernetes Authors.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
1916

2017
package v1beta1
2118

0 commit comments

Comments
 (0)