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

Added support for Istio 1.13 #806

Merged
merged 4 commits into from
May 6, 2022
Merged

Added support for Istio 1.13 #806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56059d9
Added support for Istio 1.13
Kuvesz May 5, 2022
c91ad94
Merge branch 'master' into istio_113
Kuvesz May 5, 2022
41753b3
Fixes requested in reviews
Kuvesz May 6, 2022
05ca557
Updated test
Kuvesz May 6, 2022
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
2 changes: 1 addition & 1 deletion api/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.17

require (
emperror.dev/errors v0.8.0
github.com/banzaicloud/istio-client-go v0.0.11
github.com/banzaicloud/istio-client-go v0.0.17
github.com/imdario/mergo v0.3.12
github.com/jetstack/cert-manager v1.6.1
gotest.tools v2.2.0+incompatible
Expand Down
4 changes: 2 additions & 2 deletions api/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ github.com/aws/aws-sdk-go v1.25.37/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpi
github.com/aws/aws-sdk-go v1.30.27/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
github.com/aws/aws-sdk-go v1.34.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
github.com/aws/aws-sdk-go v1.40.21/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
github.com/banzaicloud/istio-client-go v0.0.11 h1:Ej6ziXpDAM/ORF19TYNq2Be990w9EeEeC5OIj+4xm1E=
github.com/banzaicloud/istio-client-go v0.0.11/go.mod h1:rpnEYYGHzisx8nARl2d30Oq38EeCX0/PPaxMaREfE9I=
github.com/banzaicloud/istio-client-go v0.0.17 h1:wiplbM7FDiIHopujInAnin3zuovtVcphtKy9En39q5I=
github.com/banzaicloud/istio-client-go v0.0.17/go.mod h1:rpnEYYGHzisx8nARl2d30Oq38EeCX0/PPaxMaREfE9I=
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
Expand Down
10 changes: 5 additions & 5 deletions api/v1beta1/kafkacluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/imdario/mergo"

"github.com/banzaicloud/istio-client-go/pkg/networking/v1alpha3"
"github.com/banzaicloud/istio-client-go/pkg/networking/v1beta1"

cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
corev1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -171,7 +171,7 @@ type BrokerConfig struct {
BrokerAnnotations map[string]string `json:"brokerAnnotations,omitempty"`
// Custom labels for the broker pods, example use case: for Prometheus monitoring to capture the group for each broker as a label, e.g.:
// kafka_broker_group: "default_group"
// these labels won't override the reserved labels that the operator relies on, for example, "app", "brokerId", and "kafka_cr"
// these labels will not override the reserved labels that the operator relies on, for example, "app", "brokerId", and "kafka_cr"
// +optional
BrokerLabels map[string]string `json:"brokerLabels,omitempty"`
// Network throughput information in kB/s used by Cruise Control to determine broker network capacity.
Expand Down Expand Up @@ -313,9 +313,9 @@ type IstioIngressConfig struct {
NodeSelector map[string]string `json:"nodeSelector,omitempty"`
Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
// Annotations defines the annotations placed on the istio ingress controller deployment
Annotations map[string]string `json:"annotations,omitempty"`
TLSOptions *v1alpha3.TLSOptions `json:"gatewayConfig,omitempty"`
VirtualServiceAnnotations map[string]string `json:"virtualServiceAnnotations,omitempty"`
Annotations map[string]string `json:"annotations,omitempty"`
TLSOptions *v1beta1.TLSOptions `json:"gatewayConfig,omitempty"`
VirtualServiceAnnotations map[string]string `json:"virtualServiceAnnotations,omitempty"`
// Envs allows to add additional env vars to the istio meshgateway resource
Envs []corev1.EnvVar `json:"envs,omitempty"`
}
Expand Down
11 changes: 9 additions & 2 deletions api/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions charts/kafka-operator/templates/crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,9 @@ spec:
type: string
description: 'Custom labels for the broker pods, example use
case: for Prometheus monitoring to capture the group for each
broker as a label, e.g.: kafka_broker_group: "default_group"'
broker as a label, e.g.: kafka_broker_group: "default_group"
these labels will not override the reserved labels that the
Kuvesz marked this conversation as resolved.
Show resolved Hide resolved
operator relies on, for example, "app", "brokerId", and "kafka_cr"'
type: object
config:
type: string
Expand Down Expand Up @@ -6874,7 +6876,9 @@ spec:
description: 'Custom labels for the broker pods, example
use case: for Prometheus monitoring to capture the group
for each broker as a label, e.g.: kafka_broker_group:
"default_group"'
"default_group" these labels will not override the reserved
Kuvesz marked this conversation as resolved.
Show resolved Hide resolved
labels that the operator relies on, for example, "app",
"brokerId", and "kafka_cr"'
type: object
config:
type: string
Expand Down
8 changes: 6 additions & 2 deletions config/base/crds/kafka.banzaicloud.io_kafkaclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,7 +977,9 @@ spec:
type: string
description: 'Custom labels for the broker pods, example use
case: for Prometheus monitoring to capture the group for each
broker as a label, e.g.: kafka_broker_group: "default_group"'
broker as a label, e.g.: kafka_broker_group: "default_group"
these labels will not override the reserved labels that the
operator relies on, for example, "app", "brokerId", and "kafka_cr"'
type: object
config:
type: string
Expand Down Expand Up @@ -6873,7 +6875,9 @@ spec:
description: 'Custom labels for the broker pods, example
use case: for Prometheus monitoring to capture the group
for each broker as a label, e.g.: kafka_broker_group:
"default_group"'
"default_group" these labels will not override the reserved
labels that the operator relies on, for example, "app",
"brokerId", and "kafka_cr"'
type: object
config:
type: string
Expand Down
2 changes: 1 addition & 1 deletion config/samples/kafkacluster-with-istio.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
headlessServiceEnabled: false
ingressController: "istioingress"
istioControlPlane:
name: icp-v111x-sample
name: icp-v113x-sample # The name of the existing istio control plane should be used here
namespace: istio-system
istioIngressConfig:
gatewayConfig:
Expand Down
Loading