Skip to content

Commit

Permalink
[release-next] Fast-forward release-next to master (#1357)
Browse files Browse the repository at this point in the history
  • Loading branch information
maelvls authored Dec 7, 2023
2 parents efd9872 + 550f1f1 commit 75ba347
Show file tree
Hide file tree
Showing 401 changed files with 50,158 additions and 2,190 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,7 @@ public/feed.*
.netlify/

# IntelliJ
.idea
.idea

# Our release-process.md tells us to run 'sed' commands that create .bak files.
*.bak
87 changes: 87 additions & 0 deletions .spelling
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ mmontes11
lvyanru8200
vedauth
CVE-2022-41717
CVE-2023-29409
seccomp
RedHat
RoleBinding
Expand All @@ -33,6 +34,7 @@ illrill
davidsbond
fvlaicu
facto
fao
4molybdenum2
jetstack-bot
codegen
Expand All @@ -54,6 +56,7 @@ ACLs
ACMEDNS
ACMEv1
ACMEv2
AdditionalFormats
AKS
ALB
APIService
Expand All @@ -72,6 +75,8 @@ AzureDNS
BKPR
Bazel
Bitnami
Bugfixes
bugfix
BundleSource
BundleTarget
BundleCondition
Expand Down Expand Up @@ -99,6 +104,7 @@ CertificateSecretTemplate
CertificateSigningRequest
CertificateSigningRequests
Changelog
changelog
ChartMuseum
CloudDNS
CloudFlare
Expand All @@ -124,6 +130,7 @@ DNSPod
DNSimple
DaemonSet
DataDog
Datree
Dean-Coakley
DigitalOcean
OVHCloud
Expand All @@ -133,6 +140,7 @@ etcd
EC2
enj
ECDSA
ejbca
EKS
ELB
Ed25519
Expand Down Expand Up @@ -176,6 +184,8 @@ JoshVanL
Jsonnet
Juneezee
JoooostB
Keyfactor
KeySelector
KUARD
Kirill-Garbar
Knative
Expand All @@ -185,6 +195,7 @@ k8s
KubeCon
Kubernetes
Kyverno
Learnk8s
LuCI
Maartje
MacOS
Expand All @@ -203,9 +214,11 @@ OpenWRT
OperatorHub
OperatorHub.io
PEM
PKCS12-formatted
PKCS#12
PKCS#8
Pomerium
PostgreSQL
PowerShell
Prometheus
P-521
Expand Down Expand Up @@ -249,7 +262,9 @@ VPC
VaaS
Velero
Venafi
versioned
WebhookConfiguration
ControllerConfiguration
WIP
YAML
YAMLs
Expand Down Expand Up @@ -313,6 +328,7 @@ google-cas-issuer
goroutine
hardcodes
hardcoded
healthz
honour
hostname
https
Expand Down Expand Up @@ -359,6 +375,7 @@ labelled
lalitadithya
ldflag
lifecycle
liveness
loadbalancer
longkai
loopback
Expand Down Expand Up @@ -386,6 +403,7 @@ ndegory
oauth2
onwards
openshift-supported-versions
plaintext
powershell
pre
preemptible
Expand Down Expand Up @@ -417,6 +435,8 @@ subcommands
subdomain
subdomains
subfolders
submodule
submodules
subresource
symlink
tamalsaha
Expand All @@ -440,10 +460,16 @@ upstream
userinfo
vhosakot
v0.5.0
v0.7.0
v0.7.0.
v0.16
v0.23.1
v1
v1.12
v1.12.1
v1.12.2
v1.12.3
v1.12.4
v1.13
v1.16
v1.19
Expand Down Expand Up @@ -475,8 +501,17 @@ v1.8.2
v1.9.0
v1.9.1
v1.10
v1.11
v1.11.0
v1.11.1
v1.11.2
v1.11.3
v1.11.4
v1.11.5
v1.12.0
v1.12.1.
v1.12.2.
v1.12.3.
v1alpha1
v1alpha2
v1alpha3
Expand All @@ -501,6 +536,7 @@ mfmbarros
maelvls
bitscuit
zsh
PodDisruptionBudget
PodSecurityPolicy
ClusterIP
NodePort
Expand Down Expand Up @@ -555,6 +591,10 @@ NetworkPolicy
mjudeikis
rgl
1password
VCert
v1.11.0
v1.11.1
v4.4.1
secretless
TokenRequest
v1.12.0
Expand Down Expand Up @@ -584,9 +624,56 @@ unlabelled
v1.27.1
v0.6.0.
v4.4.1
v1.13.0
v1.13.0.
v1.13.1
v1.13.2
v1.13.
v1.12.5
v1.12.6
liveness
apiservices
arm64
IaC
Kyverno
Stakater
Reloader
reloader
yq
usr
ssl
cert.pem
Rollout
rollout
JKS-formatted
changeit
ctl
PrivateCA
structs
klog
relabelings
kustomize

FlorianLiebhart
cypres
ubergesundheit
gdvalle
rouke-broersma
schrodit
zhangzhiqiangcs
arukiidou
Richardds
kahirokunn
selfsigned-issuer
apiVersion
gateway.networking.k8s.io
networking.k8s.io
certificates.k8s.io

venafi-enhanced-issuer
venafi-issuer
adcs-issuer
cfssl-issuer

# TEMPORARY
# these are temporarily ignored because the spellchecker
Expand Down
5 changes: 3 additions & 2 deletions OWNERS
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
approvers:
- munnerz
- JoshVanL
- meyskens
- jakexks
- irbekrm
- maelvls
- SgtCoDFish
- jahrlin
- wallrj
- inteon
reviewers:
- hawksight
23 changes: 22 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,27 @@ Sometimes you'll want to add a comment which is only for documentation maintaine

Use `{/* my comment */}` rather than the HTML-style comments you'd normally use for Markdown files. Other comment types will cause errors.

### Task: Merging `master` into `release-next`

In rare occasions, when writing documentation for an unreleased feature, you may
notice that some recent changes in `master` aren't present in `release-next`. If
that is a problem, you will want to update `release-next` branch with the latest
changes from `master`. To update `release-next` with the changes made to
`master`, follow these steps:

1. Create a PR to merge `master` into `release-next` using [this magic
link][ff-release-next].
2. If you see the label `dco-signoff: no`, add a comment on the PR with:

```text
/override dco
```
It is necessary because some the merge commits have been written by the bot
and do not have a DCO signoff.
[ff-release-next]: https://github.com/cert-manager/website/compare/release-next...master?quick_pull=1&title=%5Brelease-next%5D+Merge+master+into+release-next&body=%3C%21--%0A%0AThe+command+%22%2Foverride+dco%22+is+necessary+because+some+the+merge+commits%0Ahave+been+written+by+the+bot+and+do+not+have+a+DCO+signoff.%0A%0A--%3E%0A%0A%2Foverride+dco
## Website Development Tooling
First [install nodejs (and package manager called `npm`)](https://nodejs.org/en/).
Expand Down Expand Up @@ -159,7 +180,7 @@ This will automatically run a number of checks against your local environment, i

> ℹ️ All these checks are also run automatically for pull requests.
> The results will be reported in the [checks summary](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks) at the bottom of your GitHub PR.
> Read the [cert-manager-website-presubmits.yaml prow configuration file](https://github.com/jetstack/testing/blob/master/config/jobs/cert-manager/website/cert-manager-website-presubmits.yaml) and the [check.yaml workflow file](.github/workflows/check.yaml) for more details.
> Read the [cert-manager-website-presubmits.yaml prow configuration file](https://github.com/cert-manager/testing/blob/master/config/jobs/cert-manager/website/cert-manager-website-presubmits.yaml) and the [check.yaml workflow file](.github/workflows/check.yaml) for more details.
### Building for a Release

Expand Down
2 changes: 1 addition & 1 deletion components/Feature.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default function Feature({ feature }) {
<div className="absolute top-0 left-1/2 transform -translate-y-1/2 -translate-x-1/2">
<Image
src={feature.imageSrc}
alt="feature icon"
alt={feature.description}
width={77}
height={74}
layout="fixed"
Expand Down
4 changes: 2 additions & 2 deletions components/Icon.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ function TwitterIcon() {
xmlns="http://www.w3.org/2000/svg"
width="100%"
fill="currentColor"
viewBox="0 0 16 16"
viewBox="0 0 30 30"
>
<path d="M5.026 15c6.038 0 9.341-5.003 9.341-9.334 0-.14 0-.282-.006-.422A6.685 6.685 0 0 0 16 3.542a6.658 6.658 0 0 1-1.889.518 3.301 3.301 0 0 0 1.447-1.817 6.533 6.533 0 0 1-2.087.793A3.286 3.286 0 0 0 7.875 6.03a9.325 9.325 0 0 1-6.767-3.429 3.289 3.289 0 0 0 1.018 4.382A3.323 3.323 0 0 1 .64 6.575v.045a3.288 3.288 0 0 0 2.632 3.218 3.203 3.203 0 0 1-.865.115 3.23 3.23 0 0 1-.614-.057 3.283 3.283 0 0 0 3.067 2.277A6.588 6.588 0 0 1 .78 13.58a6.32 6.32 0 0 1-.78-.045A9.344 9.344 0 0 0 5.026 15z"/>
<path d="M26.37,26l-8.795-12.822l0.015,0.012L25.52,4h-2.65l-6.46,7.48L11.28,4H4.33l8.211,11.971L12.54,15.97L3.88,26h2.65 l7.182-8.322L19.42,26H26.37z M10.23,6l12.34,18h-2.1L8.12,6H10.23z" />
</svg>
)
}
Expand Down
11 changes: 9 additions & 2 deletions components/docs/Sidebar/Dropdown.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@ import SidebarLink from './SidebarLink'
export default function Dropdown({
routes,
parentOpen = true,
setSidebarCollapsed
setSidebarCollapsed,
setParentOpen
}) {
const [open, setOpen] = useState(false)
const [open, setSelfOpen] = useState(false)
const setOpen = (v) => {
if (v) setParentOpen(v)
setSelfOpen(v)
}
const iconClasses = classNames({
'block w-4 h-4 transform text-blue-1': true,
'rotate-180': open
Expand Down Expand Up @@ -42,6 +47,7 @@ export default function Dropdown({
parentOpen={open}
key={`${r.title}-${idx}`}
setSidebarCollapsed={setSidebarCollapsed}
setParentOpen={setOpen}
/>
</li>
)
Expand All @@ -53,6 +59,7 @@ export default function Dropdown({
caption={r.title}
parentOpen={open}
setSidebarCollapsed={setSidebarCollapsed}
setParentOpen={setOpen}
/>
</li>
)
Expand Down
13 changes: 11 additions & 2 deletions components/docs/Sidebar/ListItems.jsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
import SidebarLink from './SidebarLink'
import Dropdown from './Dropdown'

export default function ListItems({ routes, setSidebarCollapsed }) {
export default function ListItems({
routes,
setSidebarCollapsed,
setParentOpen
}) {
if (!routes) return null
if (routes) {
return routes.map((r, idx) => {
if (!r.path) {
return (
<li key={`${r.title}-${idx}`}>
<Dropdown routes={r} setSidebarCollapsed={setSidebarCollapsed} />
<Dropdown
routes={r}
setSidebarCollapsed={setSidebarCollapsed}
setParentOpen={setParentOpen}
/>
</li>
)
} else {
Expand All @@ -18,6 +26,7 @@ export default function ListItems({ routes, setSidebarCollapsed }) {
href={r.path}
caption={r.title}
setSidebarCollapsed={setSidebarCollapsed}
setParentOpen={setParentOpen}
/>
</li>
)
Expand Down
Loading

0 comments on commit 75ba347

Please sign in to comment.