Fix Docker environment variables and Hadoop classpath for Accumulo dependencies

assemble/conf/accumulo-env.sh

@@ -64,7 +64,7 @@ fi
 ZK_JARS=$(find "$ZOOKEEPER_HOME/lib/" -maxdepth 1 -name '*.jar' -not -name '*slf4j*' -not -name '*log4j*' | paste -sd: -)
 # lib is set by calling script that sources this env file
 #shellcheck disable=SC2154
-CLASSPATH="${CLASSPATH}:${lib}/*:${HADOOP_CONF_DIR}:${ZOOKEEPER_HOME}/*:${ZK_JARS}:${HADOOP_HOME}/share/hadoop/client/*"
+CLASSPATH="${CLASSPATH}:${lib}/*:${HADOOP_CONF_DIR}:${ZOOKEEPER_HOME}/*:${ZK_JARS}:${HADOOP_HOME}/share/hadoop/client/*:${HADOOP_HOME}/share/hadoop/common/*:${HADOOP_HOME}/share/hadoop/common/lib/*"
 export CLASSPATH
 
 ##################################################################

charts/accumulo/templates/accumulo-compactor-deployment.yaml

@@ -80,6 +80,8 @@ spec:
           value: "/opt/accumulo"
         - name: ACCUMULO_SERVICE_INSTANCE
           value: "compactor"
+        - name: ALLUXIO_CLIENT_HOME
+          value: "/opt/alluxio/client"
         volumeMounts:
         - name: accumulo-config
           mountPath: /opt/accumulo/conf/accumulo.properties
@@ -92,6 +94,11 @@ spec:
           subPath: log4j2-service.properties
         - name: logs
           mountPath: /opt/accumulo/logs
+        - name: alluxio-client
+          mountPath: /opt/alluxio/client
+        - name: hadoop-config
+          mountPath: /opt/hadoop/etc/hadoop/core-site.xml
+          subPath: core-site.xml
         resources:
           {{- toYaml .Values.accumulo.resources.compactor | nindent 10 }}
       volumes:
@@ -101,4 +108,10 @@ spec:
           defaultMode: 0755
       - name: logs
         emptyDir: {}
+      - name: alluxio-client
+        hostPath:
+          path: /srv/alluxio/client
+      - name: hadoop-config
+        configMap:
+          name: {{ include "accumulo.fullname" . }}-core-site
 {{- end }}

charts/accumulo/templates/accumulo-gc-deployment.yaml

@@ -72,6 +72,8 @@ spec:
           value: "/opt/accumulo"
         - name: ACCUMULO_SERVICE_INSTANCE
           value: "gc"
+        - name: ALLUXIO_CLIENT_HOME
+          value: "/opt/alluxio/client"
         volumeMounts:
         - name: accumulo-config
           mountPath: /opt/accumulo/conf/accumulo.properties
@@ -84,6 +86,11 @@ spec:
           subPath: log4j2-service.properties
         - name: logs
           mountPath: /opt/accumulo/logs
+        - name: alluxio-client
+          mountPath: /opt/alluxio/client
+        - name: hadoop-config
+          mountPath: /opt/hadoop/etc/hadoop/core-site.xml
+          subPath: core-site.xml
         resources:
           {{- toYaml .Values.accumulo.resources.gc | nindent 10 }}
       volumes:
@@ -93,4 +100,10 @@ spec:
           defaultMode: 0755
       - name: logs
         emptyDir: {}
+      - name: alluxio-client
+        hostPath:
+          path: /srv/alluxio/client
+      - name: hadoop-config
+        configMap:
+          name: {{ include "accumulo.fullname" . }}-core-site
 {{- end }}

charts/accumulo/templates/accumulo-manager-deployment.yaml

@@ -108,6 +108,8 @@ spec:
         - name: accumulo-config
           mountPath: /opt/accumulo/conf/log4j2-service.properties
           subPath: log4j2-service.properties
+        - name: alluxio-client
+          mountPath: /opt/alluxio/client
       containers:
       - name: manager
         image: {{ include "accumulo.image" . }}
@@ -128,6 +130,8 @@ spec:
           value: "/opt/accumulo"
         - name: ACCUMULO_SERVICE_INSTANCE
           value: "manager"
+        - name: ALLUXIO_CLIENT_HOME
+          value: "/opt/alluxio/client"
         volumeMounts:
         - name: accumulo-config
           mountPath: /opt/accumulo/conf/accumulo.properties
@@ -140,6 +144,11 @@ spec:
           subPath: log4j2-service.properties
         - name: logs
           mountPath: /opt/accumulo/logs
