From 5948acdb1d2572a66f5e706c1667316ca53d7732 Mon Sep 17 00:00:00 2001 From: michaeljguarino Date: Sat, 20 Jul 2024 17:17:19 -0400 Subject: [PATCH] Improved git agent branch handling (#1193) --- lib/console/deployments/git/cache.ex | 6 +- lib/console/deployments/git/cmd.ex | 18 ++-- test-apps/branch-test/.helmignore | 23 ++++++ test-apps/branch-test/Chart.yaml | 24 ++++++ test-apps/branch-test/templates/NOTES.txt | 22 +++++ test-apps/branch-test/templates/_helpers.tpl | 62 ++++++++++++++ .../branch-test/templates/deployment.yaml | 61 ++++++++++++++ test-apps/branch-test/templates/hpa.yaml | 28 +++++++ test-apps/branch-test/templates/ingress.yaml | 61 ++++++++++++++ test-apps/branch-test/templates/service.yaml | 15 ++++ .../branch-test/templates/serviceaccount.yaml | 12 +++ .../templates/tests/test-connection.yaml | 15 ++++ test-apps/branch-test/values.yaml | 82 +++++++++++++++++++ .../deployments/stack_queries_test.exs | 2 +- 14 files changed, 424 insertions(+), 7 deletions(-) create mode 100644 test-apps/branch-test/.helmignore create mode 100644 test-apps/branch-test/Chart.yaml create mode 100644 test-apps/branch-test/templates/NOTES.txt create mode 100644 test-apps/branch-test/templates/_helpers.tpl create mode 100644 test-apps/branch-test/templates/deployment.yaml create mode 100644 test-apps/branch-test/templates/hpa.yaml create mode 100644 test-apps/branch-test/templates/ingress.yaml create mode 100644 test-apps/branch-test/templates/service.yaml create mode 100644 test-apps/branch-test/templates/serviceaccount.yaml create mode 100644 test-apps/branch-test/templates/tests/test-connection.yaml create mode 100644 test-apps/branch-test/values.yaml diff --git a/lib/console/deployments/git/cache.ex b/lib/console/deployments/git/cache.ex index da1c358ccb..27cd5dbb01 100644 --- a/lib/console/deployments/git/cache.ex +++ b/lib/console/deployments/git/cache.ex @@ -126,12 +126,16 @@ defmodule Console.Deployments.Git.Cache do end defp find_head(heads, ref) do - case Enum.find_value([ref, "refs/heads/#{ref}", "refs/tags/#{ref}"], &Map.get(heads, &1)) do + case Enum.find_value(potential_refs(ref), &Map.get(heads, &1)) do sha when is_binary(sha) -> {:ok, sha} _ -> {:error, "could not resolve ref #{ref}"} end end + defp potential_refs(ref) do + [ref, "refs/remotes/origin/#{ref}", "refs/heads/#{ref}", "refs/tags/#{ref}"] + end + defp tarball(%__MODULE__{git: git, dir: dir}, sha, path, filter) do p = cache_path(dir, sha, path) case File.exists?(p) do diff --git a/lib/console/deployments/git/cmd.ex b/lib/console/deployments/git/cmd.ex index c3794b2e40..bf5c456ba5 100644 --- a/lib/console/deployments/git/cmd.ex +++ b/lib/console/deployments/git/cmd.ex @@ -26,13 +26,14 @@ defmodule Console.Deployments.Git.Cmd do def fetch(%GitRepository{} = repo) do with {:ok, _} <- git(repo, "fetch", ["--all", "--force", "--prune"]), - :ok <- branches(repo), do: possibly_pull(repo) end def possibly_pull(repo) do - case git(repo, "symbolic-ref", ["--short", "HEAD"]) do - {:ok, _} -> git(repo, "pull", ["--all", "--rebase"]) + with {:ok, _} <- git(repo, "reset", ["--hard"]), + {:ok, _} <- git(repo, "symbolic-ref", ["--short", "HEAD"]) do + git(repo, "pull", ["--all"]) + else _ -> {:ok, :ignore} end end @@ -69,19 +70,26 @@ defmodule Console.Deployments.Git.Cmd do end def heads(%GitRepository{} = repo) do - with {:ok, res} <- git(repo, "show-ref", ["--heads", "--tags"]) do + with {:ok, res} <- git(repo, "show-ref", []) do String.split(res, ~r/\R/) |> Enum.map(&String.split(&1, " ")) |> Enum.filter(fn [_, _] -> true _ -> false end) - |> Map.new(fn [sha, head] -> {String.trim(head), sha} end) + |> Map.new(fn [sha, head] -> {coerce_head(head), sha} end) else _ -> %{} end end + defp coerce_head(head) do + case String.trim(head) do + "refs/remotes/origin/" <> head -> "refs/heads/#{head}" + head -> head + end + end + def msg(%GitRepository{} = repo), do: git(repo, "--no-pager", ["log", "-n", "1", "--format=%B"]) def msg(%GitRepository{} = repo, sha), do: git(repo, "--no-pager", ["log", "-n", "1", "--format=%B", "#{sha}"]) diff --git a/test-apps/branch-test/.helmignore b/test-apps/branch-test/.helmignore new file mode 100644 index 0000000000..0e8a0eb36f --- /dev/null +++ b/test-apps/branch-test/.helmignore @@ -0,0 +1,23 @@ +# 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/test-apps/branch-test/Chart.yaml b/test-apps/branch-test/Chart.yaml new file mode 100644 index 0000000000..6673184f32 --- /dev/null +++ b/test-apps/branch-test/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: branch-test +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.1 + +# 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/test-apps/branch-test/templates/NOTES.txt b/test-apps/branch-test/templates/NOTES.txt new file mode 100644 index 0000000000..27287eed36 --- /dev/null +++ b/test-apps/branch-test/templates/NOTES.txt @@ -0,0 +1,22 @@ +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 "branch-test.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 "branch-test.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "branch-test.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 "branch-test.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/test-apps/branch-test/templates/_helpers.tpl b/test-apps/branch-test/templates/_helpers.tpl new file mode 100644 index 0000000000..2a7b306a73 --- /dev/null +++ b/test-apps/branch-test/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "branch-test.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 "branch-test.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 "branch-test.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "branch-test.labels" -}} +helm.sh/chart: {{ include "branch-test.chart" . }} +{{ include "branch-test.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "branch-test.selectorLabels" -}} +app.kubernetes.io/name: {{ include "branch-test.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "branch-test.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "branch-test.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/test-apps/branch-test/templates/deployment.yaml b/test-apps/branch-test/templates/deployment.yaml new file mode 100644 index 0000000000..b8d01d3bf5 --- /dev/null +++ b/test-apps/branch-test/templates/deployment.yaml @@ -0,0 +1,61 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "branch-test.fullname" . }} + labels: + {{- include "branch-test.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "branch-test.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "branch-test.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "branch-test.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: {{ .Values.service.port }} + 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/test-apps/branch-test/templates/hpa.yaml b/test-apps/branch-test/templates/hpa.yaml new file mode 100644 index 0000000000..5467000f6b --- /dev/null +++ b/test-apps/branch-test/templates/hpa.yaml @@ -0,0 +1,28 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2beta1 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "branch-test.fullname" . }} + labels: + {{- include "branch-test.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "branch-test.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/test-apps/branch-test/templates/ingress.yaml b/test-apps/branch-test/templates/ingress.yaml new file mode 100644 index 0000000000..e35f6d2f6b --- /dev/null +++ b/test-apps/branch-test/templates/ingress.yaml @@ -0,0 +1,61 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "branch-test.fullname" . -}} +{{- $svcPort := .Values.service.port -}} +{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} + {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} + {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} + {{- end }} +{{- end }} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else 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 "branch-test.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} + {{- 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 }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} + {{- end }} +{{- end }} diff --git a/test-apps/branch-test/templates/service.yaml b/test-apps/branch-test/templates/service.yaml new file mode 100644 index 0000000000..5f98f004da --- /dev/null +++ b/test-apps/branch-test/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "branch-test.fullname" . }} + labels: + {{- include "branch-test.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "branch-test.selectorLabels" . | nindent 4 }} diff --git a/test-apps/branch-test/templates/serviceaccount.yaml b/test-apps/branch-test/templates/serviceaccount.yaml new file mode 100644 index 0000000000..e57954682b --- /dev/null +++ b/test-apps/branch-test/templates/serviceaccount.yaml @@ -0,0 +1,12 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "branch-test.serviceAccountName" . }} + labels: + {{- include "branch-test.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +{{- end }} diff --git a/test-apps/branch-test/templates/tests/test-connection.yaml b/test-apps/branch-test/templates/tests/test-connection.yaml new file mode 100644 index 0000000000..3f3118fbb9 --- /dev/null +++ b/test-apps/branch-test/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "branch-test.fullname" . }}-test-connection" + labels: + {{- include "branch-test.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "branch-test.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/test-apps/branch-test/values.yaml b/test-apps/branch-test/values.yaml new file mode 100644 index 0000000000..a9c2a6f088 --- /dev/null +++ b/test-apps/branch-test/values.yaml @@ -0,0 +1,82 @@ +# Default values for branch-test. +# 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 + className: "" + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: + - path: / + pathType: ImplementationSpecific + 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/test/console/graphql/queries/deployments/stack_queries_test.exs b/test/console/graphql/queries/deployments/stack_queries_test.exs index 7ed5a2ae42..0da39ec9ea 100644 --- a/test/console/graphql/queries/deployments/stack_queries_test.exs +++ b/test/console/graphql/queries/deployments/stack_queries_test.exs @@ -75,7 +75,7 @@ defmodule Console.GraphQl.Deployments.StackQueriesTest do user = insert(:user) %{group: group} = insert(:group_member, user: user) stacks = insert_list(3, :stack, write_bindings: [%{group_id: group.id}], tags: [%{name: "t", value: "v"}]) - other = insert(:stack, read_bindings: [%{user_id: user.id}]) + insert(:stack, read_bindings: [%{user_id: user.id}]) insert_list(3, :stack) {:ok, %{data: %{"infrastructureStacks" => found}}} = run_query("""