Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix chart sync structure #101

Merged
merged 4 commits into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ jobs:
git config user.name "$GITHUB_ACTOR"
git config user.email "[email protected]"
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
Expand Down
2 changes: 0 additions & 2 deletions charts/egressd/templates/exporter/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 14 additions & 14 deletions charts/egressd/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -76,7 +76,7 @@ collector:
limits:
memory: 1Gi

nodeSelector: { }
nodeSelector: {}

tolerations:
- operator: Exists
Expand Down Expand Up @@ -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
Expand All @@ -175,7 +175,7 @@ exporter:
allowPrivilegeEscalation: false
readOnlyRootFilesystem: true
capabilities:
drop: [ ALL ]
drop: [ALL]

resources:
requests:
Expand All @@ -184,11 +184,11 @@ exporter:
limits:
memory: 512Mi

nodeSelector: { }
nodeSelector: {}

tolerations: [ ]
tolerations: []

affinity: { }
affinity: {}

dnsPolicy: ClusterFirstWithHostNet

Expand Down
2 changes: 1 addition & 1 deletion exporter/exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Loading