removed customLabeler

Signed-off-by: Kartikay <kartikay_2101ce32@iitp.ac.in>

Author: kartikaysaxena

config/sc-config.yaml

@@ -1005,15 +1005,6 @@ opensearch:
   ingress:
     maxbodysize: 32m
 
-  customLabelSelector:
-    matchLabels:
-      app.kubernetes.io/name: custom-opensearch
-    matchExpressions:
-      - key: environment
-        operator: In
-        values:
-          - production
-
 opa:
   ## Enable rule that requires pods to come from
   ## the image registry defined by "URL".

config/schemas/config.yaml

@@ -5815,30 +5815,6 @@ properties:
               In an air-gapped environment this can be used to install plugins from known sources.
             type: array
         type: object
-      customLabelSelector:
-        title: Custom Label Selector
-        description: |-
-          Custom label selector for pod anti-affinity rules. If not set, defaults to the standard OpenSearch labels.
-        type: object
-        properties:
-          matchLabels:
-            type: object
-            additionalProperties:
-              type: string
-          matchExpressions:
-            type: array
-            items:
-              type: object
-              properties:
-                key:
-                  type: string
-                operator:
-                  type: string
-                  enum: ["In", "NotIn", "Exists", "DoesNotExist"]
-                values:
-                  type: array
-                  items:
-                    type: string
     required:
       - enabled
       - subdomain

helmfile.d/upstream/opensearch-project/opensearch/templates/statefulset.yaml

@@ -106,12 +106,7 @@ spec:
       {{- end }}
       affinity:
       {{- end }}
-      {{- if eq .Values.antiAffinity "custom" }}
-        {{- with .Values.customAntiAffinity }}
-        podAntiAffinity:
-          {{- toYaml . | nindent 10 }}
-        {{- end }}
-      {{- else if eq .Values.antiAffinity "hard" }}
+      {{- if eq .Values.antiAffinity "hard" }}
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
@@ -141,6 +136,11 @@ spec:
                   operator: In
                   values:
                   - {{ include "opensearch.name" . }}
+      {{- else if eq .Values.antiAffinity "custom" }}
+        {{- with .Values.customAntiAffinity }}
+        podAntiAffinity:
+{{ toYaml . | indent 10 }}
+        {{- end }}
       {{- end }}
       {{- with .Values.podAffinity }}
         podAffinity:

helmfile.d/upstream/opensearch-project/opensearch/values.yaml

@@ -529,13 +529,3 @@ extraObjects: []
   #      selector:
   #        matchLabels:
   #          {{- include "opensearch.selectorLabels" . | nindent 6 }}
-
-# Custom label selector for pod anti-affinity rules
-customLabelSelector: {}
-  # matchLabels:
-  #   app.kubernetes.io/name: opensearch
-  # matchExpressions:
-  #   - key: app.kubernetes.io/instance
-  #     operator: In
-  #     values:
-  #       - opensearch-master