Skip to content
This repository has been archived by the owner on Apr 19, 2024. It is now read-only.

Commit

Permalink
Merge pull request #114 from mailgun/thrawn/develop
Browse files Browse the repository at this point in the history
Moved official gubernator container to ghcr.io
  • Loading branch information
thrawn01 authored Nov 2, 2021
2 parents 4146057 + c403609 commit 574d222
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 22 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [2.0.0-rc.11] - 2021-11-01
## Changes
* Moved official gubernator container to ghcr.io

## [2.0.0-rc.10] - 2021-10-25
## Changes
* Fixed async send when sending multiple rate limits to other nodes
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ test:
go test ./... -v -race -p=1 -count=1

docker:
docker build --build-arg VERSION=$(VERSION) -t thrawn01/gubernator:$(VERSION) .
docker tag thrawn01/gubernator:$(VERSION) thrawn01/gubernator:latest
docker build --build-arg VERSION=$(VERSION) -t ghcr.io/mailgun/gubernator:$(VERSION) .
docker tag ghcr.io/mailgun/gubernator:$(VERSION) ghcr.io/mailgun/gubernator:latest

release:
GOOS=darwin GOARCH=amd64 go build -ldflags $(LDFLAGS) -o gubernator.darwin ./cmd/gubernator/main.go
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ simplest way to try gubernator out.
##### Docker with existing etcd cluster
```bash
$ docker run -p 8081:81 -p 9080:80 -e GUBER_ETCD_ENDPOINTS=etcd1:2379,etcd2:2379 \
thrawn01/gubernator:latest
ghcr.io/mailgun/gubernator:latest

# Hit the HTTP API at localhost:9080
$ curl http://localhost:9080/v1/HealthCheck
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ gubernator:
replicaCount: 4

image:
repository: thrawn01/gubernator
repository: ghcr.io/mailgun/gubernator
pullPolicy: IfNotPresent

# By default tag is overriding appVersion from .Chart.yaml
Expand Down
2 changes: 1 addition & 1 deletion dns.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ type DNSPoolConfig struct {
// (Required) The FQDN that should resolve to gubernator instance ip addresses
FQDN string

// (Required) Filesystem path to "/etc/resolv.conf", override for testing, @thrawn01 insisted
// (Required) Filesystem path to "/etc/resolv.conf", override for testing
ResolvConf string

// (Required) Own GRPC address
Expand Down
3 changes: 1 addition & 2 deletions docker-compose-dns.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ version: "3.7"

services:
gubernator:
# FIXME update after merge when new image is built from thrawn01 repo
image: dimaqq/gubernator:test
image: ghcr.io/mailgun/gubernator:latest
environment:
GUBER_PEER_DISCOVERY_TYPE: dns
# Docker will resolve replica addresses by the service name, `gubernator`
Expand Down
8 changes: 4 additions & 4 deletions docker-compose-etcd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:
- "2379:2379"

gubernator-1:
image: thrawn01/gubernator:latest
image: ghcr.io/mailgun/gubernator:latest
command: "/gubernator"
environment:
# The address GRPC requests will listen on
Expand All @@ -37,7 +37,7 @@ services:
- "9080:80"

gubernator-2:
image: thrawn01/gubernator:latest
image: ghcr.io/mailgun/gubernator:latest
command: "/gubernator"
environment:
# The address GRPC requests will listen on
Expand All @@ -58,7 +58,7 @@ services:
- "9180:80"

gubernator-3:
image: thrawn01/gubernator:latest
image: ghcr.io/mailgun/gubernator:latest
command: "/gubernator"
environment:
# The address GRPC requests will listen on
Expand All @@ -79,7 +79,7 @@ services:
- "9280:80"

gubernator-4:
image: thrawn01/gubernator:latest
image: ghcr.io/mailgun/gubernator:latest
command: "/gubernator"
environment:
- GUBER_DEBUG=true
Expand Down
8 changes: 4 additions & 4 deletions docker-compose-tls.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3'
services:
gubernator-1:
image: thrawn01/gubernator:latest
image: ghcr.io/mailgun/gubernator:latest
command: "/gubernator"
environment:
# Basic member-list config
Expand All @@ -21,7 +21,7 @@ services:
- ${PWD}/certs:/etc/tls

gubernator-2:
image: thrawn01/gubernator:latest
image: ghcr.io/mailgun/gubernator:latest
command: "/gubernator"
environment:
# Basic member-list config
Expand All @@ -41,7 +41,7 @@ services:
- ${PWD}/certs:/etc/tls

gubernator-3:
image: thrawn01/gubernator:latest
image: ghcr.io/mailgun/gubernator:latest
command: "/gubernator"
environment:
# Basic member-list config
Expand All @@ -61,7 +61,7 @@ services:
- ${PWD}/certs:/etc/tls

gubernator-4:
image: thrawn01/gubernator:latest
image: ghcr.io/mailgun/gubernator:latest
command: "/gubernator"
environment:
# Basic member-list config
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3'
services:
gubernator-1:
image: thrawn01/gubernator:latest
image: ghcr.io/mailgun/gubernator:latest
command: "/gubernator"
environment:
# The address GRPC requests will listen on
Expand All @@ -18,7 +18,7 @@ services:
- "9080:80"

gubernator-2:
image: thrawn01/gubernator:latest
image: ghcr.io/mailgun/gubernator:latest
command: "/gubernator"
environment:
# The address GRPC requests will listen on
Expand All @@ -35,7 +35,7 @@ services:
- "9180:80"

gubernator-3:
image: thrawn01/gubernator:latest
image: ghcr.io/mailgun/gubernator:latest
command: "/gubernator"
environment:
# The address GRPC requests will listen on
Expand All @@ -52,7 +52,7 @@ services:
- "9280:80"

gubernator-4:
image: thrawn01/gubernator:latest
image: ghcr.io/mailgun/gubernator:latest
command: "/gubernator"
environment:
- GUBER_DEBUG=true
Expand Down
2 changes: 1 addition & 1 deletion examples/aws-ecs-service-discovery-deployment/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Real gubernator would be accessible in `app.gubernator.example.com`
| <a name="input_dns_namespace"></a> [dns\_namespace](#input\_dns\_namespace) | The domain name the service should run. Your Gubernator instances will be available at `app.<your inputted fqdn>.` | `string` | n/a | yes |
| <a name="input_gubernator_config"></a> [gubernator\_config](#input\_gubernator\_config) | Map of ECS Configuration for gubernator service. map(cpu, memory) | `any` | <pre>{<br> "cpu": 256,<br> "memory": 512<br>}</pre> | no |
| <a name="input_gubernator_debug_mode"></a> [gubernator\_debug\_mode](#input\_gubernator\_debug\_mode) | Enable GUBER\_DEBUG env flag | `bool` | `false` | no |
| <a name="input_gubernator_repository"></a> [gubernator\_repository](#input\_gubernator\_repository) | Gubernator Docker Repository. e.g. thrawn01/gubernator | `string` | n/a | yes |
| <a name="input_gubernator_repository"></a> [gubernator\_repository](#input\_gubernator\_repository) | Gubernator Docker Repository. e.g. ghcr.io/mailgun/gubernator | `string` | n/a | yes |
| <a name="input_gubernator_version"></a> [gubernator\_version](#input\_gubernator\_version) | Gubernator docker tag to use | `string` | n/a | yes |
| <a name="input_prefix"></a> [prefix](#input\_prefix) | Prefix of created resources | `string` | n/a | yes |
| <a name="input_vpc_cidr"></a> [vpc\_cidr](#input\_vpc\_cidr) | IPv4 CIDR Notation for VPC IP range. e.g. 10.3.0.0/16 | `string` | n/a | yes |
Expand Down
2 changes: 1 addition & 1 deletion examples/aws-ecs-service-discovery-deployment/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ variable "dns_namespace" {

variable "gubernator_repository" {
type = string
description = "Gubernator Docker Repository. e.g. thrawn01/gubernator"
description = "Gubernator Docker Repository. e.g. ghcr.io/mailgun/gubernator"
}

variable "gubernator_version" {
Expand Down
2 changes: 1 addition & 1 deletion k8s-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
serviceAccountName: gubernator
containers:
- image: thrawn01/gubernator:latest
- image: ghcr.io/mailgun/gubernator:latest
imagePullPolicy: IfNotPresent
ports:
- name: grpc-port
Expand Down

0 comments on commit 574d222

Please sign in to comment.