+        - name: alluxio-client
+          mountPath: /opt/alluxio/client
+        - name: hadoop-config
+          mountPath: /opt/hadoop/etc/hadoop/core-site.xml
+          subPath: core-site.xml
         resources:
           {{- toYaml .Values.accumulo.resources.manager | nindent 10 }}
         livenessProbe:
@@ -161,4 +170,10 @@ spec:
           defaultMode: 0755
       - name: logs
         emptyDir: {}
+      - name: alluxio-client
+        hostPath:
+          path: /srv/alluxio/client
+      - name: hadoop-config
+        configMap:
+          name: {{ include "accumulo.fullname" . }}-core-site
 {{- end }}

charts/accumulo/templates/accumulo-monitor-deployment.yaml

@@ -76,6 +76,10 @@ spec:
           value: "/opt/accumulo"
         - name: ACCUMULO_SERVICE_INSTANCE
           value: "monitor"
+        - name: ALLUXIO_CLIENT_HOME
+          value: "/opt/alluxio/client"
+        - name: ALLUXIO_CLIENT_HOME
+          value: "/opt/alluxio/client"
         volumeMounts:
         - name: accumulo-config
           mountPath: /opt/accumulo/conf/accumulo.properties
@@ -88,6 +92,11 @@ spec:
           subPath: log4j2-service.properties
         - name: logs
           mountPath: /opt/accumulo/logs
+        - name: alluxio-client
+          mountPath: /opt/alluxio/client
+        - name: hadoop-config
+          mountPath: /opt/hadoop/etc/hadoop/core-site.xml
+          subPath: core-site.xml
         resources:
           {{- toYaml .Values.accumulo.resources.monitor | nindent 10 }}
         livenessProbe:
@@ -111,4 +120,10 @@ spec:
           defaultMode: 0755
       - name: logs
         emptyDir: {}
+      - name: alluxio-client
+        hostPath:
+          path: /srv/alluxio/client
+      - name: hadoop-config
+        configMap:
+          name: {{ include "accumulo.fullname" . }}-core-site
 {{- end }}

charts/accumulo/templates/accumulo-tserver-deployment.yaml

@@ -85,6 +85,8 @@ spec:
           value: "/opt/accumulo"
         - name: ACCUMULO_SERVICE_INSTANCE
           value: "tserver"
+        - name: ALLUXIO_CLIENT_HOME
+          value: "/opt/alluxio/client"
         volumeMounts:
         - name: accumulo-config
           mountPath: /opt/accumulo/conf/accumulo.properties
@@ -97,6 +99,11 @@ spec:
           subPath: log4j2-service.properties
         - name: logs
           mountPath: /opt/accumulo/logs
+        - name: alluxio-client
+          mountPath: /opt/alluxio/client
+        - name: hadoop-config
+          mountPath: /opt/hadoop/etc/hadoop/core-site.xml
+          subPath: core-site.xml
         resources:
           {{- toYaml .Values.accumulo.resources.tserver | nindent 10 }}
         livenessProbe:
@@ -118,4 +125,10 @@ spec:
           defaultMode: 0755
       - name: logs
         emptyDir: {}
+      - name: alluxio-client
+        hostPath:
+          path: /srv/alluxio/client
+      - name: hadoop-config
+        configMap:
+          name: {{ include "accumulo.fullname" . }}-core-site
 {{- end }}

charts/accumulo/templates/alluxio-worker-daemonset.yaml

@@ -95,6 +95,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
+        - name: WORKER_HOSTNAME
+          value: "$(POD_NAME).{{ include "accumulo.fullname" . }}-alluxio-worker.$(POD_NAMESPACE).svc.cluster.local"
         - name: ALLUXIO_MASTER_HOSTNAME
           value: {{include "accumulo.fullname" .}}-alluxio-master
         {{- if eq .Values.storage.provider "s3" }}

charts/accumulo/templates/alluxio-worker-service.yaml

@@ -0,0 +1,40 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "accumulo.fullname" . }}-alluxio-worker
+  labels:
+    {{- include "accumulo.labels" . | nindent 4 }}
+    app.kubernetes.io/component: alluxio-worker
+spec:
+  clusterIP: None  # headless
+  ports:
+    - name: rpc
+      port: 29999
+      targetPort: rpc
+      protocol: TCP
+    - name: web
+      port: 30000
+      targetPort: web
+      protocol: TCP
+  selector:
+    {{- include "accumulo.selectorLabels" . | nindent 4 }}
+    app.kubernetes.io/component: alluxio-worker