Skip to content

Commit 284c492

Browse files
authored
Merge pull request #32305 from nate-double-u/merged-main-dev-1.24
Merged main into dev 1.24
2 parents c0aed19 + 0289b52 commit 284c492

File tree

81 files changed

+3768
-2254
lines changed

Some content is hidden

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

81 files changed

+3768
-2254
lines changed

Dockerfile

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,42 @@
44
# change is that the Hugo version is now an overridable argument rather than a fixed
55
# environment variable.
66

7-
FROM golang:1.15-alpine
7+
FROM golang:1.16-alpine
88

99
LABEL maintainer="Luc Perkins <[email protected]>"
1010

1111
RUN apk add --no-cache \
1212
curl \
13+
gcc \
14+
g++ \
15+
musl-dev \
16+
build-base \
17+
libc6-compat
18+
19+
ARG HUGO_VERSION
20+
21+
RUN mkdir $HOME/src && \
22+
cd $HOME/src && \
23+
curl -L https://github.com/gohugoio/hugo/archive/refs/tags/v${HUGO_VERSION}.tar.gz | tar -xz && \
24+
cd "hugo-${HUGO_VERSION}" && \
25+
go install --tags extended
26+
27+
FROM golang:1.16-alpine
28+
29+
RUN apk add --no-cache \
1330
git \
1431
openssh-client \
1532
rsync \
16-
build-base \
17-
libc6-compat \
1833
npm && \
1934
npm install -D autoprefixer postcss-cli
2035

21-
ARG HUGO_VERSION
22-
2336
RUN mkdir -p /usr/local/src && \
2437
cd /usr/local/src && \
25-
curl -L https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz | tar -xz && \
26-
mv hugo /usr/local/bin/hugo && \
2738
addgroup -Sg 1000 hugo && \
2839
adduser -Sg hugo -u 1000 -h /src hugo
2940

41+
COPY --from=0 /go/bin/hugo /usr/local/bin/hugo
42+
3043
WORKDIR /src
3144

3245
USER hugo:hugo

