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

ABS Migration #372

Closed
wants to merge 10 commits into from
6 changes: 6 additions & 0 deletions .abs/main.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
generate-metadata: true
chart-dir: ./helm/apptest-app
destination: ./build
catalog-base-url: https://giantswarm.github.io/control-plane-test-catalog/
replace-chart-version-with-git: true
replace-app-version-with-git: true
17 changes: 5 additions & 12 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,13 @@ workflows:
- architect/push-to-app-catalog:
context: "architect"
name: push-apptest-app-to-control-plane-test-catalog
executor: app-build-suite
app_catalog: "control-plane-test-catalog"
app_catalog_test: "control-plane-test-catalog"
chart: "apptest-app"
filters:
# Do not trigger the job on merge to master.
branches:
ignore:
- master
only: /.*/
requires:
- go-test

Expand All @@ -32,10 +31,8 @@ workflows:
install-app-platform: true
test-dir: "integration/test/basic"
filters:
# Do not trigger the job on merge to master.
branches:
ignore:
- master
only: /.*/
requires:
- push-apptest-app-to-control-plane-test-catalog

Expand All @@ -44,10 +41,8 @@ workflows:
install-app-platform: true
test-dir: "integration/test/ensurecrds"
filters:
# Do not trigger the job on merge to master.
branches:
ignore:
- master
only: /.*/
requires:
- push-apptest-app-to-control-plane-test-catalog

Expand All @@ -56,9 +51,7 @@ workflows:
install-app-platform: true
test-dir: "integration/test/externalcatalog"
filters:
# Do not trigger the job on merge to master.
branches:
ignore:
- master
only: /.*/
requires:
- push-apptest-app-to-control-plane-test-catalog
12 changes: 10 additions & 2 deletions helm/apptest-app/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
apiVersion: v1
appVersion: v1.8.0
appVersion: 0.0.1-dev
description: A test app for the apptest library
home: https://github.com/giantswarm/apptest
name: apptest-app
version: [[ .Version ]]
version: 0.0.1-dev
icon: https://s.giantswarm.io/app-icons/giantswarm/1/dark.svg
annotations:
application.giantswarm.io/team: honeybadger
config.giantswarm.io/version: 1.x.x
restrictions:
clusterSingleton: true
fixedNamespace: kube-system
gpuInstances: false
28 changes: 28 additions & 0 deletions helm/apptest-app/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}

{{/*
Common labels
*/}}
{{- define "labels.common" -}}
{{ include "labels.selector" . }}
app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
app.kubernetes.io/name: {{ .Values.name | quote }}
app.kubernetes.io/instance: {{ .Release.Name | quote }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
application.giantswarm.io/team: {{ index .Chart.Annotations "application.giantswarm.io/team" | quote }}
giantswarm.io/service-type: "{{ .Values.serviceType }}"
helm.sh/chart: {{ include "chart" . | quote }}
kubernetes.io/cluster-service: "true"
{{- end -}}

{{/*
Selector labels
*/}}
{{- define "labels.selector" -}}
app: {{ .Values.name | quote }}
{{- end -}}
84 changes: 84 additions & 0 deletions helm/apptest-app/values.schema.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
{
"$schema": "http://json-schema.org/schema#",
"type": "object",
"properties": {
"name": {
"type": "string",
"description": "Name of the app"
},
"namespace": {
"type": "string",
"description": "Namespace where the app will be installed"
},
"port": {
"type": "integer",
"description": "Port number for metrics"
},
"portName": {
"type": "string",
"description": "Name of the port"
},
"replicas": {
"type": "integer",
"description": "Number of replicas"
},
"image": {
"type": "object",
"properties": {
"registry": {
"type": "string",
"description": "Container image registry"
},
"name": {
"type": "string",
"description": "Container image name"
},
"tag": {
"type": "string",
"description": "Container image tag"
}
}
},
"resources": {
"type": "object",
"properties": {
"limits": {
"type": "object",
"properties": {
"cpu": {
"type": "string",
"description": "CPU limit"
},
"memory": {
"type": "string",
"description": "Memory limit"
}
}
},
"requests": {
"type": "object",
"properties": {
"cpu": {
"type": "string",
"description": "CPU request"
},
"memory": {
"type": "string",
"description": "Memory request"
}
}
}
}
},
"podSecurityStandards": {
"type": "object",
"properties": {
"enforced": {
"type": "boolean",
"description": "Whether pod security standards are enforced"
}
}
}
},
"required": ["name", "namespace", "port", "portName"]
}
1 change: 1 addition & 0 deletions helm/apptest-app/values.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: apptest-app
serviceType: managed
namespace: kube-system
port: 10301
portName: metrics
Expand Down
Loading