Skip to content

Commit 7089471

Browse files
DloritejaimeyhDavid Lorite Solanas
authored
Production PR (#255)
* Add automatically resources (#250) * Add automatically resources * Add feedback and improvements * Add missing alerts * Update apps files * Add new changes and improvements * Update buildandDeploy.yml * Update buildandDeploy.yml * Add automatically resources (#251) * Add automatically resources * Add feedback and improvements * Add missing alerts * Update apps files * Add new changes and improvements * Fix some issues * Remove wrong files * Add dashboard yaml for opa * Add README for harbor * Remove readme to add later * Add README.md * Add missing README.md files and comment test for now * Change the github action * Change the github action * Add deploy in staging * Add new images * ADD fluentd and ntp dashboards images (#252) * Improve Readme files * Add links of the exporters as uri * Move coming soon to future apps * Add prerequisites for some ootb integrations * Update actions * [Issue #253] Fix missing } (#254) * Fix Python version in the action --------- Co-authored-by: Jaime Yera Hidalgo <106755265+jaimeyh@users.noreply.github.com> Co-authored-by: David Lorite Solanas <david.lorite@david.lorite>
1 parent cbacf85 commit 7089471

File tree

385 files changed

+85695
-4774
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

385 files changed

+85695
-4774
lines changed

‎.github/workflows/buildandDeploy.yml‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,15 @@ jobs:
1616
build:
1717
# The type of runner that the job will run on
1818
runs-on: ubuntu-latest
19-
strategy:
20-
matrix:
21-
python-version: [3.6]
2219

2320

2421
# Steps represent a sequence of tasks that will be executed as part of the job
2522
steps:
26-
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
2723
- uses: actions/checkout@v2
28-
- name: Set up Python ${{ matrix.python-version }}
29-
uses: actions/setup-python@v2
24+
- name: Set up Python 3.10
25+
uses: actions/setup-python@v4
3026
with:
31-
python-version: ${{ matrix.python-version }}
27+
python-version: '3.10'
3228
- name: Install dependencies
3329
run: |
3430
apt-get update && apt-get install -y python-dev
@@ -64,12 +60,20 @@ jobs:
6460
chmod +x ./kubectl
6561
sudo mv ./kubectl /usr/local/bin/kubectl
6662
63+
- id: 'auth'
64+
name: 'Authenticate to Google Cloud'
65+
uses: 'google-github-actions/auth@v1'
66+
with:
67+
credentials_json: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
68+
69+
- id: 'get-credentials'
70+
uses: 'google-github-actions/get-gke-credentials@v1'
71+
with:
72+
cluster_name: ${{ secrets.CLUSTER_NAME }}
73+
location: 'us-central1-a'
74+
project_id: ${{ secrets.PROJECT_ID }}
75+
6776
- name: Deploy in staging
68-
env:
69-
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
7077
run: |
71-
echo "$GOOGLE_APPLICATION_CREDENTIALS" | base64 --decode > /tmp/config
72-
export GOOGLE_APPLICATION_CREDENTIALS=/tmp/config
73-
export KUBECONFIG=deployment/promhub_kubeconfig
7478
chmod +x deployment/staging/deploy.sh
75-
sh ./deployment/staging/deploy.sh
79+
sh ./deployment/staging/deploy.sh

‎.github/workflows/production.yml‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This is a basic workflow to help you get started with Actions
22

3-
name: testAndBuild
3+
name: Production Build
44

55
# Controls when the action will run. Triggers the workflow on push or pull request
66
# events but only for the master branch
@@ -14,19 +14,14 @@ jobs:
1414
build:
1515
# The type of runner that the job will run on
1616
runs-on: ubuntu-latest
17-
strategy:
18-
matrix:
19-
python-version: [3.6]
20-
2117

2218
# Steps represent a sequence of tasks that will be executed as part of the job
2319
steps:
2420
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
25-
- uses: actions/checkout@v2
26-
- name: Set up Python ${{ matrix.python-version }}
27-
uses: actions/setup-python@v2
21+
- name: Set up Python 3.10
22+
uses: actions/setup-python@v4
2823
with:
29-
python-version: ${{ matrix.python-version }}
24+
python-version: '3.10'
3025
- name: Install dependencies
3126
run: |
3227
apt-get update && apt-get install -y python-dev

‎.github/workflows/productionDeploy.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ jobs:
77
build:
88
# The type of runner that the job will run on
99
runs-on: ubuntu-latest
10-
strategy:
11-
matrix:
12-
python-version: [3.6]
1310

1411
# Steps represent a sequence of tasks that will be executed as part of the job
1512
steps:
@@ -20,12 +17,15 @@ jobs:
2017
chmod +x ./kubectl
2118
sudo mv ./kubectl /usr/local/bin/kubectl
2219
23-
- name: Deploy in production
24-
env:
25-
GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
26-
run: |
27-
echo "$GOOGLE_APPLICATION_CREDENTIALS" | base64 --decode > /tmp/config
28-
export GOOGLE_APPLICATION_CREDENTIALS=/tmp/config
29-
export KUBECONFIG=deployment/promhub_kubeconfig
30-
chmod +x deployment/master/deploy.sh
31-
sh ./deployment/master/deploy.sh
20+
- id: 'auth'
21+
name: 'Authenticate to Google Cloud'
22+
uses: 'google-github-actions/auth@v1'
23+
with:
24+
credentials_json: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
25+
26+
- id: 'get-credentials'
27+
uses: 'google-github-actions/get-gke-credentials@v1'
28+
with:
29+
cluster_name: ${{ secrets.CLUSTER_NAME }}
30+
location: 'us-central1-a'
31+
project_id: ${{ secrets.PROJECT_ID }}

‎apps/apache.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ keywords:
66
- Web-server
77
- Available
88
availableVersions:
9-
- '2.4'
9+
- 'latest'
1010
shortDescription: "The Apache HTTP Server Project"
1111
description: |
1212
The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating systems including UNIX and Windows. The goal of this project is to provide a secure, efficient and extensible server that provides HTTP services in sync with the current HTTP standards.

‎apps/aws-eks.yaml‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎apps/ceph.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
apiVersion: v1
33
kind: App
4-
name: "Ceph"
4+
name: "ceph"
55
keywords:
66
- Storage
77
- Available
88
availableVersions:
9-
- '15.1.1'
9+
- 'latest'
1010
shortDescription: "Ceph is an open-source software storage platform, implements object storage on a single distributed computer cluster, and provides 3in1 interfaces for: object-, block- and file-level storage"
1111
description: |
1212
Ceph is an open-source software storage platform, implements object storage on a single distributed computer cluster, and provides 3in1 interfaces for: object-, block- and file-level storage

‎apps/consul.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
apiVersion: v1
33
kind: App
4-
name: "Consul"
4+
name: "consul"
55
keywords:
66
- Kubernetes
77
- Available
88
availableVersions:
9-
- '1.11.1'
9+
- 'latest'
1010
shortDescription: "Consul is a free and open-source service networking platform developed by HashiCorp."
1111
description: |
1212
Consul uses service identity with automated networking to help organizations securely connect applications running in any environment.

‎apps/elasticsearch.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
apiVersion: v1
33
kind: App
4-
name: "Elasticsearch"
4+
name: "elasticsearch"
55
keywords:
66
- Database
77
- Available
88
availableVersions:
9-
- '6.8'
9+
- 'latest'
1010
shortDescription: Distributed, open source search and analytics engine for all types of data
1111
description: |
1212
Distributed, open source search and analytics engine for all types of data

‎apps/fluentd.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
apiVersion: v1
33
kind: App
4-
name: "Fluentd"
4+
name: "fluentd"
55
keywords:
66
- Observability
77
- Logging
88
- Available
99
availableVersions:
10-
- '1.12.4'
10+
- 'latest'
1111
shortDescription: "Fluentd is an open source data collector for unified logging layer."
1212
description: |
1313
Fluentd is an open source data collector, which lets you unify the data collection and consumption for a better use and understanding of data.

‎apps/haproxy.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
apiVersion: v1
33
kind: App
4-
name: "HAProxy Ingress"
4+
name: "haproxy-ingress"
55
keywords:
66
- Load-balancer
77
- Available
88
availableVersions:
9-
- '2.1'
9+
- 'latest'
1010
- '2.3'
1111
shortDescription: "HAProxy is a free, open source load balancer"
1212
description: |

0 commit comments

Comments
 (0)