Revert "Implement manifests for Index Management Job (#2235)"

This reverts commit 3dc099a.

Makefile.d/k8s.mk

@@ -43,8 +43,6 @@ k8s/manifest/update: \
 	mv $(TEMP_DIR)/vald/templates/gateway/lb k8s/gateway/lb
 	mv $(TEMP_DIR)/vald/templates/manager/index k8s/manager/index
 	mv $(TEMP_DIR)/vald/templates/index/job/correction k8s/index/job/correction
-	mv $(TEMP_DIR)/vald/templates/index/job/creation k8s/index/job/creation
-	mv $(TEMP_DIR)/vald/templates/index/job/save k8s/index/job/save
 	rm -rf $(TEMP_DIR)
 
 .PHONY: k8s/manifest/helm-operator/clean

charts/vald/templates/agent/networkpolicy.yaml

@@ -14,12 +14,10 @@
 # limitations under the License.
 #
 
-{{- $agent     := .Values.agent -}}
-{{- $lb        := .Values.gateway.lb -}}
-{{- $index     := .Values.manager.index -}}
+{{- $agent := .Values.agent -}}
+{{- $lb := .Values.gateway.lb -}}
+{{- $index := .Values.manager.index -}}
 {{- $corrector := .Values.manager.index.corrector -}}
-{{- $creator   := .Values.manager.index.creator -}}
-{{- $saver     := .Values.manager.index.saver -}}
 {{- if .Values.defaults.networkPolicy.enabled }}
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
@@ -53,18 +51,6 @@ spec:
           podSelector:
             matchLabels:
               app: {{ $corrector.name }}
-        - namespaceSelector:
-            matchLabels:
-              kubernetes.io/metadata.name: {{ .Release.Namespace }}
-          podSelector:
-            matchLabels:
-              app: {{ $creator.name }}
-        - namespaceSelector:
-            matchLabels:
-              kubernetes.io/metadata.name: {{ .Release.Namespace }}
-          podSelector:
-            matchLabels:
-              app: {{ $saver.name }}
     {{- if .Values.defaults.networkPolicy.custom.ingress }}
     {{- toYaml .Values.defaults.networkPolicy.custom.ingress | nindent 4 }}
     {{- end }}

charts/vald/templates/discoverer/networkpolicy.yaml

@@ -15,11 +15,9 @@
 #
 
 {{- $discoverer := .Values.discoverer -}}
-{{- $lb         := .Values.gateway.lb -}}
-{{- $index      := .Values.manager.index -}}
-{{- $corrector  := .Values.manager.index.corrector -}}
-{{- $creator    := .Values.manager.index.creator -}}
-{{- $saver      := .Values.manager.index.saver -}}
+{{- $lb := .Values.gateway.lb -}}
+{{- $index := .Values.manager.index -}}
+{{- $corrector := .Values.manager.index.corrector -}}
 {{- if .Values.defaults.networkPolicy.enabled }}
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
@@ -55,18 +53,6 @@ spec:
         podSelector:
           matchLabels:
             app: {{ $corrector.name }}
-      - namespaceSelector:
-          matchLabels:
-            kubernetes.io/metadata.name: {{ .Release.Namespace }}
-        podSelector:
-          matchLabels:
-            app: {{ $creator.name }}
-      - namespaceSelector:
-          matchLabels:
-            kubernetes.io/metadata.name: {{ .Release.Namespace }}
-        podSelector:
-          matchLabels:
-            app: {{ $saver.name }}
       {{- if .Values.defaults.networkPolicy.custom.ingress }}
       {{- toYaml .Values.defaults.networkPolicy.custom.ingress | nindent 4 }}
       {{- end }}

charts/vald/templates/index/job/correction/configmap.yaml

@@ -51,12 +51,12 @@ data:
       agent_namespace: {{ $index.indexer.agent_namespace | quote }}
       node_name: {{ $index.indexer.node_name | quote }}
       stream_list_concurrency: {{ $corrector.stream_list_concurrency }}
-      kvs_async_write_concurrency: {{ $corrector.kvs_async_write_concurrency }}
+      bbolt_async_write_concurrency: {{ $corrector.bbolt_async_write_concurrency }}
       index_replica: {{ $gateway.gateway_config.index_replica }}
       discoverer:
         duration: {{ $corrector.discoverer.duration }}
         client:
-          {{- $discovererClient := $index.corrector.discoverer.client }}
+          {{- $discovererClient := $index.indexer.discoverer.client }}
           {{- $discovererServerPort := $discoverer.server_config.servers.grpc.port }}
           {{- $defaultDiscovererHost := printf "%s.%s.svc.cluster.local" $discoverer.name .Release.Namespace }}
           {{- $defaultDiscovererPort := default .Values.defaults.server_config.servers.grpc.port $discovererServerPort }}

charts/vald/templates/index/job/correction/cronjob.yaml

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
 {{- $corrector := .Values.manager.index.corrector -}}
 {{- if $corrector.enabled }}
 apiVersion: batch/v1
@@ -27,7 +28,7 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.Version }}
 spec:
-  schedule: {{ $corrector.schedule | quote }}
+  schedule: {{ $corrector.schedule }}
   concurrencyPolicy: Forbid
   suspend: {{ $corrector.suspend }}
   startingDeadlineSeconds: {{ $corrector.startingDeadlineSeconds }}
@@ -38,21 +39,7 @@ spec:
         metadata:
           labels:
             app: {{ $corrector.name }}
-          annotations:
-            {{- $pprof := default .Values.defaults.server_config.metrics.pprof $corrector.server_config.metrics.pprof -}}
-            {{- if $pprof.enabled }}
-            pyroscope.io/scrape: "true"
-            pyroscope.io/application-name: {{ $corrector.name }}
-            pyroscope.io/profile-cpu-enabled: "true"
-            pyroscope.io/profile-mem-enabled: "true"
-            pyroscope.io/port: {{ $pprof.port | quote }}
-            {{- end }}
         spec:
-          {{- if $corrector.initContainers }}
-          initContainers:
-            {{- $initContainers := dict "initContainers" $corrector.initContainers "Values" .Values "namespace" .Release.Namespace -}}
-            {{- include "vald.initContainers" $initContainers | trim | nindent 12 }}
-          {{- end }}
           containers:
             - name: {{ $corrector.name }}
               image: "{{ $corrector.image.repository }}:{{ default .Values.defaults.image.tag $corrector.image.tag }}"