Skip to content

Commit 8fd8fe0

Browse files
Merge #92
92: Remove GCP r=brunoocasali a=curquiza I remove everything, and if we want to roll-back, we will have this PR as reference. ⚠️ `@brunoocasali` ensure I indeed remove everything to keep this PR as a reference if we want to put GCP again 😊 Co-authored-by: curquiza <clementine@meilisearch.com>
2 parents f321574 + a2baa66 commit 8fd8fe0

File tree

5 files changed

+5
-76
lines changed

5 files changed

+5
-76
lines changed

.github/workflows/manual_publish.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ on:
99
options:
1010
- "amazon-ebs"
1111
- "digitalocean"
12-
- "googlecompute"
1312
required: true
1413

1514
env:
@@ -25,17 +24,13 @@ jobs:
2524
steps:
2625
- uses: actions/checkout@v4
2726

28-
- uses: 'google-github-actions/auth@v2'
29-
with:
30-
credentials_json: '${{ secrets.GOOGLE_CREDENTIALS }}'
31-
3227
- name: Setup `packer`
3328
uses: hashicorp/setup-packer@main
3429
with:
3530
version: ${{ env.PACKER_VERSION }}
3631

3732
- name: Run `packer init`
3833
run: "packer init ."
39-
34+
4035
- name: Run `packer build`
4136
run: "packer build -only ${{ github.event.inputs.provider }}.debian ."

.github/workflows/publish.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,16 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v4
2020

21-
- uses: 'google-github-actions/auth@v2'
22-
with:
23-
credentials_json: '${{ secrets.GOOGLE_CREDENTIALS }}'
24-
2521
- name: Setup `packer`
2622
uses: hashicorp/setup-packer@main
2723
with:
2824
version: ${{ env.PACKER_VERSION }}
2925

3026
- name: Run `packer init`
3127
run: "packer init ."
32-
28+
3329
- name: Run `packer validate`
3430
run: "packer validate ."
35-
31+
3632
- name: Run `packer build`
3733
run: "packer build ."

CONTRIBUTING.md

