Merging Gimletd with Dashboard (#423)

Co-authored-by: Ádám <[email protected]>

Author: laszlocph

.github/workflows/build.yml

@@ -57,24 +57,6 @@ jobs:
       env:
         VERSION: "ci-build"
 
-  gimletd:
-    name: 🏗️ Build GimletD
-    runs-on: ubuntu-latest
-    needs: test
-    steps:
-    - name: Set up Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.19
-    - name: ⬇️ Check out code into the Go module directory
-      uses: actions/checkout@v1
-      with:
-        fetch-depth: 5
-    - name: 🏗️ Build GimletD
-      run: make build-gimletd
-      env:
-        VERSION: "ci-build"
-
   agent:
     name: 🏗️ Build Agent
     runs-on: ubuntu-latest

.github/workflows/preview.yml

@@ -1,63 +1,63 @@
-name: 🧪 Preview
-on:
-  push:
-    branches-ignore:
-      - "main"
+# name: 🧪 Preview
+# on:
+#   push:
+#     branches-ignore:
+#       - "main"
 
-jobs:
-  preview-build:
-    name: 🧪 Preview
-    runs-on: ubuntu-latest
-    steps:
-      - name: 🛑 Cancel Previous Runs
-        uses: styfle/[email protected]
-        with:
-          access_token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Set up Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.19
-      - name: ⬇️ Check out code into the Go module directory
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 5
-      - name: 🏗️ Build dashboard frontend
-        run: make build-dashboard-frontend
-      - name: Dist
-        run: make dist-dashboard
-        env:
-          VERSION: ${{ github.sha }}
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.PAT }} # `PAT` is a secret that contains your Personal Access Token with `write:packages` scope
-      - name: Build and push Dashboard image
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: docker/dashboard/Dockerfile
-          platforms: linux/amd64
-          push: true
-          tags: |
-            ghcr.io/gimlet-io/gimlet-dashboard:${{ github.sha }}
-      - name: Build and push Agent image
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: docker/dashboard/Dockerfile.agent
-          platforms: linux/amd64
-          push: true
-          tags: |
-            ghcr.io/gimlet-io/gimlet-dashboard:agent-${{ github.sha }}
-      - name: Shipping release artifact
-        id: shipping
-        uses: gimlet-io/[email protected]
-        env:
-          GIMLET_SERVER: ${{ secrets.GIMLET_SERVER }}
-          GIMLET_TOKEN: ${{ secrets.GIMLET_TOKEN }}
-      - name: Artifact ID
-        run: echo "Artifact ID is ${{ steps.shipping.outputs.artifact-id }}"
+# jobs:
+#   preview-build:
+#     name: 🧪 Preview
+#     runs-on: ubuntu-latest
+#     steps:
+#       - name: 🛑 Cancel Previous Runs
+#         uses: styfle/[email protected]
+#         with:
+#           access_token: ${{ secrets.GITHUB_TOKEN }}
+#       - name: Set up Go
+#         uses: actions/setup-go@v2
+#         with:
+#           go-version: 1.19
+#       - name: ⬇️ Check out code into the Go module directory
+#         uses: actions/checkout@v2
+#         with:
+#           fetch-depth: 5
+#       - name: 🏗️ Build dashboard frontend
+#         run: make build-dashboard-frontend
+#       - name: Dist
+#         run: make dist-dashboard
+#         env:
+#           VERSION: ${{ github.sha }}
+#       - name: Set up Docker Buildx
+#         uses: docker/setup-buildx-action@v1
+#       - name: Login to GitHub Container Registry
+#         uses: docker/login-action@v1
+#         with:
+#           registry: ghcr.io
+#           username: ${{ github.repository_owner }}
+#           password: ${{ secrets.PAT }} # `PAT` is a secret that contains your Personal Access Token with `write:packages` scope
+#       - name: Build and push Dashboard image
+#         uses: docker/build-push-action@v2
+#         with:
+#           context: .
+#           file: docker/dashboard/Dockerfile
+#           platforms: linux/amd64
+#           push: true
+#           tags: |
+#             ghcr.io/gimlet-io/gimlet-dashboard:${{ github.sha }}
+#       - name: Build and push Agent image
+#         uses: docker/build-push-action@v2
+#         with:
+#           context: .
+#           file: docker/dashboard/Dockerfile.agent
+#           platforms: linux/amd64
+#           push: true
+#           tags: |
+#             ghcr.io/gimlet-io/gimlet-dashboard:agent-${{ github.sha }}
+#       - name: Shipping release artifact
+#         id: shipping
+#         uses: gimlet-io/[email protected]
+#         env:
+#           GIMLET_SERVER: ${{ secrets.GIMLET_SERVER }}
+#           GIMLET_TOKEN: ${{ secrets.GIMLET_TOKEN }}
+#       - name: Artifact ID
+#         run: echo "Artifact ID is ${{ steps.shipping.outputs.artifact-id }}"

