Skip to content

Commit ba0951a

Browse files
committed
Use upstream istio operator and not deprecated banzaicloud istio operator
1 parent e659d88 commit ba0951a

File tree

69 files changed

+481
-37584
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+481
-37584
lines changed

api/v1beta1/kafkacluster_types.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,17 +130,18 @@ const (
130130

131131
/* Istio Ingress Config */
132132

133-
// IstioMeshGateway.spec.deployment.resources
133+
// Kubernetes Deployment resources for Istio ingress gateway
134134
defaultIstioIngressRequestResourceCpu = "100m"
135135
defaultIstioIngressRequestResourceMemory = "128Mi"
136136
defaultIstioIngressLimitResourceCpu = "2000m"
137137
defaultIstioIngressLimitResourceMemory = "1024Mi"
138138

139-
// IstioMeshGateway.spec.deployment.replicas.count
140-
// IstioMeshGateway.spec.deployment.replicas.min
141-
// IstioMeshGateway.spec.deployment.replicas.max
139+
// Kubernetes Deployment replicas for Istio ingress gateway
142140
defaultReplicas = 1
143141

142+
// DefaultIstioProxyImage is the default Istio proxy image for mesh gateway
143+
DefaultIstioProxyImage = "docker.io/istio/proxyv2:1.27.1"
144+
144145
/* Monitor Config */
145146

146147
// KafkaBrokerPod.spec.initContainer[jmx-exporter].image
@@ -521,7 +522,7 @@ type IstioIngressConfig struct {
521522
Annotations map[string]string `json:"annotations,omitempty"`
522523
TLSOptions *v1beta1.TLSOptions `json:"gatewayConfig,omitempty"`
523524
VirtualServiceAnnotations map[string]string `json:"virtualServiceAnnotations,omitempty"`
524-
// Envs allows to add additional env vars to the istio meshgateway resource
525+
// Envs allows to add additional env vars to the istio ingress gateway deployment
525526
Envs []*corev1.EnvVar `json:"envs,omitempty"`
526527
// If specified and supported by the platform, traffic through the
527528
// cloud-provider load-balancer will be restricted to the specified client

charts/kafka-operator/crds/kafkaclusters.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20977,7 +20977,7 @@ spec:
2097720977
type: object
2097820978
envs:
2097920979
description: Envs allows to add additional env vars to the istio
20980-
meshgateway resource
20980+
ingress gateway deployment
2098120981
items:
2098220982
description: EnvVar represents an environment variable present
2098320983
in a Container.
@@ -23035,7 +23035,7 @@ spec:
2303523035
type: object
2303623036
envs:
2303723037
description: Envs allows to add additional
23038-
env vars to the istio meshgateway resource
23038+
env vars to the istio ingress gateway deployment
2303923039
items:
2304023040
description: EnvVar represents an environment
2304123041
variable present in a Container.

charts/kafka-operator/templates/operator-rbac.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,6 @@ metadata:
2626
app.kubernetes.io/version: {{ .Chart.AppVersion }}
2727
app.kubernetes.io/component: operator
2828
rules:
29-
- apiGroups:
30-
- servicemesh.cisco.com
31-
resources:
32-
- istiomeshgateways
33-
verbs:
34-
- create
35-
- delete
36-
- get
37-
- list
38-
- patch
39-
- update
40-
- watch
4129
- apiGroups:
4230
- networking.istio.io
4331
resources:

config/base/crds/kafka.banzaicloud.io_kafkaclusters.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20977,7 +20977,7 @@ spec:
2097720977
type: object
2097820978
envs:
2097920979
description: Envs allows to add additional env vars to the istio
20980-
meshgateway resource
20980+
ingress gateway deployment
2098120981
items:
2098220982
description: EnvVar represents an environment variable present
2098320983
in a Container.
@@ -23035,7 +23035,7 @@ spec:
2303523035
type: object
2303623036
envs:
2303723037
description: Envs allows to add additional
23038-
env vars to the istio meshgateway resource
23038+
env vars to the istio ingress gateway deployment
2303923039
items:
2304023040
description: EnvVar represents an environment
2304123041
variable present in a Container.

config/base/rbac/role.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -177,15 +177,3 @@ rules:
177177
- patch
178178
- update
179179
- watch
180-
- apiGroups:
181-
- servicemesh.cisco.com
182-
resources:
183-
- istiomeshgateways
184-
verbs:
185-
- create
186-
- delete
187-
- get
188-
- list
189-
- patch
190-
- update
191-
- watch

config/samples/kafkacluster-with-istio.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spec:
88
headlessServiceEnabled: false
99
ingressController: "istioingress"
1010
istioControlPlane:
11-
name: icp-v115x-sample # The name of the existing istio control plane should be used here
11+
name: istiod # Standard Istio control plane name when installed via Helm
1212
namespace: istio-system
1313
istioIngressConfig:
1414
gatewayConfig:

0 commit comments

Comments
 (0)