Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: do not update secret when tls.secretName is empty #3719

Merged
merged 3 commits into from
Mar 14, 2023
Merged

fix: do not update secret when tls.secretName is empty #3719

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29e0a22
fix: do not update secret when tls.secretName is empty
randmonkey Mar 14, 2023
d794f75
update CHANGELOG
randmonkey Mar 14, 2023
4ac88e3
reword CHANGELOG
randmonkey Mar 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Adding a new version? You'll need three changes:
* Add the diff link, like "[2.7.0]: https://github.com/kong/kubernetes-ingress-controller/compare/v1.2.2...v1.2.3".
This is all the way at the bottom. It's the thing we always forget.
--->

- [2.9.0](#290)
- [2.9.0-rc.1](#290-rc1)
- [2.8.1](#281)
- [2.8.0](#280)
Expand Down Expand Up @@ -63,6 +63,16 @@ Adding a new version? You'll need three changes:
- [0.0.5](#005)
- [0.0.4 and prior](#004-and-prior)

## [2.9.0]

> Release date: TBD

### Fixed

- Fixed the issue that status of ingress is not updated when `secretName` is
not spefied in `ingress.spec.tls`.
randmonkey marked this conversation as resolved.
Show resolved Hide resolved
[#3719](https://github.com/Kong/kubernetes-ingress-controller/pull/3719)

## [2.9.0-rc.1]

> Release date: 2023-03-09
Expand Down
12 changes: 12 additions & 0 deletions internal/controllers/configuration/object_references.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ func listCoreV1ServiceReferredSecrets(service *corev1.Service) []types.Namespace
func listNetV1IngressReferredSecrets(ingress *netv1.Ingress) []types.NamespacedName {
referredSecretNames := make([]types.NamespacedName, 0, len(ingress.Spec.TLS))
for _, tls := range ingress.Spec.TLS {
if tls.SecretName == "" {
continue
}
nsName := types.NamespacedName{
Namespace: ingress.Namespace,
Name: tls.SecretName,
Expand All @@ -87,6 +90,9 @@ func listNetV1IngressReferredSecrets(ingress *netv1.Ingress) []types.NamespacedN
func listNetV1beta1IngressReferredSecrets(ingress *netv1beta1.Ingress) []types.NamespacedName {
referredSecretNames := make([]types.NamespacedName, 0, len(ingress.Spec.TLS))
for _, tls := range ingress.Spec.TLS {
if tls.SecretName == "" {
continue
}
nsName := types.NamespacedName{
Namespace: ingress.Namespace,
Name: tls.SecretName,
Expand All @@ -99,6 +105,9 @@ func listNetV1beta1IngressReferredSecrets(ingress *netv1beta1.Ingress) []types.N
func listExtensionV1beta1IngressReferredSecrets(ingress *extv1beta1.Ingress) []types.NamespacedName {
referredSecretNames := make([]types.NamespacedName, 0, len(ingress.Spec.TLS))
for _, tls := range ingress.Spec.TLS {
if tls.SecretName == "" {
continue
}
nsName := types.NamespacedName{
Namespace: ingress.Namespace,
Name: tls.SecretName,
Expand Down Expand Up @@ -147,6 +156,9 @@ func listKongConsumerReferredSecrets(consumer *kongv1.KongConsumer) []types.Name
func listTCPIngressReferredSecrets(tcpIngress *kongv1beta1.TCPIngress) []types.NamespacedName {
referredSecretNames := make([]types.NamespacedName, 0, len(tcpIngress.Spec.TLS))
for _, tls := range tcpIngress.Spec.TLS {
if tls.SecretName == "" {
continue
}
nsName := types.NamespacedName{
Namespace: tcpIngress.Namespace,
Name: tls.SecretName,
Expand Down
19 changes: 17 additions & 2 deletions internal/controllers/configuration/object_references_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,21 @@ func TestListIngressReferredSecrets(t *testing.T) {
secretNum: 1,
refSecretName: types.NamespacedName{Namespace: "ns", Name: "secret1"},
},
{
name: "ingress_has_tls_without_secretName_should_refer_no_secrets",
ingress: &netv1.Ingress{
ObjectMeta: metav1.ObjectMeta{
Namespace: "ns",
Name: "ing1",
},
Spec: netv1.IngressSpec{
TLS: []netv1.IngressTLS{
{Hosts: []string{"example.com"}},
},
},
},
secretNum: 0,
},
}

for _, tc := range testCases {
Expand Down Expand Up @@ -289,11 +304,11 @@ func TestListTCPIngressReferredSecrets(t *testing.T) {
Spec: kongv1beta1.TCPIngressSpec{
TLS: []kongv1beta1.IngressTLS{
{Hosts: []string{"example.com"}, SecretName: "secret1"},
{Hosts: []string{"konghq.com"}, SecretName: "secret2"},
{Hosts: []string{"konghq.com"}, SecretName: ""},
},
},
},
secretNum: 2,
secretNum: 1,
refSecretName: types.NamespacedName{
Namespace: "ns",
Name: "secret1",
Expand Down