Merge pull request #3747 from Milisha-Gupta/pub/k8s_telemetry

Airgapped telemetry enablement

Author: abhishek-sa1

discovery/roles/telemetry/tasks/telemetry_prereq.yml

@@ -47,25 +47,6 @@
     state: directory
     mode: "{{ hostvars['localhost']['dir_permissions_755'] }}"
 
-- name: Git checkout for iDRAC Telemetry Reference Tools
-  block:
-    - name: Checkout iDRAC Telemetry GitHub repo
-      ansible.builtin.git:
-        repo: "{{ idrac_telemetry_github_repo }}"
-        dest: "{{ idrac_telemetry_reference_git_clone_path }}"
-        version: "{{ reference_tools_stable_commit }}"
-        update: false
-      register: clone_idrac_telemetry
-      until: clone_idrac_telemetry is succeeded
-      retries: "{{ max_retries }}"
-      delay: "{{ delay_count }}"
-
-  rescue:
-    - name: Fail if iDRAC telemetry Git clone fails
-      ansible.builtin.fail:
-        msg: "{{ idrac_git_clone_error_msg.splitlines() | join(' ') }}"
-      when: clone_idrac_telemetry is failed
-
 - name: Git clone for iDRAC Telemetry script
   block:
     - name: Checkout iDRAC Telemetry GitHub repo

discovery/roles/telemetry/templates/telemetry/idrac_telemetry/idrac_telemetry_statefulset.yaml.j2

@@ -47,10 +47,6 @@ spec:
         app: {{ idrac_telemetry_k8s_name }}
     spec:
       volumes:
-        - name: telemetry-reference-tools
-          hostPath:
-            path: {{ idrac_telemetry_reference_git_clone_path }}
-            type: Directory
 {% set types = hostvars['localhost']['idrac_telemetry_collection_type'].split(',') %}
 {% if 'kafka' in types %}
         # Mount Kafka cluster CA certificate for TLS verification
@@ -127,12 +123,8 @@ spec:
             - containerPort: {{ activemq_http_port_2 }}
 
         - name: idrac-telemetry-receiver
-          image: {{ go_image }}
+          image: {{ idrac_telemetry_receiver_image }}
           imagePullPolicy: IfNotPresent
-          volumeMounts:
-            - mountPath: /go/src/github.com/telemetry-reference-tools
-              name: telemetry-reference-tools
-          workingDir: /go/src/github.com/telemetry-reference-tools
           env:
             - name: MESSAGEBUS_HOST
               value: 127.0.0.1
@@ -156,16 +148,12 @@ spec:
               value: mysqldb
             - name: MYSQL_HOST_PORT
               value: "{{ mysqldb_container_port1 }}"
-          command: ["/bin/sh", "-c"]
-          args: ["./scripts/example/idrac-telemetry-receiver.sh"]
 
 {% if 'kafka' in types %}
         - name: kafka-pump
-          image: {{ go_image }}
+          image: {{ kafkapump_image }}
           imagePullPolicy: IfNotPresent
           volumeMounts:
-            - mountPath: /go/src/github.com/telemetry-reference-tools
-              name: telemetry-reference-tools
             # Mount kafkapump user certificates for mTLS (under /extrabin/certs/)
             - mountPath: /extrabin/certs/kafka-certs
               name: kafkapump-user-certs
@@ -174,7 +162,6 @@ spec:
             - mountPath: /extrabin/certs/cluster-ca
               name: kafka-cluster-ca-cert
               readOnly: true
-          workingDir: /go/src/github.com/telemetry-reference-tools
           env:
             - name: MESSAGEBUS_HOST
               value: 127.0.0.1
@@ -196,18 +183,12 @@ spec:
               value: "false"
             - name: KAFKA_PARTITION
               value: "0"
-          command: ["/bin/sh", "-c"]
-          args: ["go run cmd/kafkapump/kafkapump.go"]
 {% endif %}
 
 {% if 'victoria' in types %}
         - name: victoria-pump
-          image: {{ go_image }}
+          image: {{ victoriapump_image }}
           imagePullPolicy: IfNotPresent
-          volumeMounts:
-            - mountPath: /go/src/github.com/telemetry-reference-tools
-              name: telemetry-reference-tools
-          workingDir: /go/src/github.com/telemetry-reference-tools
           env:
             - name: MESSAGEBUS_HOST
               value: 127.0.0.1
@@ -218,8 +199,6 @@ spec:
           ports:
             - containerPort: 2112
               name: victoriapump
-          command: ["/bin/sh", "-c"]
-          args: ["go run cmd/victoriapump/victoriapump.go"]
 {% endif %}
 
   volumeClaimTemplates:

discovery/roles/telemetry/vars/main.yml

@@ -28,12 +28,10 @@ mysqldb_secrets_name: mysqldb-credentials
 # Usage: idrac_telemetry_deployment.yml
 service_cluster_idrac_telemetry_dir_path: "{{ hostvars['localhost']['k8s_client_share_path'] }}/idrac_telemetry"
 dir_permissions_755: "0755"
