Skip to content

Commit 412621f

Browse files
authored
Duplicates charts to rag folder so the Marketplace release can work (#903)
1 parent 35397cd commit 412621f

File tree

8 files changed

+176
-1
lines changed

8 files changed

+176
-1
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
apiVersion: v2
2+
name: gmp-engine
3+
description: A Helm chart for Kubernetes
4+
5+
# A chart can be either an 'application' or a 'library' chart.
6+
#
7+
# Application charts are a collection of templates that can be packaged into versioned archives
8+
# to be deployed.
9+
#
10+
# Library charts provide useful utilities or functions for the chart developer. They're included as
11+
# a dependency of application charts to inject those utilities and functions into the rendering
12+
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
13+
type: application
14+
15+
# This is the chart version. This version number should be incremented each time you make changes
16+
# to the chart and its templates, including the app version.
17+
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18+
version: 0.1.0
19+
20+
# This is the version number of the application being deployed. This version number should be
21+
# incremented each time you make changes to the application. Versions are not expected to
22+
# follow Semantic Versioning. They should reflect the version the application is using.
23+
# It is recommended to use it with quotes.
24+
appVersion: "1.0.0"
25+
26+
dependencies:
27+
- name: gmp-frontend
28+
condition: gmp-frontend.enabled
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
apiVersion: v2
2+
name: gmp-frontend
3+
description: A Helm chart for Kubernetes
4+
5+
# A chart can be either an 'application' or a 'library' chart.
6+
#
7+
# Application charts are a collection of templates that can be packaged into versioned archives
8+
# to be deployed.
9+
#
10+
# Library charts provide useful utilities or functions for the chart developer. They're included as
11+
# a dependency of application charts to inject those utilities and functions into the rendering
12+
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
13+
type: application
14+
15+
# This is the chart version. This version number should be incremented each time you make changes
16+
# to the chart and its templates, including the app version.
17+
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18+
version: 0.1.0
19+
20+
# This is the version number of the application being deployed. This version number should be
21+
# incremented each time you make changes to the application. Versions are not expected to
22+
# follow Semantic Versioning. They should reflect the version the application is using.
23+
# It is recommended to use it with quotes.
24+
appVersion: "1.0.0"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# Copyright 2023 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
apiVersion: apps/v1
16+
kind: Deployment
17+
metadata:
18+
name: {{ .Values.name }}
19+
labels:
20+
app: {{ .Values.name }}
21+
spec:
22+
replicas: {{ .Values.replicaCount }}
23+
selector:
24+
matchLabels:
25+
app: {{ .Values.name }}
26+
template:
27+
metadata:
28+
labels:
29+
app: {{ .Values.name }}
30+
spec:
31+
serviceAccountName: {{ required "serviceAccount is required!" .Values.serviceAccount }}
32+
containers:
33+
- name: {{ .Values.name }}
34+
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
35+
imagePullPolicy: {{ .Values.image.pullPolicy }}
36+
args:
37+
- "--web.listen-address=:9090"
38+
- "--query.project-id={{ required "projectID is required!" .Values.projectID }}"
39+
ports:
40+
- name: web
41+
containerPort: 9090
42+
readinessProbe:
43+
httpGet:
44+
path: /-/ready
45+
port: web
46+
livenessProbe:
47+
httpGet:
48+
path: /-/healthy
49+
port: web
50+
resources:
51+
requests:
52+
memory: {{ .Values.memory }}
53+
cpu: {{ .Values.cpu }}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
name: {{ .Values.name }}
5+
labels:
6+
app: {{ .Values.name }}
7+
spec:
8+
clusterIP: None
9+
ports:
10+
- name: web
11+
port: 9090
12+
selector:
13+
app: {{ .Values.name }}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Default values for gmp-frontend.
2+
# This is a YAML-formatted file.
3+
# Declare variables to be passed into your templates.
4+
5+
name: "gmp-frontend"
6+
projectID: ""
7+
serviceAccount: ""
8+
9+
image:
10+
repository: gke.gcr.io/prometheus-engine/frontend
11+
pullPolicy: IfNotPresent
12+
tag: "v0.5.0-gke.0"
13+
14+
replicaCount: 2
15+
16+
cpu: "1m"
17+
memory: "5Mi"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Copyright 2023 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
16+
{{- range $pm := .Values.podMonitoring }}
17+
apiVersion: monitoring.googleapis.com/v1
18+
kind: PodMonitoring
19+
metadata:
20+
name: {{ $pm.name}}
21+
spec:
22+
selector:
23+
matchLabels:
24+
{{- $pm.selector | toYaml | nindent 8 }}
25+
endpoints:
26+
- port: {{ $pm.port }}
27+
interval: {{ $pm.interval }}
28+
---
29+
{{- end }}
30+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Default values for iap_jupyter.
2+
# This is a YAML-formatted file.
3+
# Declare variables to be passed into your templates.
4+
5+
podMonitoring: []
6+
7+
gmp-frontend:
8+
enabled: false
9+
projectID: ""
10+
serviceAccount: ""

applications/rag/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ module "frontend" {
309309
resource "helm_release" "gmp-apps" {
310310
name = "gmp-apps"
311311
provider = helm.rag
312-
chart = "../../charts/gmp-engine/"
312+
chart = "./charts/gmp-engine"
313313
namespace = local.kubernetes_namespace
314314
# Timeout is increased to guarantee sufficient scale-up time for Autopilot nodes.
315315
timeout = 1200

0 commit comments

Comments
 (0)