Skip to content

Commit

Permalink
chore: make CA certificate annotations use plural form (#6845)
Browse files Browse the repository at this point in the history
  • Loading branch information
czeslavo authored Dec 16, 2024
1 parent 15200c7 commit 7d370af
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,10 @@ Adding a new version? You'll need three changes:
upstream connections of a `Service`.
- `konghq.com/tls-verify-depth`: set to an integer to specify the maximum
depth of the certificate chain that will be verified.
- `konghq.com/ca-certificates`: set to a comma-delimited list of CA
certificates' names to use for verification.
- `konghq.com/ca-certificates-secrets`: set to a comma-delimited list of CA
certificate Secrets' names to use for verification.
- `konghq.com/ca-certificates-configmaps`: set to a comma-delimited list of CA
certificate ConfigMaps' names to use for verification.
[#6707](https://github.com/Kong/kubernetes-ingress-controller/pull/6707)
- Combine Kong gateway services from rules of `HTTPRoute` sharing the same
backends (same combination of group, kind, namespace, name, port and weight)
Expand Down
8 changes: 4 additions & 4 deletions examples/ingress-upstream-tls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ metadata:
app: goecho
name: goecho
annotations:
konghq.com/tls-verify: "true" # Enable TLS verification of the upstream.
konghq.com/ca-certificates-secret: "ca" # The CA root certificate secret used for verification.
konghq.com/protocol: "https" # Has to be either https or tls when TLS verification is enabled.
konghq.com/host-header: "goecho" # This will make Kong use `goecho` server name when validating server-presented TLS certificate.
konghq.com/tls-verify: "true" # Enable TLS verification of the upstream.
konghq.com/ca-certificates-secrets: "ca" # The CA root certificate secret used for verification.
konghq.com/protocol: "https" # Has to be either https or tls when TLS verification is enabled.
konghq.com/host-header: "goecho" # This will make Kong use `goecho` server name when validating server-presented TLS certificate.
spec:
ports:
- port: 443
Expand Down
4 changes: 2 additions & 2 deletions internal/annotations/annotations.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ const (
RewriteURIKey = "/rewrite"
TLSVerifyKey = "/tls-verify"
TLSVerifyDepthKey = "/tls-verify-depth"
CACertificatesSecretsKey = "/ca-certificates-secret"
CACertificatesConfigMapsKey = "/ca-certificates-configmap"
CACertificatesSecretsKey = "/ca-certificates-secrets"
CACertificatesConfigMapsKey = "/ca-certificates-configmaps"

// GatewayClassUnmanagedKey is an annotation used on a Gateway resource to
// indicate that the GatewayClass should be reconciled according to unmanaged
Expand Down

1 comment on commit 7d370af

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark 'Go Benchmark'.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 2.

Benchmark suite Current: 7d370af Previous: 15200c7 Ratio
BenchmarkGetPluginRelations 22743 ns/op 7600 B/op 66 allocs/op 8180 ns/op 7600 B/op 66 allocs/op 2.78
BenchmarkGetPluginRelations - ns/op 22743 ns/op 8180 ns/op 2.78

This comment was automatically generated by workflow using github-action-benchmark.

CC: @Kong/k8s-maintainers

Please sign in to comment.