-idrac_telemetry_github_repo: https://github.com/dell/iDRAC-Telemetry-Reference-Tools.git
-reference_tools_stable_commit: "56420c4"
-idrac_telemetry_reference_git_clone_path: "{{ service_cluster_idrac_telemetry_dir_path }}/iDRAC-Telemetry-Reference-Tools"
-idrac_git_clone_error_msg: |
-  Failed to clone iDRAC Telemetry GitHub repository from {{ idrac_telemetry_github_repo }}
-  to {{ idrac_telemetry_reference_git_clone_path }} directory in NFS share.
+telemetry_namespace: "telemetry"
+idrac_telemetry_k8s_name: idrac-telemetry
+
+# iDRAC Telemetry scripting repository
 idrac_telemetry_scripting_repo: "https://github.com/dell/iDRAC-Telemetry-Scripting.git"
 idrac_telemetry_scripting_stable_commit: "f6999f5"
 idrac_telemetry_scripting_git_clone_path: "{{ service_cluster_idrac_telemetry_dir_path }}/iDRAC-Telemetry-Scripting"
@@ -42,9 +40,13 @@ idrac_script_git_clone_error_msg: |
   to {{ idrac_telemetry_scripting_git_clone_path }} directory in NFS share.
 max_retries: 10
 delay_count: 5
-telemetry_namespace: "telemetry"
-idrac_telemetry_k8s_name: idrac-telemetry
-go_image: "{{ telemetry_images['library/golang'] | default('docker.io/library/golang:1.24') }}"
+
+# Pre-built container images for iDRAC telemetry components
+# These default to your published images but can be overridden via telemetry_images
+idrac_telemetry_receiver_image: "{{ telemetry_images['dellhpcomniaaisolution/idrac_telemetry_receiver'] | default('docker.io/dellhpcomniaaisolution/idrac_telemetry_receiver:1.0') }}" # noqa: yaml[line-length]
+kafkapump_image: "{{ telemetry_images['dellhpcomniaaisolution/kafkapump'] | default('docker.io/dellhpcomniaaisolution/kafkapump:1.0') }}"
+victoriapump_image: "{{ telemetry_images['dellhpcomniaaisolution/victoriapump'] | default('docker.io/dellhpcomniaaisolution/victoriapump:1.0') }}"
+
 activemq_image: "{{ telemetry_images['rmohr/activemq'] | default('docker.io/rmohr/activemq:5.15.9') }}"
 activemq_http_port_1: 8161
 activemq_http_port_2: 61616

input/config/x86_64/rhel/10.0/service_k8s.json

@@ -19,11 +19,14 @@
       { "package": "docker.io/victoriametrics/vmstorage", "type": "image", "tag": "v1.128.0-cluster" },
       { "package": "docker.io/victoriametrics/vminsert", "type": "image", "tag": "v1.128.0-cluster" },
       { "package": "docker.io/victoriametrics/vmselect", "type": "image", "tag": "v1.128.0-cluster" },
-      { "package": "docker.io/alpine/kubectl", "tag": "v1.34.1", "type": "image" },
+      { "package": "docker.io/alpine/kubectl", "tag": "1.34.1", "type": "image" },
       { "package": "docker.io/curlimages/curl", "type": "image", "tag": "8.17.0" },
       { "package": "docker.io/library/golang", "type": "image", "tag": "1.24" },
       { "package": "docker.io/rmohr/activemq", "type": "image", "tag": "5.15.9" },
       { "package": "docker.io/library/mysql", "type": "image", "tag": "9.3.0" },
+      { "package": "docker.io/dellhpcomniaaisolution/idrac_telemetry_receiver", "type": "image", "tag": "1.0" },
+      { "package": "docker.io/dellhpcomniaaisolution/kafkapump", "type": "image", "tag": "1.0" },
+      { "package": "docker.io/dellhpcomniaaisolution/victoriapump", "type": "image", "tag": "1.0" },
       { "package": "cryptography==45.0.7", "type": "pip_module" },
       { "package": "omsdk==1.2.518", "type": "pip_module" },
       { "package": "cffi==1.17.1", "type": "pip_module" },
@@ -37,7 +40,7 @@
   "service_kube_control_plane": {
     "cluster": [
       { "package": "ghcr.io/kube-vip/kube-vip", "tag": "v0.8.9", "type": "image" },
-      { "package": "docker.io/alpine/kubectl", "tag": "v1.34.1", "type": "image" },
+      { "package": "docker.io/alpine/kubectl", "tag": "1.34.1", "type": "image" },
       { "package": "registry.k8s.io/kube-apiserver", "tag": "v1.34.1", "type": "image" },
       { "package": "registry.k8s.io/kube-controller-manager", "tag": "v1.34.1", "type": "image" },
       { "package": "registry.k8s.io/kube-scheduler", "tag": "v1.34.1", "type": "image" },
@@ -66,7 +69,7 @@
       { "package": "registry.k8s.io/kube-scheduler", "tag": "v1.34.1", "type": "image" },
       { "package": "registry.k8s.io/kube-proxy", "tag": "v1.34.1", "type": "image" },
       { "package": "registry.k8s.io/coredns/coredns", "tag": "v1.12.1", "type": "image" },
-      { "package": "docker.io/alpine/kubectl", "tag": "v1.34.1", "type": "image" },
+      { "package": "docker.io/alpine/kubectl", "tag": "1.34.1", "type": "image" },
       { "package": "registry.k8s.io/pause", "tag": "3.10.1", "type": "image" },
       { "package": "registry.k8s.io/etcd", "tag": "3.6.4-0", "type": "image" },
       { "package": "docker.io/calico/cni", "tag": "v3.30.3", "type": "image" },