OWNERS_ALIASES

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ aliases:
3131
- savitharaghunathan
3232
- sftim
3333
- tengqm
34+
- zacharysarah
3435
sig-docs-en-reviews: # PR reviews for English content
3536
- bradtopol
3637
- celestehorgan
@@ -44,6 +45,7 @@ aliases:
4445
- sftim
4546
- shannonxtreme
4647
- tengqm
48+
- zacharysarah
4749
sig-docs-es-owners: # Admins for Spanish content
4850
- raelga
4951
- electrocucaracha

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,14 @@ For more information about contributing to the Kubernetes documentation, see:
167167
- [Documentation Style Guide](https://kubernetes.io/docs/contribute/style/style-guide/)
168168
- [Localizing Kubernetes Documentation](https://kubernetes.io/docs/contribute/localization/)
169169

170+
### New contributor ambassadors
171+
172+
If you need help at any point when contributing, the [New Contributor Ambassadors](https://kubernetes.io/docs/contribute/advanced/#serve-as-a-new-contributor-ambassador) are a good point of contact. These are SIG Docs approvers whose responsibilities include mentoring new contributors and helping them through their first few pull requests. The best place to contact the New Contributors Ambassadors would be on the [Kubernetes Slack](https://slack.k8s.io/). Current New Contributors Ambassadors for SIG Docs:
173+
174+
| Name | Slack | GitHub |
175+
| -------------------------- | -------------------------- | -------------------------- |
176+
| Arsh Sharma | @arsh | @RinkiyaKeDad |
177+
170178
## Localization `README.md`'s
171179

172180
| Language | Language |
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
---
2-
title: " Faster than a speeding Latte "
2+
title: "Faster than a speeding Latte"
33
date: 2015-04-06
44
slug: faster-than-speeding-latte
55
url: /blog/2015/04/Faster-Than-Speeding-Latte
6+
evergreen: true
67
---
8+
79
Check out Brendan Burns racing Kubernetes.
8-
[![Check out Brendan Burns racing Kubernetes](https://img.youtube.com/vi/7vZ9dRKRMyc/0.jpg)](https://www.youtube.com/watch?v=?7vZ9dRKRMyc)
10+
11+
{{< youtube id="7vZ9dRKRMyc" title="Latte vs. Kubernetes setup - which is faster?">}}

content/en/blog/_posts/2019-02-11-runc-CVE-2019-5736.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,35 @@
11
---
22
title: Runc and CVE-2019-5736
33
date: 2019-02-11
4+
evergreen: false # mentions PodSecurityPolicy
45
---
56

7+
Authors: Kubernetes Product Security Committee
8+
69
This morning [a container escape vulnerability in runc was announced](https://www.openwall.com/lists/oss-security/2019/02/11/2). We wanted to provide some guidance to Kubernetes users to ensure everyone is safe and secure.
710

8-
## What Is Runc?
11+
## What is runc?
912

1013
Very briefly, runc is the low-level tool which does the heavy lifting of spawning a Linux container. Other tools like Docker, Containerd, and CRI-O sit on top of runc to deal with things like data formatting and serialization, but runc is at the heart of all of these systems.
1114

1215
Kubernetes in turn sits on top of those tools, and so while no part of Kubernetes itself is vulnerable, most Kubernetes installations are using runc under the hood.
1316

14-
### What Is The Vulnerability?
17+
### What is the vulnerability?
1518

1619
While full details are still embargoed to give people time to patch, the rough version is that when running a process as root (UID 0) inside a container, that process can exploit a bug in runc to gain root privileges on the host running the container. This then allows them unlimited access to the server as well as any other containers on that server.
1720

1821
If the process inside the container is either trusted (something you know is not hostile) or is not running as UID 0, then the vulnerability does not apply. It can also be prevented by SELinux, if an appropriate policy has been applied. RedHat Enterprise Linux and CentOS both include appropriate SELinux permissions with their packages and so are believed to be unaffected if SELinux is enabled.
1922

2023
The most common source of risk is attacker-controller container images, such as unvetted images from public repositories.
2124

22-
### What Should I Do?
25+
### What should i do?
2326

2427
As with all security issues, the two main options are to mitigate the vulnerability or upgrade your version of runc to one that includes the fix.
2528

2629
As the exploit requires UID 0 within the container, a direct mitigation is to ensure all your containers are running as a non-0 user. This can be set within the container image, or via your pod specification:
2730

2831
```yaml
32+
---
2933
apiVersion: v1
3034
kind: Pod
3135
metadata:
@@ -39,6 +43,7 @@ spec:
3943
This can also be enforced globally using a PodSecurityPolicy:
4044

4145
```yaml
46+
---
4247
apiVersion: policy/v1beta1
4348
kind: PodSecurityPolicy
4449
metadata:
@@ -89,7 +94,7 @@ We don't have specific confirmation that Docker for Mac and Docker for Windows a
8994

9095
If you are unable to upgrade Docker, the Rancher team has provided backports of the fix for many older versions at [github.com/rancher/runc-cve](https://github.com/rancher/runc-cve).
9196

92-
## Getting More Information
97+
## Getting more information
9398

9499
If you have any further questions about how this vulnerability impacts Kubernetes, please join us at [discuss.kubernetes.io](https://discuss.kubernetes.io/).
95100

content/en/blog/_posts/2021-04-22-gateway-api/index.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ This led to design principles that allow the Gateway API to improve upon Ingress
3030

3131
The Gateway API introduces a few new resource types:
3232

33-
- **[GatewayClasses](https://gateway-api.sigs.k8s.io/references/spec/#networking.x-k8s.io/v1alpha1.GatewayClass)** are cluster-scoped resources that act as templates to explicitly define behavior for Gateways derived from them. This is similar in concept to StorageClasses, but for networking data-planes.
34-
- **[Gateways](https://gateway-api.sigs.k8s.io/references/spec/#networking.x-k8s.io/v1alpha1.Gateway)** are the deployed instances of GatewayClasses. They are the logical representation of the data-plane which performs routing, which may be in-cluster proxies, hardware LBs, or cloud LBs.
35-
- **Routes** are not a single resource, but represent many different protocol-specific Route resources. The [HTTPRoute](https://gateway-api.sigs.k8s.io/references/spec/#networking.x-k8s.io/v1alpha1.HTTPRoute) has matching, filtering, and routing rules that get applied to Gateways that can process HTTP and HTTPS traffic. Similarly, there are [TCPRoutes](https://gateway-api.sigs.k8s.io/references/spec/#networking.x-k8s.io/v1alpha1.TCPRoute), [UDPRoutes](https://gateway-api.sigs.k8s.io/references/spec/#networking.x-k8s.io/v1alpha1.UDPRoute), and [TLSRoutes](https://gateway-api.sigs.k8s.io/references/spec/#networking.x-k8s.io/v1alpha1.TLSRoute) which also have protocol-specific semantics. This model also allows the Gateway API to incrementally expand its protocol support in the future.
33+
- **[GatewayClasses](https://gateway-api.sigs.k8s.io/v1alpha1/references/spec/#networking.x-k8s.io/v1alpha1.GatewayClass)** are cluster-scoped resources that act as templates to explicitly define behavior for Gateways derived from them. This is similar in concept to StorageClasses, but for networking data-planes.
34+
- **[Gateways](https://gateway-api.sigs.k8s.io/v1alpha1/references/spec/#networking.x-k8s.io/v1alpha1.Gateway)** are the deployed instances of GatewayClasses. They are the logical representation of the data-plane which performs routing, which may be in-cluster proxies, hardware LBs, or cloud LBs.
35+
- **Routes** are not a single resource, but represent many different protocol-specific Route resources. The [HTTPRoute](https://gateway-api.sigs.k8s.io/v1alpha1/references/spec/#networking.x-k8s.io/v1alpha1.HTTPRoute) has matching, filtering, and routing rules that get applied to Gateways that can process HTTP and HTTPS traffic. Similarly, there are [TCPRoutes](https://gateway-api.sigs.k8s.io/v1alpha1/references/spec/#networking.x-k8s.io/v1alpha1.TCPRoute), [UDPRoutes](https://gateway-api.sigs.k8s.io/v1alpha1/references/spec/#networking.x-k8s.io/v1alpha1.UDPRoute), and [TLSRoutes](https://gateway-api.sigs.k8s.io/v1alpha1/references/spec/#networking.x-k8s.io/v1alpha1.TLSRoute) which also have protocol-specific semantics. This model also allows the Gateway API to incrementally expand its protocol support in the future.
3636

3737
![The resources of the Gateway API](gateway-api-resources.png)
3838

3939
### Gateway Controller Implementations
4040

41-
The good news is that although Gateway is in [Alpha](https://github.com/kubernetes-sigs/gateway-api/releases), there are already several [Gateway controller implementations](https://gateway-api.sigs.k8s.io/references/implementations/) that you can run. Since it’s a standardized spec, the following example could be run on any of them and should function the exact same way. Check out [getting started](https://gateway-api.sigs.k8s.io/guides/getting-started/) to see how to install and use one of these Gateway controllers.
41+
The good news is that although Gateway is in [Alpha](https://github.com/kubernetes-sigs/gateway-api/releases), there are already several [Gateway controller implementations](https://gateway-api.sigs.k8s.io/implementations/) that you can run. Since it’s a standardized spec, the following example could be run on any of them and should function the exact same way. Check out [getting started](https://gateway-api.sigs.k8s.io/v1alpha1/guides/getting-started/) to see how to install and use one of these Gateway controllers.
4242

4343
## Getting Hands-on with the Gateway API
4444

@@ -134,7 +134,7 @@ spec:
134134

135135
So we have two HTTPRoutes matching and routing traffic to different Services. You might be wondering, where are these Services accessible? Through which networks or IPs are they exposed?
136136

137-
How Routes are exposed to clients is governed by [Route binding](https://gateway-api.sigs.k8s.io/concepts/api-overview/#route-binding), which describes how Routes and Gateways create a bidirectional relationship between each other. When Routes are bound to a Gateway it means their collective routing rules are configured on the underlying load balancers or proxies and the Routes are accessible through the Gateway. Thus, a Gateway is a logical representation of a networking data plane that can be configured through Routes.
137+
How Routes are exposed to clients is governed by [Route binding](https://gateway-api.sigs.k8s.io/concepts/api-overview/#route-resources), which describes how Routes and Gateways create a bidirectional relationship between each other. When Routes are bound to a Gateway it means their collective routing rules are configured on the underlying load balancers or proxies and the Routes are accessible through the Gateway. Thus, a Gateway is a logical representation of a networking data plane that can be configured through Routes.
138138

139139

140140
![How Routes bind with Gateways](route-binding.png )
@@ -192,6 +192,6 @@ When you put it all together, you have a single load balancing infrastructure th
192192

193193
There are many resources to check out to learn more.
194194

195-
* Check out the [user guides](https://gateway-api.sigs.k8s.io/guides/getting-started/) to see what use-cases can be addressed.
196-
* Try out one of the [existing Gateway controllers ](https://gateway-api.sigs.k8s.io/references/implementations/)
195+
* Check out the [user guides](https://gateway-api.sigs.k8s.io/v1alpha1/guides/getting-started/) to see what use-cases can be addressed.
196+
* Try out one of the [existing Gateway controllers ](https://gateway-api.sigs.k8s.io/implementations/)
197197
* Or [get involved](https://gateway-api.sigs.k8s.io/contributing/community/) and help design and influence the future of Kubernetes service networking!
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
---
2+
layout: blog
3+
title: "Meet Our Contributors - APAC (Aus-NZ region)"
4+
date: 2022-03-16T12:00:00+0000
5+
slug: meet-our-contributors-au-nz-ep-02
6+
canonicalUrl: https://www.kubernetes.dev/blog/2022/03/14/meet-our-contributors-au-nz-ep-02/
7+
---
8+
9+
**Authors & Interviewers:** [Anubhav Vardhan](https://github.com/anubha-v-ardhan), [Atharva Shinde](https://github.com/Atharva-Shinde), [Avinesh Tripathi](https://github.com/AvineshTripathi), [Brad McCoy](https://github.com/bradmccoydev), [Debabrata Panigrahi](https://github.com/Debanitrkl), [Jayesh Srivastava](https://github.com/jayesh-srivastava), [Kunal Verma](https://github.com/verma-kunal), [Pranshu Srivastava](https://github.com/PranshuSrivastava), [Priyanka Saggu](github.com/Priyankasaggu11929/), [Purneswar Prasad](https://github.com/PurneswarPrasad), [Vedant Kakde](https://github.com/vedant-kakde)
10+
11+
---
12+
13+
Good day, everyone 👋
14+
15+
Welcome back to the second episode of the "Meet Our Contributors" blog post series for APAC.
16+
17+
This post will feature four outstanding contributors from the Australia and New Zealand regions, who have played diverse leadership and community roles in the Upstream Kubernetes project.
18+
19+
So, without further ado, let's get straight to the blog.
20+
21+
## [Caleb Woodbine](https://github.com/BobyMCbobs)
22+
23+
Caleb Woodbine is currently a member of the ii.nz organisation.
24+
25+
He began contributing to the Kubernetes project in 2018 as a member of the Kubernetes Conformance working group. His experience was positive, and he benefited from early guidance from [Hippie Hacker](https://github.com/hh), a fellow contributor from New Zealand.
26+
27+
He has made major contributions to Kubernetes project since then through `SIG k8s-infra` and `k8s-conformance` working group.
28+
29+
Caleb is also a co-organizer of the [CloudNative NZ](https://www.meetup.com/cloudnative-nz/) community events, which aim to expand the reach of Kubernetes project throughout New Zealand in order to encourage technical education and improved employment opportunities.
30+
31+
> _There need to be more outreach in APAC and the educators and universities must pick up Kubernetes, as they are very slow and about 8+ years out of date. NZ tends to rather pay overseas than educate locals on the latest cloud tech Locally._
32+
33+
## [Dylan Graham](https://github.com/DylanGraham)
34+
35+
Dylan Graham is a cloud engineer from Adeliade, Australia. He has been contributing to the upstream Kubernetes project since 2018.
36+
37+
He stated that being a part of such a large-scale project was initially overwhelming, but that the community's friendliness and openness assisted him in getting through it.
38+
39+
He began by contributing to the project documentation and is now mostly focused on the community support for the APAC region.
40+
41+
He believes that consistent attendance at community/project meetings, taking on project tasks, and seeking community guidance as needed can help new aspiring developers become effective contributors.
42+
43+
> _The feeling of being a part of a large community is really special. I've met some amazing people, even some before the pandemic in real life :)_
44+
45+
## [Hippie Hacker](https://github.com/hh)
46+
47+
Hippie has worked for the CNCF.io as a Strategic Initiatives contractor from New Zealand for almost 5+ years. He is an active contributor to k8s-infra, API conformance testing, Cloud provider conformance submissions, and apisnoop.cncf.io domains of the upstream Kubernetes & CNCF projects.
48+
49+
He recounts their early involvement with the Kubernetes project, which began roughly 5 years ago when their firm, ii.nz, demonstrated [network booting from a Raspberry Pi using PXE and running Gitlab in-cluster to install Kubernetes on servers](https://ii.nz/post/bringing-the-cloud-to-your-community/).
50+
51+
He describes their own contributing experience as someone who, at first, tried to do all of the hard lifting on their own, but eventually saw the benefit of group contributions which reduced burnout and task division which allowed folks to keep moving forward on their own momentum.
52+
53+
He recommends that new contributors use pair programming.
54+
55+
> _The cross pollination of approaches and two pairs of eyes on the same work can often yield a much more amplified effect than a PR comment / approval alone can afford._
56+
57+
## [Nick Young](https://github.com/youngnick)
58+
59+
Nick Young works at VMware as a technical lead for Contour, a CNCF ingress controller. He was active with the upstream Kubernetes project from the beginning, and eventually became the chair of the LTS working group, where he advocated user concerns. He is currently the SIG Network Gateway API subproject's maintainer.
60+
61+
His contribution path was notable in that he began working on major areas of the Kubernetes project early on, skewing his trajectory.
62+
63+
He asserts the best thing a new contributor can do is to "start contributing". Naturally, if it is relevant to their employment, that is excellent; however, investing non-work time in contributing can pay off in the long run in terms of work. He believes that new contributors, particularly those who are currently Kubernetes users, should be encouraged to participate in higher-level project discussions.
64+
65+
> _Just being active and contributing will get you a long way. Once you've been active for a while, you'll find that you're able to answer questions, which will mean you're asked questions, and before you know it you are an expert._
66+
67+
68+
69+
70+
---
71+
72+
If you have any recommendations/suggestions for who we should interview next, please let us know in #sig-contribex. Your suggestions would be much appreciated. We're thrilled to have additional folks assisting us in reaching out to even more wonderful individuals of the community.
73+
74+
75+
We'll see you all in the next one. Everyone, till then, have a happy contributing! 👋
76+
77+
78+

0 commit comments

Comments
 (0)