remove docker sock dependency

microsoft · Feb 6, 2024 · 917f6d1 · 917f6d1
1 parent 0b30796
commit 917f6d1
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 297 deletions.
diff --git a/build/linux/installer/datafiles/base_container.data b/build/linux/installer/datafiles/base_container.data
@@ -109,8 +109,6 @@ MAINTAINER:              'Microsoft Corporation'
 /etc/fluent/plugin/constants.rb;			                                                source/plugins/ruby/constants.rb;			    	644; root; root
 /etc/fluent/plugin/ContainerInventoryState.rb;								            		source/plugins/ruby/ContainerInventoryState.rb;		644; root; root
 /etc/fluent/plugin/CustomMetricsUtils.rb;											               source/plugins/ruby/CustomMetricsUtils.rb;				644; root; root
-/etc/fluent/plugin/DockerApiClient.rb;											                  source/plugins/ruby/DockerApiClient.rb;				644; root; root
-/etc/fluent/plugin/DockerApiRestHelper.rb;										      	      source/plugins/ruby/DockerApiRestHelper.rb;			644; root; root
 /etc/fluent/plugin/kubelet_utils.rb;			                                          source/plugins/ruby/kubelet_utils.rb;			    	644; root; root
 /etc/fluent/plugin/proxy_utils.rb;			                                             source/plugins/ruby/proxy_utils.rb;			    	644; root; root
 /etc/fluent/plugin/kubernetes_container_inventory.rb;							               source/plugins/ruby/kubernetes_container_inventory.rb;		644; root; root

diff --git a/charts/azuremonitor-containers/templates/ama-logs-daemonset.yaml b/charts/azuremonitor-containers/templates/ama-logs-daemonset.yaml
@@ -137,8 +137,6 @@ spec:
           name: host-root
           readOnly: true
           mountPropagation: HostToContainer
-        - mountPath: /var/run/host
-          name: docker-sock
         - mountPath: /var/log
           name: host-log
         - mountPath: /var/lib/docker/containers
@@ -265,9 +263,6 @@ spec:
     - name: host-root
       hostPath:
        path: /
-    - name: docker-sock
-      hostPath:
-       path: /var/run
     - name: container-hostname
       hostPath:
        path: /etc/hostname

diff --git a/charts/azuremonitor-containers/templates/ama-logs-deployment.yaml b/charts/azuremonitor-containers/templates/ama-logs-deployment.yaml
@@ -124,8 +124,6 @@ spec:
        - containerPort: 25224
          protocol: UDP
        volumeMounts:
-        - mountPath: /var/run/host
-          name: docker-sock
         - mountPath: /var/log
           name: host-log
         - mountPath: /var/lib/docker/containers
@@ -178,9 +176,6 @@ spec:
    {{- end }}
    {{- end }}
    volumes:
-    - name: docker-sock
-      hostPath:
-       path: /var/run
     - name: container-hostname
       hostPath:
        path: /etc/hostname

diff --git a/kubernetes/ama-logs.yaml b/kubernetes/ama-logs.yaml
@@ -464,8 +464,6 @@ spec:
               name: host-root
               readOnly: true
               mountPropagation: HostToContainer
-            - mountPath: /var/run/host
-              name: docker-sock
             - mountPath: /var/run/mdsd-ci
               name: mdsd-sock
             - mountPath: /var/log
@@ -609,9 +607,6 @@ spec:
         - name: host-root
           hostPath:
             path: /
-        - name: docker-sock
-          hostPath:
-            path: /var/run
         - name: mdsd-sock
           hostPath:
             path: /var/run/mdsd-ci
@@ -811,8 +806,6 @@ spec:
             - containerPort: 25224
               protocol: UDP
           volumeMounts:
-            - mountPath: /var/run/host
-              name: docker-sock
             - mountPath: /var/log
               name: host-log
             - mountPath: /etc/kubernetes/host
@@ -880,9 +873,6 @@ spec:
         - operator: "Exists"
           effect: "PreferNoSchedule"
       volumes:
-        - name: docker-sock
-          hostPath:
-            path: /var/run
         - name: container-hostname
           hostPath:
             path: /etc/hostname

diff --git a/source/plugins/ruby/ApplicationInsightsUtility.rb b/source/plugins/ruby/ApplicationInsightsUtility.rb
@@ -4,7 +4,6 @@
 class ApplicationInsightsUtility
   require_relative "lib/application_insights"
   require_relative "omslog"
-  require_relative "DockerApiClient"
   require_relative "oms_common"
   require_relative "proxy_utils"
   require "json"
@@ -38,7 +37,8 @@ class ApplicationInsightsUtility
     @@proxy = (ProxyUtils.getProxyConfiguration)
   end
 
-  @@controllerType = {"daemonset" => "DS", "replicaset" => "RS"}
+  @@controllerType = { "daemonset" => "DS", "replicaset" => "RS" }
+
   def initialize
   end
 
@@ -157,15 +157,6 @@ def getContainerRuntimeInfo()
         if !containerRuntime.nil? && !containerRuntime.empty?
           # cri field holds either containerRuntime for non-docker or Dockerversion if its docker
           @@CustomProperties["cri"] = containerRuntime
-          # Not doing this for windows since docker is being deprecated soon and we dont want to bring in the socket dependency.
-          if !@@isWindows.nil? && @@isWindows == false
-            if containerRuntime.casecmp("docker") == 0
-              dockerInfo = DockerApiClient.dockerInfo
-              if (!dockerInfo.nil? && !dockerInfo.empty?)
-                @@CustomProperties["cri"] = dockerInfo["Version"]
-              end
-            end
-          end
         end
       rescue => errorStr
         $log.warn("Exception in AppInsightsUtility: getContainerRuntimeInfo - error: #{errorStr}")
@@ -363,6 +354,5 @@ def sendAPIResponseTelemetry(responseCode, resource, metricName, apiResponseCode
         $log.warn("Exception in AppInsightsUtility: sendAPIResponseTelemetry failed with an error: #{err}")
       end
     end
-
   end
 end
diff --git a/source/plugins/ruby/DockerApiClient.rb b/source/plugins/ruby/DockerApiClient.rb
diff --git a/source/plugins/ruby/DockerApiRestHelper.rb b/source/plugins/ruby/DockerApiRestHelper.rb