.github/workflows/publish-gimletd.yml

@@ -38,7 +38,6 @@ fixtures/k3s/kubeconfig.yaml
 
 .vscode/settings.json
 
-gimletd.sqlite
 gimlet-dashboard.sqlite
 
 __debug_bin

.gitignore

@@ -39,14 +39,6 @@
             ],
             "envFile": "${workspaceFolder}/.env"
         },
-        {
-            "name": "GimletD",
-            "type": "go",
-            "request": "launch",
-            "mode": "auto",
-            "program": "cmd/gimletd",
-            "envFile": "${workspaceFolder}/.env"
-        },
         {
             "name": "Gimlet Dashboard",
             "type": "go",

.vscode/launch.json

@@ -3,7 +3,6 @@ LDFLAGS = '-s -w -extldflags "-static" -X github.com/gimlet-io/gimlet-cli/pkg/ve
 
 .PHONY: format test 
 .PHONY: build-cli dist-cli build-cli-frontend build-stack-frontend fast-dist-cli
-.PHONY: build-gimletd dist-gilmetd
 .PHONY: build-installer dist-installer
 
 format:
@@ -32,26 +31,19 @@ test-with-postgres:
 	docker stop testpostgres || true
 	docker run --rm -e POSTGRES_PASSWORD=mysecretpassword -p 5432:5432 --name testpostgres -d postgres
 
-	DATABASE_DRIVER=postgres DATABASE_CONFIG=postgres://postgres:[email protected]:5432/postgres?sslmode=disable go test -count=1 -timeout 60s github.com/gimlet-io/gimlet-cli/pkg/gimletd/store/...
 	DATABASE_DRIVER=postgres DATABASE_CONFIG=postgres://postgres:[email protected]:5432/postgres?sslmode=disable go test -count=1 -timeout 60s github.com/gimlet-io/gimlet-cli/pkg/dashboard/store/...
 
 	docker stop testpostgres || true
 
 build-cli:
 	CGO_ENABLED=0 go build -ldflags $(LDFLAGS) -o build/gimlet github.com/gimlet-io/gimlet-cli/cmd/cli
-build-gimletd:
-	go build -ldflags $(LDFLAGS) -o build/gimletd github.com/gimlet-io/gimlet-cli/cmd/gimletd
 build-agent:
 	CGO_ENABLED=0 go build -ldflags $(LDFLAGS) -o build/gimlet-agent github.com/gimlet-io/gimlet-cli/cmd/agent
 build-dashboard:
 	CGO_ENABLED=0 go build -ldflags $(LDFLAGS) -o build/gimlet-dashboard github.com/gimlet-io/gimlet-cli/cmd/dashboard
 build-installer:
 	CGO_ENABLED=0 go build -ldflags $(LDFLAGS) -o build/gimlet-installer github.com/gimlet-io/gimlet-cli/cmd/installer
 
-dist-gimletd:
-	mkdir -p bin
-	GOOS=linux GOARCH=amd64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/linux/amd64/gimletd github.com/gimlet-io/gimlet-cli/cmd/gimletd
-	GOOS=linux GOARCH=arm64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/linux/arm64/gimletd github.com/gimlet-io/gimlet-cli/cmd/gimletd
 dist-dashboard:
 	mkdir -p bin
 	GOOS=linux GOARCH=amd64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/linux/amd64/gimlet-dashboard github.com/gimlet-io/gimlet-cli/cmd/dashboard

Makefile

@@ -11,6 +11,19 @@
   <img alt="Gimlet" src="https://github.com/gimlet-io/gimlet-documentation/blob/main/public/logo.svg" width="200">
 </picture>
 
+
+##
+
+One off SQLs:
+
+```
+update users set admin=true where login='laszlocph';
+```
+
+- gitopsRepos and gitopsRepo env vars support needs to be done: it should bootstrap an env entry, or we deprecate it
+
+##
+
 ## Overview
 
 With Gimlet, you can build and run your developer platform on Kubernetes.

README.md

@@ -36,7 +36,13 @@ func defaults(c *Config) {
 		c.Chart.Repo = "https://chart.onechart.dev"
 	}
 	if c.Chart.Version == "" {
-		c.Chart.Version = "0.38.0"
+		c.Chart.Version = "0.41.0"
+	}
+	if c.GitSSHAddressFormat == "" {
+		c.GitSSHAddressFormat = "[email protected]:%s.git"
+	}
+	if c.ReleaseStats == "" {
+		c.ReleaseStats = "disabled"
 	}
 }
 
