Skip to content

Commit bbfb9f8

Browse files
adwk67adwk67
committed
reverted assert, removed default function
1 parent e17ac67 commit bbfb9f8

File tree

3 files changed

+155
-17
lines changed

3 files changed

+155
-17
lines changed

‎deploy/helm/opensearch-operator/crds/crds.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ spec:
134134
nullable: true
135135
type: string
136136
listenerClass:
137-
description: This field controls which [ListenerClass](https://docs.stackable.tech/home/nightly/listener-operator/listenerclass.html) is used to expose the webserver.
137+
description: This field controls which [ListenerClass](https://docs.stackable.tech/home/nightly/listener-operator/listenerclass.html) is used to expose the HTTP communication.
138138
nullable: true
139139
type: string
140140
nodeRoles:
@@ -330,7 +330,7 @@ spec:
330330
nullable: true
331331
type: string
332332
listenerClass:
333-
description: This field controls which [ListenerClass](https://docs.stackable.tech/home/nightly/listener-operator/listenerclass.html) is used to expose the webserver.
333+
description: This field controls which [ListenerClass](https://docs.stackable.tech/home/nightly/listener-operator/listenerclass.html) is used to expose the HTTP communication.
334334
nullable: true
335335
type: string
336336
nodeRoles:

‎rust/operator-binary/src/crd/mod.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,6 @@ pub mod versioned {
168168
}
169169
}
170170

171-
fn default_listener_class() -> String {
172-
DEFAULT_LISTENER_CLASS.to_string()
173-
}
174-
175171
impl HasStatusCondition for v1alpha1::OpenSearchCluster {
176172
fn conditions(&self) -> Vec<ClusterCondition> {
177173
match &self.status {

‎tests/templates/kuttl/smoke/10-assert.yaml‎

Lines changed: 153 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ spec:
5959
weight: 1
6060
containers:
6161
- command:
62-
- /stackable/opensearch//opensearch-docker-entrypoint.sh
62+
- /stackable/opensearch/opensearch-docker-entrypoint.sh
6363
env:
6464
- name: DISABLE_INSTALL_DEMO_CONFIG
6565
value: "true"
@@ -107,11 +107,11 @@ spec:
107107
port: http
108108
timeoutSeconds: 3
109109
volumeMounts:
110-
- mountPath: /stackable/opensearch//config/opensearch.yml
110+
- mountPath: /stackable/opensearch/config/opensearch.yml
111111
name: config
112112
readOnly: true
113113
subPath: opensearch.yml
114-
- mountPath: /stackable/opensearch//data
114+
- mountPath: /stackable/opensearch/data
115115
name: data
116116
- mountPath: /stackable/listener
117117
name: listener
@@ -195,7 +195,6 @@ status:
195195
apiVersion: apps/v1
196196
kind: StatefulSet
197197
metadata:
198-
generation: 1
199198
labels:
200199
app.kubernetes.io/component: nodes
201200
app.kubernetes.io/instance: opensearch
@@ -247,7 +246,7 @@ spec:
247246
weight: 1
248247
containers:
249248
- command:
250-
- /stackable/opensearch//opensearch-docker-entrypoint.sh
249+
- /stackable/opensearch/opensearch-docker-entrypoint.sh
251250
env:
252251
- name: DISABLE_INSTALL_DEMO_CONFIG
253252
value: "true"
@@ -294,11 +293,11 @@ spec:
294293
port: http
295294
timeoutSeconds: 3
296295
volumeMounts:
297-
- mountPath: /stackable/opensearch//config/opensearch.yml
296+
- mountPath: /stackable/opensearch/config/opensearch.yml
298297
name: config
299298
readOnly: true
300299
subPath: opensearch.yml
301-
- mountPath: /stackable/opensearch//data
300+
- mountPath: /stackable/opensearch/data
302301
name: data
303302
- mountPath: /stackable/listener
304303
name: listener
@@ -337,10 +336,6 @@ spec:
337336
secret:
338337
defaultMode: 420
339338
secretName: opensearch-security-config
340-
updateStrategy:
341-
rollingUpdate:
342-
partition: 0
343-
type: RollingUpdate
344339
volumeClaimTemplates:
345340
- apiVersion: v1
346341
kind: PersistentVolumeClaim
@@ -452,3 +447,150 @@ data:
452447
plugins.security.ssl.transport.pemcert_filepath: "/stackable/opensearch/config/tls/tls.crt"
453448
plugins.security.ssl.transport.pemkey_filepath: "/stackable/opensearch/config/tls/tls.key"
454449
plugins.security.ssl.transport.pemtrustedcas_filepath: "/stackable/opensearch/config/tls/ca.crt"
450+
---
451+
apiVersion: v1
452+
kind: Service
453+
metadata:
454+
labels:
455+
app.kubernetes.io/component: nodes
456+
app.kubernetes.io/instance: opensearch
457+
app.kubernetes.io/managed-by: opensearch.stackable.tech_opensearchcluster
458+
app.kubernetes.io/name: opensearch
459+
app.kubernetes.io/role-group: cluster-manager
460+
app.kubernetes.io/version: 3.1.0
461+
stackable.tech/vendor: Stackable
462+
name: opensearch-nodes-cluster-manager-headless
463+
spec:
464+
ports:
465+
- name: http
466+
port: 9200
467+
protocol: TCP
468+
targetPort: 9200
469+
- name: transport
470+
port: 9300
471+
protocol: TCP
472+
targetPort: 9300
473+
publishNotReadyAddresses: true
474+
selector:
475+
app.kubernetes.io/component: nodes
476+
app.kubernetes.io/instance: opensearch
477+
app.kubernetes.io/name: opensearch
478+
app.kubernetes.io/role-group: cluster-manager
479+
type: ClusterIP
480+
---
481+
apiVersion: v1
482+
kind: Service
483+
metadata:
484+
labels:
485+
app.kubernetes.io/component: nodes
486+
app.kubernetes.io/instance: opensearch
487+
app.kubernetes.io/managed-by: opensearch.stackable.tech_opensearchcluster
488+
app.kubernetes.io/name: opensearch
489+
app.kubernetes.io/role-group: data
490+
app.kubernetes.io/version: 3.1.0
491+
stackable.tech/vendor: Stackable
492+
name: opensearch-nodes-data-headless
493+
spec:
494+
ports:
495+
- name: http
496+
port: 9200
497+
protocol: TCP
498+
targetPort: 9200
499+
- name: transport
500+
port: 9300
501+
protocol: TCP
502+
targetPort: 9300
503+
publishNotReadyAddresses: true
504+
selector:
505+
app.kubernetes.io/component: nodes
506+
app.kubernetes.io/instance: opensearch
507+
app.kubernetes.io/name: opensearch
508+
app.kubernetes.io/role-group: data
509+
type: ClusterIP
510+
---
511+
apiVersion: v1
512+
kind: Service
513+
metadata:
514+
labels:
515+
app.kubernetes.io/component: nodes
516+
app.kubernetes.io/instance: opensearch
517+
app.kubernetes.io/managed-by: opensearch.stackable.tech_opensearchcluster
518+
app.kubernetes.io/name: opensearch
519+
app.kubernetes.io/version: 3.1.0
520+
stackable.tech/vendor: Stackable
521+
name: opensearch
522+
spec:
523+
ports:
524+
- name: http
525+
port: 9200
526+
protocol: TCP
527+
targetPort: 9200
528+
- name: transport
529+
port: 9300
530+
protocol: TCP
531+
targetPort: 9300
532+
publishNotReadyAddresses: true
533+
selector:
534+
app.kubernetes.io/component: nodes
535+
app.kubernetes.io/instance: opensearch
536+
app.kubernetes.io/name: opensearch
537+
stackable.tech/opensearch-role.cluster_manager: "true"
538+
type: ClusterIP
539+
---
540+
apiVersion: v1
541+
kind: ServiceAccount
542+
metadata:
543+
labels:
544+
app.kubernetes.io/component: nodes
545+
app.kubernetes.io/instance: opensearch
546+
app.kubernetes.io/managed-by: opensearch.stackable.tech_opensearchcluster
547+
app.kubernetes.io/name: opensearch
548+
app.kubernetes.io/version: 3.1.0
549+
stackable.tech/vendor: Stackable
550+
name: opensearch-serviceaccount
551+
ownerReferences:
552+
- apiVersion: opensearch.stackable.tech/v1alpha1
553+
controller: true
554+
kind: OpenSearchCluster
555+
name: opensearch
556+
---
557+
apiVersion: rbac.authorization.k8s.io/v1
558+
kind: RoleBinding
559+
metadata:
560+
labels:
561+
app.kubernetes.io/component: nodes
562+
app.kubernetes.io/instance: opensearch
563+
app.kubernetes.io/managed-by: opensearch.stackable.tech_opensearchcluster
564+
app.kubernetes.io/name: opensearch
565+
app.kubernetes.io/version: 3.1.0
566+
stackable.tech/vendor: Stackable
567+
name: opensearch-rolebinding
568+
ownerReferences:
569+
- apiVersion: opensearch.stackable.tech/v1alpha1
570+
controller: true
571+
kind: OpenSearchCluster
572+
name: opensearch
573+
roleRef:
574+
apiGroup: rbac.authorization.k8s.io
575+
kind: ClusterRole
576+
name: opensearch-clusterrole
577+
subjects:
578+
- kind: ServiceAccount
579+
name: opensearch-serviceaccount
580+
---
581+
apiVersion: policy/v1
582+
kind: PodDisruptionBudget
583+
metadata:
584+
labels:
585+
app.kubernetes.io/component: nodes
586+
app.kubernetes.io/instance: opensearch
587+
app.kubernetes.io/managed-by: opensearch.stackable.tech_opensearchcluster
588+
app.kubernetes.io/name: opensearch
589+
name: opensearch-nodes
590+
spec:
591+
maxUnavailable: 1
592+
selector:
593+
matchLabels:
594+
app.kubernetes.io/component: nodes
595+
app.kubernetes.io/instance: opensearch
596+
app.kubernetes.io/name: opensearch

0 commit comments

Comments
 (0)