tolower

Azure · Oct 22, 2023 · a1605b1 · a1605b1
1 parent 3fb88b7
commit a1605b1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/Chart.yaml b/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/Chart.yaml
@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 6.8.0-ccp-shell-removal-branch-10-20-2023-798a4bcf
+version: 6.8.0-ccp-shell-removal-branch-10-22-2023-3fb88b7f
 
 # This is the version number of the application being deployed (basically, imagetag for the image built/compatible with this chart semver above). This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "6.8.0-ccp-shell-removal-branch-10-20-2023-798a4bcf"
+appVersion: "6.8.0-ccp-shell-removal-branch-10-22-2023-3fb88b7f"
 # dependencies:
 # - name: prometheus-node-exporter
 #   version: "4.21.0"

diff --git a/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/values.yaml b/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/values.yaml
@@ -36,10 +36,10 @@ AzureMonitorMetrics:
       - validatingwebhookconfigurations
       - volumeattachments
   ImageRepository: "/azuremonitor/containerinsights/cidev/prometheus-collector/images"
-  ImageTag: "6.8.0-ccp-shell-removal-branch-10-20-2023-798a4bcf"
-  ImageTagWin: "6.8.0-ccp-shell-removal-branch-10-20-2023-798a4bcf-win"
-  ImageTagTargetAllocator: "6.8.0-ccp-shell-removal-branch-10-20-2023-798a4bcf-targetallocator"
-  ImageTagCfgReader: "6.8.0-ccp-shell-removal-branch-10-20-2023-798a4bcf-cfg"
+  ImageTag: "6.8.0-ccp-shell-removal-branch-10-22-2023-3fb88b7f"
+  ImageTagWin: "6.8.0-ccp-shell-removal-branch-10-22-2023-3fb88b7f-win"
+  ImageTagTargetAllocator: "6.8.0-ccp-shell-removal-branch-10-22-2023-3fb88b7f-targetallocator"
+  ImageTagCfgReader: "6.8.0-ccp-shell-removal-branch-10-22-2023-3fb88b7f-cfg"
   TargetAllocatorEnabled: false
   DeploymentReplicas: 1
   # The below 2 settings are not Azure Monitor Metrics adapter chart. They are substituted in a different manner.

diff --git a/otelcollector/prometheuscollector/main.go b/otelcollector/prometheuscollector/main.go
@@ -40,7 +40,7 @@ func main(){
 
 	var meConfigFile string
 
-	if controllerType == "replicaset" {
+	if strings.ToLower(controllerType) == "replicaset" {
 		if clusterOverride == "true" {
 			meConfigFile = "/usr/sbin/me_internal.config"
 		} else {