Skip to content

Commit

Permalink
Don't create kyma gateway (#451)
Browse files Browse the repository at this point in the history
* Don't create kyma gateway (#449)

* Don't create kyma gateway

* Remove kyma gateway from integration tests

* Remove healthz virtual service

* Update docs

* Update version file and add release notes

* Update docs/release-notes/1.1.2.md

Co-authored-by: Natalia Sitko <[email protected]>

---------

Co-authored-by: Vladimir Videlov <[email protected]>
Co-authored-by: Natalia Sitko <[email protected]>
  • Loading branch information
3 people authored Nov 2, 2023
1 parent 78ae60f commit a215754
Show file tree
Hide file tree
Showing 14 changed files with 5 additions and 444 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.1
1.1.2
2 changes: 0 additions & 2 deletions controllers/istio_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ func NewReconciler(mgr manager.Manager, reconciliationInterval time.Duration) *I
efReferer := istio_resources.NewEnvoyFilterAllowPartialReferer(mgr.GetClient())

istioResources := []istio_resources.Resource{efReferer}
istioResources = append(istioResources, istio_resources.NewGatewayKyma(mgr.GetClient()))
istioResources = append(istioResources, istio_resources.NewVirtualServiceHealthz(mgr.GetClient()))
istioResources = append(istioResources, istio_resources.NewPeerAuthenticationMtls(mgr.GetClient()))
istioResources = append(istioResources, istio_resources.NewConfigMapControlPlane(mgr.GetClient()))
istioResources = append(istioResources, istio_resources.NewConfigMapMesh(mgr.GetClient()))
Expand Down
5 changes: 0 additions & 5 deletions docs/contributor/04-10-technical-design.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@ It still needs to be decided who will have ownership of the dashboards. To make
We do not consider Istio ServiceMonitor in the design, because this resource is planned to be replaced.
For more information, see this [PR](https://github.com/kyma-project/kyma/pull/16247).

##### istio-healthz Virtual Service

Istio-healthz Virtual Service offers the possibility of monitoring Istio externally by exposing an endpoint. This resource is not part of Kyma Istio Operator.
Therefore, a user who needs such external monitoring must take care of this particular configuration.

##### Global mTLS PeerAuthentication

Global mTLS PeerAuthentication is tightly coupled with the Istio installation. Therefore, it should be reconciled by the operator.
Expand Down
1 change: 0 additions & 1 deletion docs/contributor/04-40-istio-resources.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@ The additional Istio resources include the Kyma configuration of Istio. They con
- Configuration details for Istio monitoring containing specifications for Grafana dashboards
- Configuration for Istio Ingress Gateway, which handles incoming traffic to Kyma
- Configuration for enabling Mutual TLS (mTLS) cluster-wide in the `STRICT` mode
- Information about Istio [VirtualService](https://istio.io/docs/reference/config/networking/virtual-service/), which indicates whether Istio is operational.
4 changes: 4 additions & 0 deletions docs/release-notes/1.1.2.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

## New features

- Remove the code responsible for creating Kyma Gateway [#451](https://github.com/kyma-project/istio/pull/451)
71 changes: 0 additions & 71 deletions internal/reconciliations/istio_resources/gateway_kyma.go

This file was deleted.

27 changes: 0 additions & 27 deletions internal/reconciliations/istio_resources/gateway_kyma.yaml

This file was deleted.

115 changes: 0 additions & 115 deletions internal/reconciliations/istio_resources/gateway_kyma_test.go

This file was deleted.

41 changes: 0 additions & 41 deletions internal/reconciliations/istio_resources/istio_resources_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ package istio_resources

import (
"context"
"fmt"

operatorv1alpha1 "github.com/kyma-project/istio/operator/api/v1alpha1"
"github.com/kyma-project/istio/operator/internal/clusterconfig"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
networkingv1alpha3 "istio.io/client-go/pkg/apis/networking/v1alpha3"
Expand Down Expand Up @@ -52,44 +49,6 @@ var _ = Describe("Reconcilation", func() {
Expect(s.Items).To(HaveLen(1))
})

It("should succeed creating gateway kyna", func() {
client := createFakeClient()

sample := NewGatewayKyma(client)
reconciler := NewReconciler(client, []Resource{sample})

//when
err := reconciler.Reconcile(context.TODO(), istioCR)

//then
Expect(err).To(Not(HaveOccurred()))

var s networkingv1alpha3.GatewayList
listErr := client.List(context.TODO(), &s)
Expect(listErr).To(Not(HaveOccurred()))
Expect(s.Items).To(HaveLen(1))
Expect(s.Items[0].Spec.Servers[0].Hosts[0]).To(Equal(fmt.Sprintf("*.%s", clusterconfig.LocalKymaDomain)))
})

It("should succeed creating virtual service healthz", func() {
client := createFakeClient()

sample := NewVirtualServiceHealthz(client)
reconciler := NewReconciler(client, []Resource{sample})

//when
err := reconciler.Reconcile(context.TODO(), istioCR)

//then
Expect(err).To(Not(HaveOccurred()))

var s networkingv1beta1.VirtualServiceList
listErr := client.List(context.TODO(), &s)
Expect(listErr).To(Not(HaveOccurred()))
Expect(s.Items).To(HaveLen(1))
Expect(s.Items[0].Spec.Hosts[0]).To(Equal(fmt.Sprintf("healthz.%s", clusterconfig.LocalKymaDomain)))
})

It("should succeed creating peer authentication mtls", func() {
client := createFakeClient()

Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit a215754

Please sign in to comment.