[pull] main from cnoe-io:main

.devcontainer/postCreateCommand.sh

@@ -20,3 +20,4 @@ mkdir $HOME/.kube
 echo "source <(kubectl completion bash)" >> $HOME/.bashrc
 echo "alias k=kubectl" >> $HOME/.bashrc
 echo "complete -F __start_kubectl k" >> $HOME/.bashrc
+docker network create -d=bridge -o com.docker.network.bridge.enable_ip_masquerade=true -o com.docker.network.driver.mtu=1500 --subnet fc00:f853:ccd:e793::/64 kind

.github/workflows/e2e.yaml

@@ -8,15 +8,39 @@ on:
       - '**.go'
       - 'go.sum'
       - 'go.mod'
+  repository_dispatch:
+    types: [e2e-command]
+
 jobs:
   e2e:
     runs-on: ubuntu-22.04
+    if: ${{ github.event.ref != '' }}
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        with:
+          fetch-depth: 0
       - name: Setup Go
         uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
-          go-version: '1.21'
+          go-version: '1.22'
       - name: Run tests
         run: |
           make e2e
+  # invoked by slash command workflow
+  e2e-slash-command:
+    runs-on: ubuntu-22.04
+    if: ${{ github.event.action == 'e2e-command' }}
+    steps:
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        with:
+          repository: ${{ github.event.client_payload.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.client_payload.pull_request.head.ref }}
+          fetch-depth: 0
+      - name: Setup Go
+        uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+        with:
+          go-version: '1.22'
+      - name: Run tests
+        run: |
+          make e2e
+

.github/workflows/pr.yaml

@@ -12,8 +12,13 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
-          go-version: '1.21'
+          go-version: '1.22'
       - name: Run tests
         run: |
           make build
+          if [[ -n $(git status --porcelain) ]]; then
+            echo "git is in dirty state";
+            git status --porcelain=2 --branch
+            exit 1
+          fi
           make test

.github/workflows/release.yaml

@@ -18,7 +18,7 @@ jobs:
       - run: git fetch --force --tags
       - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
-          go-version: '1.21.0'
+          go-version: '1.22'
       - name: Set GORELEASER_PREVIOUS_TAG in actual release
         if: ${{ !contains(github.ref, '-nightly') }}
         # find previous tag by filtering out nightly tags and choosing the
@@ -30,6 +30,12 @@ jobs:
       - name: build
         run: |
           OUT_FILE=/tmp/idpbuilder make build
+      - name: Generate a homebrew tap update token
+        id: generate-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ vars.CNOE_HOMEBREW_APP_ID }}
+          private-key: ${{ secrets.CNOE_HOMEBREW_PRIVATE_KEY }}
       - name: GoReleaser
         uses: goreleaser/goreleaser-action@7ec5c2b0c6cdda6e8bbb49444bc797dd33d74dd8 # v5.0.0
         id: run-goreleaser
@@ -38,4 +44,5 @@ jobs:
           args: release --clean --timeout 30m
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          HOMEBREW_TOKEN: ${{ steps.generate-token.outputs.token }}
           GORELEASER_CURRENT_TAG: ${{ github.ref_name }}

.github/workflows/slash-commands.yaml

@@ -0,0 +1,24 @@
+name: slash-commands
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  slash_command_dispatch:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Generate a token
+        id: generate-token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ vars.CNOE_GH_WORKFLOW_TOKEN_APP_ID }}
+          private-key: ${{ secrets.CNOE_GH_WORKFLOW_TOKEN_PRIVATE_KEY }}
+      - name: Slash Command Dispatch
+        uses: peter-evans/slash-command-dispatch@v4
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
+          commands: |
+            e2e
+          permission: write
+          issue-type: pull-request

.goreleaser.yaml

@@ -3,6 +3,10 @@ project_name: idpbuilder
 before:
   hooks:
     - go mod tidy
+release:
+  # Mark nightly build as prerelease based on tag
+  prerelease: '{{ contains .Tag "-nightly" }}'
+
 builds:
   - env:
       - CGO_ENABLED=0
@@ -22,14 +26,29 @@ builds:
     ignore:
       - goos: linux
         goarch: '386'
+brews:
+  - name: idpbuilder
+    homepage: "https://cnoe.io"
+    repository:
+      owner: cnoe-io
+      name: homebrew-tap
+      token: "{{ .Env.HOMEBREW_TOKEN }}"
+    commit_author:
+      name: "CNOEAutomation"
+      email: "[email protected]"
+    directory: formula
+    install: |
+      bin.install "idpbuilder"
+    test: |
+      system "#{bin}/idpbuilder --version"
 archives:
   - format: tar.gz
     name_template: >-
       {{ .ProjectName }}-{{ .Os }}-{{ .Arch }}
 checksum:
   name_template: 'checksums.txt'
 snapshot:
-  name_template: "{{ incpatch .Version }}-next"
+  version_template: "{{ incpatch .Version }}-next"
 changelog:
   sort: asc
   filters:

Makefile

@@ -25,7 +25,7 @@ HELM_TGZ ?= $(LOCALBIN)/helm.tar.gz
 HELM ?= $(LOCALBIN)/helm
 
 ## Tool Versions
-CONTROLLER_TOOLS_VERSION ?= v0.14.0
+CONTROLLER_TOOLS_VERSION ?= v0.15.0
 
 .PHONY: fmt
 fmt: ## Run go fmt against code.

README.md

@@ -7,8 +7,6 @@
 
 Internal development platform binary launcher.
 
-> **WORK IN PROGRESS**: This tool is in a pre-release stage and is under active development.
-
 ## About
 
 Spin up a complete internal developer platform using industry standard technologies like Kubernetes, Argo, and backstage with only Docker required as a dependency.
@@ -20,7 +18,25 @@ This can be useful in several ways:
 
 ## Getting Started
 
-Checkout our [documentation website](https://cnoe.io/docs/reference-implementation/installations/idpbuilder) for getting started with idpbuilder.
+The easiest way to get started is to grab the idpbuilder binary for your platform and run it. You can visit our [nightly releases](https://github.com/cnoe-io/idpbuilder/releases/latest) page to download the version for your system, or run the following commands:
+
+```bash
+arch=$(if [[ "$(uname -m)" == "x86_64" ]]; then echo "amd64"; else uname -m; fi)
+os=$(uname -s | tr '[:upper:]' '[:lower:]')
+
+
+idpbuilder_latest_tag=$(curl --silent "https://api.github.com/repos/cnoe-io/idpbuilder/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
+curl -LO  https://github.com/cnoe-io/idpbuilder/releases/download/$idpbuilder_latest_tag/idpbuilder-$os-$arch.tar.gz
+tar xvzf idpbuilder-$os-$arch.tar.gz
+```
+
+You can then run idpbuilder with the create argument to spin up your CNOE IDP:
+
+```bash
+./idpbuilder create
+```
+
+For more detailed information, checkout our [documentation website](https://cnoe.io/docs/reference-implementation/installations/idpbuilder) on getting started with idpbuilder.
 
 ## Community
 

api/v1alpha1/localbuild_types.go

@@ -14,9 +14,12 @@ const (
 	CliStartTimeAnnotation = "cnoe.io/cli-start-time"
 	FieldManager           = "idpbuilder"
 	// If GetSecretLabelKey is set to GetSecretLabelValue on a kubernetes secret, secret key and values can be used by the get command.
-	CLISecretLabelKey   = "cnoe.io/cli-secret"
-	CLISecretLabelValue = "true"
-	PackageNameLabelKey = "cnoe.io/package-name"
+	CLISecretLabelKey      = "cnoe.io/cli-secret"
+	CLISecretLabelValue    = "true"
+	PackageNameLabelKey    = "cnoe.io/package-name"
+	PackageTypeLabelKey    = "cnoe.io/package-type"
+	PackageTypeLabelCore   = "core"
+	PackageTypeLabelCustom = "custom"
 
 	ArgoCDPackageName       = "argocd"
 	GiteaPackageName        = "gitea"
@@ -45,8 +48,20 @@ type PackageConfigsSpec struct {
 	CorePackageCustomization map[string]PackageCustomization `json:"packageCustomization,omitempty"`
 }
 
+// BuildCustomizationSpec fields cannot change once a cluster is created
+type BuildCustomizationSpec struct {
+	Protocol       string `json:"protocol,omitempty"`
+	Host           string `json:"host,omitempty"`
+	IngressHost    string `json:"ingressHost,omitempty"`
+	Port           string `json:"port,omitempty"`
+	UsePathRouting bool   `json:"usePathRouting,omitempty"`
+	SelfSignedCert string `json:"selfSignedCert,omitempty"`
+	StaticPassword bool   `json:"staticPassword,omitempty"`
+}
+
 type LocalbuildSpec struct {
-	PackageConfigs PackageConfigsSpec `json:"packageConfigs,omitempty"`
+	PackageConfigs     PackageConfigsSpec     `json:"packageConfigs,omitempty"`
+	BuildCustomization BuildCustomizationSpec `json:"buildCustomization,omitempty"`
 }
 
 // PackageCustomization defines how packages are customized