Skip to content

Commit a0bc09d

Browse files
committed
Revert "docs: clarify release deployment process and enable manual deploy trigger"
This reverts commit c40374c.
1 parent c40374c commit a0bc09d

File tree

29 files changed

+112
-134
lines changed

29 files changed

+112
-134
lines changed

.github/workflows/deploy.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- main
7-
workflow_dispatch:
87

98
permissions:
109
contents: read

cmd/publisher/commands/init.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ func createServerJSON(
308308
URL: repoURL,
309309
Source: repoSource,
310310
},
311-
Version: version,
311+
Version: version,
312312
Packages: []model.Package{pkg},
313313
}
314314
}

cmd/publisher/commands/logout.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func LogoutCommand() error {
1313
}
1414

1515
tokenPath := filepath.Join(homeDir, TokenFileName)
16-
16+
1717
// Check if token file exists
1818
if _, err := os.Stat(tokenPath); os.IsNotExist(err) {
1919
_, _ = fmt.Fprintln(os.Stdout, "Not logged in")
@@ -30,7 +30,7 @@ func LogoutCommand() error {
3030
".mcpregistry_github_token",
3131
".mcpregistry_registry_token",
3232
}
33-
33+
3434
for _, file := range legacyFiles {
3535
path := filepath.Join(homeDir, file)
3636
if _, err := os.Stat(path); err == nil {
@@ -40,4 +40,4 @@ func LogoutCommand() error {
4040

4141
_, _ = fmt.Fprintln(os.Stdout, "✓ Successfully logged out")
4242
return nil
43-
}
43+
}

cmd/publisher/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ func printUsage() {
6767
_, _ = fmt.Fprintln(os.Stdout, " publish Publish server.json to the registry")
6868
_, _ = fmt.Fprintln(os.Stdout)
6969
_, _ = fmt.Fprintln(os.Stdout, "Use 'mcp-publisher <command> --help' for more information about a command.")
70-
}
70+
}

deploy/pkg/k8s/ingress.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func SetupIngressController(ctx *pulumi.Context, cluster *providers.ProviderInfo
5151
Values: pulumi.Map{
5252
"controller": pulumi.Map{
5353
"service": pulumi.Map{
54-
"type": serviceType,
54+
"type": serviceType,
5555
"annotations": pulumi.Map{},
5656
},
5757
"config": pulumi.Map{

deploy/pkg/providers/gcp/provider.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ type Provider struct{}
2222
// createGCPProvider creates a GCP provider with explicit credentials if configured
2323
func createGCPProvider(ctx *pulumi.Context, name string) (*gcp.Provider, error) {
2424
gcpConf := config.New(ctx, "gcp")
25-
25+
2626
// Get project ID from config
2727
projectID := gcpConf.Get("project")
2828
if projectID == "" {
2929
return nil, fmt.Errorf("GCP project ID not configured. Set gcp:project")
3030
}
31-
31+
3232
// Get region from config or use default
3333
region := gcpConf.Get("region")
3434
if region == "" {
3535
region = "us-central1"
3636
}
37-
37+
3838
// Get credentials from config (base64 encoded service account JSON)
3939
credentials := gcpConf.Get("credentials")
4040
if credentials != "" {
@@ -45,7 +45,7 @@ func createGCPProvider(ctx *pulumi.Context, name string) (*gcp.Provider, error)
4545
}
4646
credentials = string(decodedCreds)
4747
}
48-
48+
4949
// Create a GCP provider with explicit credentials if provided
5050
if credentials != "" {
5151
return gcp.NewProvider(ctx, name, &gcp.ProviderArgs{
@@ -54,7 +54,7 @@ func createGCPProvider(ctx *pulumi.Context, name string) (*gcp.Provider, error)
5454
Credentials: pulumi.String(credentials),
5555
})
5656
}
57-
57+
5858
return nil, nil
5959
}
6060

docs/guides/contributing/releasing.md

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,34 +16,10 @@ The release workflow will automatically:
1616

1717
## After Release
1818

19-
The release workflow will automatically:
20-
- Build and publish Docker images:
19+
- Docker images will be available at:
2120
- `ghcr.io/modelcontextprotocol/registry:latest` - Latest stable release
2221
- `ghcr.io/modelcontextprotocol/registry:vX.Y.Z` - Specific release version
23-
- Binaries will be available on the GitHub release page
24-
25-
**Important:** Creating a release does **not** automatically deploy to production. Production deployments are triggered by pushes to the `main` branch.
26-
27-
## Deploying the Release to Production
28-
29-
After creating a release, you need to ensure production pulls the new `:latest` Docker image. You have two options:
30-
31-
1. **Recommended:** Merge a commit to `main` (e.g., a changelog update or version bump). This will trigger the deployment workflow which will:
32-
- Build and push a new `:main` Docker image
33-
- Deploy to staging
34-
- Deploy to production (which uses `:latest` and will pull the new image)
35-
36-
2. **Manual restart (requires kubectl access):**
37-
```bash
38-
kubectl rollout restart deployment/mcp-registry -n default
39-
```
40-
41-
## Verifying the Deployment
42-
43-
After deployment completes, verify the changes are live:
44-
- Check the deployment workflow succeeded: https://github.com/modelcontextprotocol/registry/actions/workflows/deploy.yml
45-
- Test the API endpoint to confirm schema changes are applied
46-
- Check migrations ran successfully in the pod logs
22+
- Binaries can be downloaded from the GitHub release page
4723

4824
## Docker Image Tags
4925

internal/api/handlers/v0/auth/http_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,7 @@ func TestDefaultHTTPKeyFetcher(t *testing.T) {
387387
}
388388
}
389389

390+
390391
func TestHTTPAuthHandler_Permissions(t *testing.T) {
391392
cfg := &config.Config{
392393
JWTPrivateKey: "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
@@ -737,3 +738,4 @@ func TestHTTPvsDNS_PermissionDifferences(t *testing.T) {
737738
})
738739
}
739740
}
741+

internal/api/handlers/v0/edit.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ func RegisterEditEndpoints(api huma.API, registry service.RegistryService, cfg *
9797

9898
// Prevent undeleting servers - once deleted, they stay deleted
9999
if currentServer.Meta.Official != nil &&
100-
currentServer.Meta.Official.Status == model.StatusDeleted &&
101-
newStatus != model.StatusDeleted {
100+
currentServer.Meta.Official.Status == model.StatusDeleted &&
101+
newStatus != model.StatusDeleted {
102102
return nil, huma.Error400BadRequest("Cannot change status of deleted server. Deleted servers cannot be undeleted.")
103103
}
104104

internal/api/handlers/v0/edit_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,4 +639,4 @@ func TestEditServerEndpointEdgeCases(t *testing.T) {
639639
// Helper function
640640
func stringPtr(s string) *string {
641641
return &s
642-
}
642+
}

0 commit comments

Comments
 (0)