-31
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,6 @@ Before running any script, make sure to [obtain a DigitalOcean API Token](https:
4242
```bash
4343
export DIGITALOCEAN_ACCESS_TOKEN="XxXxxxxXXxxXXxxXXxxxXXXxXxXxXX"
4444
```
45-
- GCP:
46-
Obtain your [GCP credentials](https://cloud.google.com/docs/authentication/getting-started) and set it in your environment:
47-
```bash
48-
export GOOGLE_APPLICATION_CREDENTIALS="path_to_your_creadential_file.json"
49-
```
50-
3. Download and install Packer plugins
51-
``` bash
52-
packer init .
53-
```
5445

5546
### Tests and Linter <!-- omit in toc -->
5647

@@ -190,21 +181,6 @@ In the [DigitalOcean Vendor Portal](https://cloud.digitalocean.com/vendorportal)
190181

191182
This will start the DigitalOcean review process. This can take a few days, and the result will be notified via email to the DigitalOcean admin account. If the image is accepted, it will be automatically published on the Marketplace. If it is rejected, an email explaining the problems will be sent to administrators.
192183

193-
### Create the Virtual disk (VMDK) for GCP <!-- omit in TOC -->
194-
195-
In the [GCP console](https://console.cloud.google.com/)
196-
197-
- Ensure you selected the `MeiliSearchImage` project in the GCP console
198-
- Navigate to "Compute Engine" -> "Images"
199-
- Click on the image you just created `meilisearch-X-X-X-debian-X`
200-
- Click on `EXPORT`
201-
- On: "Export format" choose `VMDK`
202-
- On: "Path*" click on `BROWSE` and select `meilisearch-image`
203-
- Validate it by clicking on the SELECT button at the bottom
204-
- Finally click on the EXPORT button at the buttom
205-
206-
The new image should appear in the list. It might take a few minutes.
207-
208184
## Cleaning old images (Optional)
209185

210186
You may want to clean up the old images.
@@ -218,13 +194,6 @@ However if you have made a copy so that it is available from the dashboard:
218194
- Go to Images -> Manage (left side bar)
219195
- On the list of image, for the chosen image, click on `More` -> `Delete`
220196

221-
### GCP
222-
223-
- Go to Cloud-storage: [GCP console](https://console.cloud.google.com/) > Cloud Storage
224-
- Click on `meilisearch-image``. You will have access to a list of all vdmk images
225-
- Select the images you wish to delete
226-
- Click on DELETE (at top of the list)
227-
228197
### AWS
229198

230199
- Download this [repository](https://github.com/meilisearch/meilisearch-aws) (don't worry it's an archived repository but we can still use the script)

README.md

+2-12
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ These Packer build configurations are used primarily by the Meilisearch integrat
5050
|----------|
5151
| AWS |
5252
| DigitalOcean |
53-
| GCP |
53+
| GCP - ⚠️ Deprecated, no more image published anymore |
5454

5555
## 📖 Documentation
5656

@@ -62,7 +62,6 @@ You need the following to run the template:
6262
1. The [Packer CLI v1.8.6+](https://developer.hashicorp.com/packer/downloads) installed locally
6363
2. Obtain your [AWS access keys](https://docs.aws.amazon.com/keyspaces/latest/devguide/access.credentials.html)
6464
3. Obtain your [DigitalOcean API Token](https://www.digitalocean.com/docs/apis-clis/api/create-personal-access-token/)
65-
4. Obtain your [GCP credentials](https://cloud.google.com/docs/authentication/application-default-credentials)
6665

6766
## 🔑 Set your credentials
6867

@@ -75,10 +74,6 @@ export AWS_SECRET_ACCESS_KEY="YOUR_SECRET_KEY"
7574
```bash
7675
export DIGITALOCEAN_TOKEN="XxXxxxxXXxxXXxxXXxxxXXXxXxXxXX"
7776
```
78-
- GCP
79-
```bash
80-
export GOOGLE_APPLICATION_CREDENTIALS="path_to_your_creadential_file.json"
81-
```
8277

8378
## 🚀 Getting Started
8479

@@ -109,14 +104,9 @@ packer build -only 'amazon-ebs.*' .
109104
packer build -only 'digitalocean.*' .
110105
```
111106

112-
``` bash
113-
packer build -only 'googlecompute.*' .
114-
```
115-
116-
## 🚀 How to deploy Meilisearch
107+
## 🚀 How to deploy Meilisearch
117108

118109
If you want to learn how to deploy a Meilisearch instance on DigitalOcean visit the dedicated page of our documentation:
119110
- [AWS](https://www.meilisearch.com/docs/guides/deployment/aws)
120111
- [DigitalOcean](https://www.meilisearch.com/docs/guides/deployment/digitalocean)
121-
- [GCP](https://www.meilisearch.com/docs/guides/deployment/gcp)
122112

meilisearch.pkr.hcl

-21
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ packer {
2323
version = "~> 1"
2424
source = "github.com/digitalocean/digitalocean"
2525
}
26-
googlecompute = {
27-
version = "~> 1"
28-
source = "github.com/hashicorp/googlecompute"
29-
}
3026
}
3127
}
3228

@@ -88,19 +84,10 @@ source "digitalocean" "debian" {
8884
]
8985
}
9086

91-
source "googlecompute" "debian" {
92-
image_name = lower(replace("${var.image_name}-${var.meilisearch_version}-${var.base-os-version}", ".", "-"))
93-
project_id = "meilisearchimage"
94-
source_image_family = "debian-11"
95-
ssh_username = "packer"
96-
zone = "us-central1-a"
97-
}
98-
9987
build {
10088
sources = [
10189
"source.amazon-ebs.debian",
10290
"source.digitalocean.debian",
103-
"source.googlecompute.debian"
10491
]
10592

10693
provisioner "file" {
@@ -167,12 +154,4 @@ build {
167154
only = ["digitalocean.debian"]
168155
}
169156

170-
// This prevents image creation failure when Install guest packages is checked.
171-
provisioner "shell" {
172-
execute_command = "echo 'packer' | sudo -S sh -c '{{ .Vars }} {{ .Path }}'"
173-
inline = [
174-
"sudo apt-get remove google-cloud-cli -y",
175-
]
176-
only = ["googlecompute.debian"]
177-
}
178157
}

0 commit comments

Comments
 (0)