diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5aeb29d..a0d7167 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -200,7 +200,7 @@ jobs: git config user.name "$GITHUB_ACTOR" git config user.email "$GITHUB_ACTOR@users.noreply.github.com" git checkout main - cp -r ${CHART_PATH} ./charts/egressd + cp -r ${CHART_PATH}/ ./charts/egressd git add charts/egressd git commit -m "Update egressd chart to ${{env.RELEASE_TAG}}" git push diff --git a/charts/egressd/templates/exporter/deployment.yaml b/charts/egressd/templates/exporter/deployment.yaml index c0ea07b..c8cc6e9 100644 --- a/charts/egressd/templates/exporter/deployment.yaml +++ b/charts/egressd/templates/exporter/deployment.yaml @@ -72,8 +72,6 @@ spec: name: {{ .Values.castai.apiKeySecretRef }} key: API_KEY {{- end }} - {{- else }} - {{- fail "apiKey or apiKeySecretRef must be provided" }} {{- end }} ports: - name: http-server diff --git a/charts/egressd/values.yaml b/charts/egressd/values.yaml index 2dc4641..e947486 100644 --- a/charts/egressd/values.yaml +++ b/charts/egressd/values.yaml @@ -32,27 +32,27 @@ collector: # Specifies whether a service account should be created create: true # Annotations to add to the service account - annotations: { } + annotations: {} # The name of the service account to use. # If not set and create is true, a name is generated using the fullname template name: "" ## The name of the PriorityClass for collector pods - #priorityClassName: "system-node-critical" + # priorityClassName: "system-node-critical" ## Annotations to be added to collector pod ## - podAnnotations: { } + podAnnotations: {} ## Labels to be added to collector pod ## - podLabels: { } + podLabels: {} # If hostPID is used container should run in fully privileged mode. Then hostNetwork can be set to false. hostPID: true hostNetwork: false - podSecurityContext: { } + podSecurityContext: {} # fsGroup: 2000 containerSecurityContext: @@ -76,7 +76,7 @@ collector: limits: memory: 1Gi - nodeSelector: { } + nodeSelector: {} tolerations: - operator: Exists @@ -145,23 +145,23 @@ exporter: # Specifies whether a service account should be created create: true # Annotations to add to the service account - annotations: { } + annotations: {} # The name of the service account to use. # If not set and create is true, a name is generated using the fullname template name: "" ## The name of the PriorityClass for exporter pods - #priorityClassName: "system-cluster-critical" + # priorityClassName: "system-cluster-critical" ## Annotations to be added to exporter pod ## - podAnnotations: { } + podAnnotations: {} ## Labels to be added to exporter pod ## - podLabels: { } + podLabels: {} podSecurityContext: fsGroup: 10001 @@ -175,7 +175,7 @@ exporter: allowPrivilegeEscalation: false readOnlyRootFilesystem: true capabilities: - drop: [ ALL ] + drop: [ALL] resources: requests: @@ -184,11 +184,11 @@ exporter: limits: memory: 512Mi - nodeSelector: { } + nodeSelector: {} - tolerations: [ ] + tolerations: [] - affinity: { } + affinity: {} dnsPolicy: ClusterFirstWithHostNet diff --git a/exporter/exporter.go b/exporter/exporter.go index af917ae..b8715cb 100644 --- a/exporter/exporter.go +++ b/exporter/exporter.go @@ -261,7 +261,7 @@ func (e *Exporter) buildPodNetworkMetric(conn *pb.RawNetworkMetric) (*pb.PodNetw } func (e *Exporter) fetchRawNetworkMetricsBatch(ctx context.Context, url string) (*pb.RawNetworkMetricBatch, error) { - req, err := http.NewRequestWithContext(ctx, http.MethodGet, fmt.Sprintf("%s/api/v1/raw-network-metrics", url), nil) + req, err := http.NewRequestWithContext(ctx, http.MethodGet, url+"/api/v1/raw-network-metrics", nil) if err != nil { return nil, err }