diff --git a/internal/fileutil/fileutil.go b/internal/fileutil/fileutil.go index 8a889f495..b737877cf 100644 --- a/internal/fileutil/fileutil.go +++ b/internal/fileutil/fileutil.go @@ -71,7 +71,13 @@ func CompressDirToTgz(chartTmpDir, tmpdir string) (*bytes.Buffer, error) { // tar => gzip => buf buf := bytes.NewBuffer(nil) zr := gzip.NewWriter(buf) + zr.ModTime = time.Date(1977, time.May, 25, 0, 0, 0, 0, time.UTC) + zr.Header.ModTime = time.Date(1977, time.May, 25, 0, 0, 0, 0, time.UTC) + zr.Header.OS = 3 // Unix + zr.OS = 3 //Unix + zr.Extra = nil + tw := tar.NewWriter(zr) // walk through every file in the folder @@ -93,7 +99,18 @@ func CompressDirToTgz(chartTmpDir, tmpdir string) (*bytes.Buffer, error) { header.ModTime = time.Date(1977, time.May, 25, 0, 0, 0, 0, time.UTC) header.AccessTime = time.Date(1977, time.May, 25, 0, 0, 0, 0, time.UTC) header.ChangeTime = time.Date(1977, time.May, 25, 0, 0, 0, 0, time.UTC) - header.Format = tar.FormatGNU + header.Format = tar.FormatPAX + header.PAXRecords = nil + + if fi.IsDir() { + header.Typeflag = tar.TypeDir + header.Mode |= 0755 + header.Size = 0 + } else { + header.Typeflag = tar.TypeReg + header.Mode |= 0644 + header.Size = fi.Size() + } // write header if err := tw.WriteHeader(header); err != nil { diff --git a/internal/fileutil/fileutil_test.go b/internal/fileutil/fileutil_test.go index ac10dbac6..01d50c188 100644 --- a/internal/fileutil/fileutil_test.go +++ b/internal/fileutil/fileutil_test.go @@ -17,9 +17,10 @@ limitations under the License. package fileutil import ( + "archive/tar" "bytes" - "crypto/md5" - "encoding/hex" + "compress/gzip" + "io" "io/ioutil" "os" "path/filepath" @@ -62,21 +63,43 @@ func TestAtomicWriteFile(t *testing.T) { func TestCompressDirToTgz(t *testing.T) { testDataDir := "testdata" - chartTestDir := "testdata/helmchart" - expectMd5Value := "218a88e89fa53efc6dd56aab27159880" - expectChartBytesLen := 3998 + chartTestDir := "testdata/testdir" chartBytes, err := CompressDirToTgz(chartTestDir, testDataDir) if err != nil { t.Fatal(err) } - chartBytesLen := chartBytes.Len() - hash := md5.Sum(chartBytes.Bytes()) - currentMd5Value := hex.EncodeToString(hash[:]) - if currentMd5Value != expectMd5Value { - t.Fatalf("Expect md5 %s, but get md5 %s, len %d", expectMd5Value, currentMd5Value, chartBytesLen) + + // gzip read + gr, err := gzip.NewReader(chartBytes) + if err != nil { + t.Fatal(err) + } + defer gr.Close() + + // tar read + tr := tar.NewReader(gr) + defer gr.Close() + + found := false + fileBytes := bytes.NewBuffer(nil) + for { + hdr, err := tr.Next() + if err == io.EOF { + break + } + if hdr.Name == "testdir/testfile" { + found = true + _, err := io.Copy(fileBytes, tr) + if err != nil { + t.Fatal(err) + } + } + } + if !found { + t.Fatal("testdir/testfile not found") } - if chartBytesLen != expectChartBytesLen { - t.Fatalf("Expect chartBytesLen %d, but get %d", expectChartBytesLen, chartBytesLen) + if !bytes.Equal(fileBytes.Bytes(), []byte("helm")) { + t.Fatalf("testdir/testfile's content not match, excpcted %s, got %s", "helm", fileBytes.String()) } } diff --git a/internal/fileutil/testdata/helmchart/.helmignore b/internal/fileutil/testdata/helmchart/.helmignore deleted file mode 100644 index 0e8a0eb36..000000000 --- a/internal/fileutil/testdata/helmchart/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/internal/fileutil/testdata/helmchart/Chart.yaml b/internal/fileutil/testdata/helmchart/Chart.yaml deleted file mode 100644 index c4239c942..000000000 --- a/internal/fileutil/testdata/helmchart/Chart.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: v2 -name: helmchart -description: A Helm chart for Kubernetes - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -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: 0.1.0 - -# This is the version number of the application being deployed. 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: "1.16.0" diff --git a/internal/fileutil/testdata/helmchart/templates/NOTES.txt b/internal/fileutil/testdata/helmchart/templates/NOTES.txt deleted file mode 100644 index 41d5cffaf..000000000 --- a/internal/fileutil/testdata/helmchart/templates/NOTES.txt +++ /dev/null @@ -1,22 +0,0 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "helmchart.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "helmchart.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "helmchart.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "helmchart.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT -{{- end }} diff --git a/internal/fileutil/testdata/helmchart/templates/_helpers.tpl b/internal/fileutil/testdata/helmchart/templates/_helpers.tpl deleted file mode 100644 index 28bcb84bd..000000000 --- a/internal/fileutil/testdata/helmchart/templates/_helpers.tpl +++ /dev/null @@ -1,62 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "helmchart.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "helmchart.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "helmchart.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "helmchart.labels" -}} -helm.sh/chart: {{ include "helmchart.chart" . }} -{{ include "helmchart.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "helmchart.selectorLabels" -}} -app.kubernetes.io/name: {{ include "helmchart.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "helmchart.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "helmchart.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/internal/fileutil/testdata/helmchart/templates/deployment.yaml b/internal/fileutil/testdata/helmchart/templates/deployment.yaml deleted file mode 100644 index 0c260cc9b..000000000 --- a/internal/fileutil/testdata/helmchart/templates/deployment.yaml +++ /dev/null @@ -1,61 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "helmchart.fullname" . }} - labels: - {{- include "helmchart.labels" . | nindent 4 }} -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - selector: - matchLabels: - {{- include "helmchart.selectorLabels" . | nindent 6 }} - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "helmchart.selectorLabels" . | nindent 8 }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "helmchart.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - name: http - containerPort: 80 - protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - readinessProbe: - httpGet: - path: / - port: http - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/internal/fileutil/testdata/helmchart/templates/hpa.yaml b/internal/fileutil/testdata/helmchart/templates/hpa.yaml deleted file mode 100644 index acd8e4207..000000000 --- a/internal/fileutil/testdata/helmchart/templates/hpa.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "helmchart.fullname" . }} - labels: - {{- include "helmchart.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "helmchart.fullname" . }} - minReplicas: {{ .Values.autoscaling.minReplicas }} - maxReplicas: {{ .Values.autoscaling.maxReplicas }} - metrics: - {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} - {{- end }} - {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - - type: Resource - resource: - name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} - {{- end }} -{{- end }} diff --git a/internal/fileutil/testdata/helmchart/templates/ingress.yaml b/internal/fileutil/testdata/helmchart/templates/ingress.yaml deleted file mode 100644 index e9440ab38..000000000 --- a/internal/fileutil/testdata/helmchart/templates/ingress.yaml +++ /dev/null @@ -1,41 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "helmchart.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "helmchart.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - backend: - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} diff --git a/internal/fileutil/testdata/helmchart/templates/service.yaml b/internal/fileutil/testdata/helmchart/templates/service.yaml deleted file mode 100644 index 12e16ef71..000000000 --- a/internal/fileutil/testdata/helmchart/templates/service.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "helmchart.fullname" . }} - labels: - {{- include "helmchart.labels" . | nindent 4 }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: http - protocol: TCP - name: http - selector: - {{- include "helmchart.selectorLabels" . | nindent 4 }} diff --git a/internal/fileutil/testdata/helmchart/templates/serviceaccount.yaml b/internal/fileutil/testdata/helmchart/templates/serviceaccount.yaml deleted file mode 100644 index 0ff995909..000000000 --- a/internal/fileutil/testdata/helmchart/templates/serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "helmchart.serviceAccountName" . }} - labels: - {{- include "helmchart.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} diff --git a/internal/fileutil/testdata/helmchart/templates/tests/test-connection.yaml b/internal/fileutil/testdata/helmchart/templates/tests/test-connection.yaml deleted file mode 100644 index 5e64cd3ac..000000000 --- a/internal/fileutil/testdata/helmchart/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "helmchart.fullname" . }}-test-connection" - labels: - {{- include "helmchart.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "helmchart.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/internal/fileutil/testdata/helmchart/values.yaml b/internal/fileutil/testdata/helmchart/values.yaml deleted file mode 100644 index 211528bf7..000000000 --- a/internal/fileutil/testdata/helmchart/values.yaml +++ /dev/null @@ -1,83 +0,0 @@ -# Default values for helmchart. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -image: - repository: nginx - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: "" - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -serviceAccount: - # Specifies whether a service account should be created - create: true - # Annotations to add to the service account - 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: "" - -podAnnotations: {} - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -service: - type: ClusterIP - port: 80 - -ingress: - enabled: false - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: chart-example.local - paths: - - path: / - backend: - serviceName: chart-example.local - servicePort: 80 - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -nodeSelector: {} - -tolerations: [] - -affinity: {} diff --git a/internal/fileutil/testdata/testdir/testfile b/internal/fileutil/testdata/testdir/testfile new file mode 100644 index 000000000..5a8e18c53 --- /dev/null +++ b/internal/fileutil/testdata/testdir/testfile @@ -0,0 +1 @@ +helm \ No newline at end of file diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go index c9a95ace7..882a24125 100644 --- a/pkg/downloader/manager.go +++ b/pkg/downloader/manager.go @@ -495,7 +495,7 @@ Loop: } // If repo is from git url, continue - if strings.HasPrefix(dd.Repository, "git:") { + if strings.HasPrefix(dd.Repository, "git://") { continue }