Skip to content

Commit 0b05088

Browse files
committed
use upstream istio operator and not deprecated banzaicloud istio operator
1 parent a71548d commit 0b05088

File tree

73 files changed

+485
-37714
lines changed

Some content is hidden

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

73 files changed

+485
-37714
lines changed

.github/actions/kind-create/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ inputs: # adding these parameters to make this reusable later on
88
kind_k8s_version:
99
description: 'The k8s version to use'
1010
required: true
11-
default: 'v1.34.0'
11+
default: 'v1.34.1'
1212
kind_config:
1313
description: 'Path to the kind config to use'
1414
required: true

.github/dependabot.yml

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ updates:
5454
# - /third_party/github.com/banzaicloud/operator-tools
5555
# - /third_party/github.com/banzaicloud/k8s-objectmatcher
5656
# - /third_party/github.com/banzaicloud/k8s-objectmatcher/tests
57-
# - /third_party/github.com/banzaicloud/istio-operator
58-
# - /third_party/github.com/banzaicloud/istio-operator/api
5957
# - /third_party/github.com/banzaicloud/istio-client-go
6058
# - /third_party/github.com/banzaicloud/go-cruise-control
6159
# - /third_party/github.com/banzaicloud/go-cruise-control/integration_test
@@ -168,35 +166,6 @@ updates:
168166
patterns:
169167
- "*"
170168

171-
- package-ecosystem: "gomod"
172-
directory: "/third_party/github.com/banzaicloud/istio-operator"
173-
schedule:
174-
interval: "weekly"
175-
day: "tuesday"
176-
time: "10:00"
177-
timezone: "UTC"
178-
commit-message:
179-
prefix: "chore"
180-
include: "scope"
181-
groups:
182-
third-party-go-dependencies:
183-
patterns:
184-
- "*"
185-
186-
- package-ecosystem: "gomod"
187-
directory: "/third_party/github.com/banzaicloud/istio-operator/api"
188-
schedule:
189-
interval: "weekly"
190-
day: "tuesday"
191-
time: "10:00"
192-
timezone: "UTC"
193-
commit-message:
194-
prefix: "chore"
195-
include: "scope"
196-
groups:
197-
third-party-go-dependencies:
198-
patterns:
199-
- "*"
200169

201170
- package-ecosystem: "gomod"
202171
directory: "/third_party/github.com/banzaicloud/istio-client-go"

api/v1beta1/kafkacluster_types.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,15 +130,13 @@ 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

144142
/* Monitor Config */
@@ -521,7 +519,7 @@ type IstioIngressConfig struct {
521519
Annotations map[string]string `json:"annotations,omitempty"`
522520
TLSOptions *v1beta1.TLSOptions `json:"gatewayConfig,omitempty"`
523521
VirtualServiceAnnotations map[string]string `json:"virtualServiceAnnotations,omitempty"`
524-
// Envs allows to add additional env vars to the istio meshgateway resource
522+
// Envs allows to add additional env vars to the istio ingress gateway deployment
525523
Envs []*corev1.EnvVar `json:"envs,omitempty"`
526524
// If specified and supported by the platform, traffic through the
527525
// 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)