@@ -53,14 +59,25 @@ type Config struct {
 	Github                  Github
 	Gitlab                  Gitlab
 	Database                Database
-	GimletD                 GimletD
 	Notifications           Notifications
 	Chart                   Chart
 	RepoCachePath           string `envconfig:"REPO_CACHE_PATH"`
 	WebhookSecret           string `envconfig:"WEBHOOK_SECRET"`
 	ReleaseHistorySinceDays int    `envconfig:"RELEASE_HISTORY_SINCE_DAYS"`
 	BootstrapEnv            string `envconfig:"BOOTSTRAP_ENV"`
 	UserflowToken           string `envconfig:"USERFLOW_TOKEN"`
+
+	PrintAdminToken bool   `envconfig:"PRINT_ADMIN_TOKEN"`
+	AdminToken      string `envconfig:"ADMIN_TOKEN"`
+
+	// Deprecated, use BootstrapEnv instead
+	GitopsRepo string `envconfig:"GITOPS_REPO"`
+	// Deprecated, use BootstrapEnv instead
+	GitopsRepos string `envconfig:"GITOPS_REPOS"`
+
+	GitopsRepoDeployKeyPath string `envconfig:"GITOPS_REPO_DEPLOY_KEY_PATH"`
+	GitSSHAddressFormat     string `envconfig:"GIT_SSH_ADDRESS_FORMAT"`
+	ReleaseStats            string `envconfig:"RELEASE_STATS"`
 }
 
 // Logging provides the logging configuration.
@@ -101,18 +118,20 @@ type Database struct {
 	Config string `envconfig:"DATABASE_CONFIG"`
 }
 
-type GimletD struct {
-	URL   string `envconfig:"GIMLETD_URL"`
-	TOKEN string `envconfig:"GIMLETD_TOKEN"`
-}
-
 type Notifications struct {
 	Provider       string `envconfig:"NOTIFICATIONS_PROVIDER"`
 	Token          string `envconfig:"NOTIFICATIONS_TOKEN"`
 	DefaultChannel string `envconfig:"NOTIFICATIONS_DEFAULT_CHANNEL"`
 	ChannelMapping string `envconfig:"NOTIFICATIONS_CHANNEL_MAPPING"`
 }
 
+type GitopsRepoConfig struct {
+	Env           string
+	RepoPerEnv    bool
+	GitopsRepo    string
+	DeployKeyPath string
+}
+
 func (c *Config) IsGithub() bool {
 	return c.Github.AppID != ""
 }