Merge branch 'dev'

.circleci/config.yml

@@ -217,6 +217,7 @@ jobs:
           name: Create Destinations and helm install
           command: |
             make distribution
+            make gitea-cli
             ./charts/scripts/generate-templates-and-crds ./distribution/kratix.yaml
             export DOCKER_BUILDKIT=1
 
@@ -226,12 +227,19 @@ jobs:
             make build-and-load-kratix
             make build-and-load-worker-creator
             helm install kratix charts/kratix/ -f hack/platform/helm-values-gitea.yaml
+
+            source ./scripts/utils.sh
+            generate_gitea_credentials "kind-platform"
+
             kubectl --context kind-platform apply --filename "hack/platform/gitea-install.yaml"
             kubectl --context kind-platform wait --for=condition=Ready --timeout=300s -n gitea pod -l app.kubernetes.io/instance=gitea
 
             # setup worker cluster and register as destination
             kind create cluster --image kindest/node:v1.27.3 --name worker --config hack/destination/kind-worker-config.yaml
             helm install kratix-destination charts/kratix-destination/ -f hack/destination/helm-values-gitea.yaml
+
+            copy_gitea_credentials "kind-platform" "kind-worker"
+
             kubectl --context kind-worker wait --for=condition=Ready --timeout=300s -n default kustomization kratix-workload-resources
       - run:
           name: Verify Jenkins

.gitignore

@@ -43,3 +43,5 @@ platform-values.yaml
 .envrc
 
 .image-cache/
+cert.pem
+key.pem

Makefile

@@ -70,7 +70,7 @@ teardown: ## Delete all Kratix resources from the Platform cluster
 fast-quick-start: teardown ## Install Kratix without recreating the local clusters
 	RECREATE=false make quick-start
 
-quick-start: generate distribution ## Recreates the clusters and install Kratix
+quick-start: gitea-cli generate distribution ## Recreates the clusters and install Kratix
 	VERSION=dev DOCKER_BUILDKIT=1 ./scripts/quick-start.sh --local --git-and-minio
 
 prepare-platform-as-destination: ## Installs flux onto platform cluster and registers as a destination
@@ -173,6 +173,24 @@ rm -rf $$TMP_DIR ;\
 }
 endef
 
+GITEA_PLATFORM=$(shell uname -s | tr '[:upper:]' '[:lower:]')
+ifeq ($(GITEA_PLATFORM),darwin)
+	GITEA_PLATFORM=darwin-10.12
+endif
+ARCH=$(shell uname -m)
+ifeq ($(GITEA_PLATFORM),linux)
+	ARCH=$(shell dpkg --print-architecture)
+endif
+
+define get-gitea-cli
+@[ -f $(PROJECT_DIR)/bin/gitea ] || { \
+curl --silent --output $(PROJECT_DIR)/bin/gitea https://dl.gitea.com/gitea/1.21.10/gitea-1.21.10-$(GITEA_PLATFORM)-$(ARCH); \
+chmod +x $(PROJECT_DIR)/bin/gitea; \
+}
+endef
+gitea-cli:
+	$(call get-gitea-cli)
+
 .PHONY: list
 list:
 	@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$'

docs/deprecated/quick-start.md

@@ -64,7 +64,7 @@ Some KinD installations use non-standard networking. To ensure cross-cluster com
 
 ```
 PLATFORM_DESTINATION_IP=`docker inspect platform-control-plane | grep '"IPAddress": "172' | awk '{print $2}' | awk -F '"' '{print $2}'`
-sed -i'' -e "s/172.18.0.2/$PLATFORM_DESTINATION_IP/g" hack/worker/gitops-tk-resources.yaml
+sed -i'' -e "s/172.18.0.2/$(platform_destination_ip)/g" hack/worker/gitops-tk-resources.yaml
 ```
 
 ### Set up Worker Cluster

hack/destination/gitops-tk-resources-git.yaml

@@ -1,15 +1,4 @@
 ---
-apiVersion: v1
-kind: Secret
-metadata:
-  name: gitea-credentials
-  namespace: flux-system
-type: Opaque
-data:
-  username: Z2l0ZWFfYWRtaW4=
-  password: cjhzQThDUEhEOSFidDZk
-  caFile: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUdCakNDQSs2Z0F3SUJBZ0lVZTlSTW9hbWlORURqWERqam9WdDBrczZKVXFFd0RRWUpLb1pJaHZjTkFRRUwKQlFBd2dZWXhDekFKQmdOVkJBWVRBbGhZTVJJd0VBWURWUVFJREFsVGRHRjBaVTVoYldVeEVUQVBCZ05WQkFjTQpDRU5wZEhsT1lXMWxNUlF3RWdZRFZRUUtEQXREYjIxd1lXNTVUbUZ0WlRFYk1Ca0dBMVVFQ3d3U1EyOXRjR0Z1CmVWTmxZM1JwYjI1T1lXMWxNUjB3R3dZRFZRUUREQlJEYjIxdGIyNU9ZVzFsVDNKSWIzTjBibUZ0WlRBZUZ3MHkKTXpFeU1URXhNVFV6TURWYUZ3MHpNekV5TURneE1UVXpNRFZhTUlHR01Rc3dDUVlEVlFRR0V3SllXREVTTUJBRwpBMVVFQ0F3SlUzUmhkR1ZPWVcxbE1SRXdEd1lEVlFRSERBaERhWFI1VG1GdFpURVVNQklHQTFVRUNnd0xRMjl0CmNHRnVlVTVoYldVeEd6QVpCZ05WQkFzTUVrTnZiWEJoYm5sVFpXTjBhVzl1VG1GdFpURWRNQnNHQTFVRUF3d1UKUTI5dGJXOXVUbUZ0WlU5eVNHOXpkRzVoYldVd2dnSWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUNEd0F3Z2dJSwpBb0lDQVFDdC9KaXJrelB6cFBKUVdkOEJsTGIzU2dWU1B2L1RjZFdSQXFBaUlpNTBkMEwvN2gxQjkzejJuaTVNCjdyYkRPY3RmU2kyb2FCTG9uYzNmOGJEOExwZjNjT2lNamJkVmRZNCtBN3FjZVU1VURZdXdYK29hZVhNS2d3MC8KT29rbFI5eVFQc0hFU25wa0NwVmFQVm9sN2czeThUc3NnbFVnQTBJRjY4dnlGRk9iZ3Jja3dVOGUyeElEU1hzZApYbGF6a1RmV0oyb3d6aWhTblR1REtyUGc3REZWdHNHcGlvdExDTUVtQmhzUHl4NTl1ZTFTdFFvanhjNndnWHFtCjFmZE1UK25KZW9pUVJ1SURpQ0lKYUhuK0ZvV2cyQi90L3EwbGxvMllSSlFJY1VnYisyWERFYzhXY0dXblZTaXQKQzd1bjNETzlZZXFRN0hFMFJEMFpQWWRUcUE3ZzB1bE5mUXg5M1gwZmxDTEJlVzZPa0drc014QnpBaXBMY28xaAp4ekdxcWE0ZnlqQUx5T2JLVFFLTXM5dnRjRUZ6RzgwSmROL3ByUGx3Ukp1VFpHOWRuS1loR1V2aEg0d3NhVXlFCjFHNkFZV0VuZC9XaGVicTVRSkFZWFRia1piUm5lUEhrMTFnZlcxSnpPN2VESUd4Y2s2VUNUZlJmRzZ4bDAwSDYKV3d1S1lDcktMSitIblYrdml6YTVGdjJ1ODBSRVBOSjJKaXZ4WC9tLzExeGRwNkkyYUZGblF5VFJiL1lsY082TgpEMWsrNFdYV1drWjZXMGRIVGMzYzdlRXlhV0FQc0YybWNsSDAwNEp6NjNNYzhONDkzdUZ4eWp5blk1SVR6UzZ6CjdTY1dtR2xlbEJSZHJHVE5mSU9SV0UzMzI3LzV5bFJoM2YzNk1vQWdVSnZZT2NTNkRRSURBUUFCbzJvd2FEQWQKQmdOVkhRNEVGZ1FVb25ZTzA4WlgwTHcrdEZBVmlCYk5mbzdwREQ0d0h3WURWUjBqQkJnd0ZvQVVvbllPMDhaWAowTHcrdEZBVmlCYk5mbzdwREQ0d0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBVkJnTlZIUkVFRGpBTWh3U3NFZ0FECmh3U3NFZ0FDTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElDQVFBZU5scTBGRlN1eTQ3aW1wQzlCWE5YVm5xcENMTmsKcHdmK3NBN2ttOGtwb1Z4VTFEOHA0WWRYZXh5ZHhsV3ZlNWsyZWExN2ZSVGQzZnlnaGdQcU04bW1FamtlRXFaRgpIRnpGYVpJQ2YrM2gxV29HSm15a3VjRTRnMzUvMk83cTgwMUl1amVYMCtsTU8vMHhuMXQxSVRWby9aOUxxY0dFCjd4MTEwMnByOE8ydEFqaVJKMm1CbUg4Qmp1SlhPd212bVUzbmJiS0FuYkxtZVRqQ1VhOUlhcU9OOXJGUW9yYWIKQUd6ZGZkNjMrcDY3NURZWS96WGh5dTJCbDV6aitpRFZKUGx4K0FNei9KcmNWNHVBUTkvbUZMVjVNNUVCbEFvdgo3aGNOSXc2UDdnV1JYWjJhaDZqa3FjeXRwcytXTGcrVDAxZy9JSlFyazlrZHMrN2piNzFvaE9VVzMweDlkMHpaCkpiRk9qSjdzYWh6Vmhub04weTNhZ3g2Zk44RGpKYmdYSjFlUFNTNzdIVXBnYy83anBCZDBhK3FONm1SandIT2MKbkZmcWVjeWtqb3dSSXNFMm0xakViL2NXZlUyZ05ERzI2SC8rd0dBSWQ4RkthQldkTlMvSUZRQzJPbTNxQndMTgp5ZFIycVM1aDduRG5pZlVabGFvdmFkTzhORWU0dExuNHhraGRpUHExdXZHbHI2V2I3ZUlWRDg3dnV5ekVGNmw2Cm5EL3dvOE9xV24xaDV0NDBRQUJtajlYbVBKeGR5a1VIM0Z5RDIyV283NE5SZ2Z0NkFJNHVnM3A2SFhVUGM0eFkKTjVDNUhnTGpSRldNWVFialZBenFwdzJMSnJUWWVUakh6TUdvVXBXN296azNrSno0WTMra3hpUFJGYVIzMHR3NgpCeGRsL25oYkRQOXZxZz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
----
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata:

hack/destination/helm-values-gitea.yaml

@@ -6,15 +6,3 @@ config:
   git:
     url: https://172.18.0.2:31333/gitea_admin/kratix
     branch: main
-
-additionalResources:
-  - apiVersion: v1
-    kind: Secret
-    metadata:
-      name: gitea-credentials
-      namespace: default
-    type: Opaque
-    data:
-      username: Z2l0ZWFfYWRtaW4=
-      password: cjhzQThDUEhEOSFidDZk
-      caFile: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUdCakNDQSs2Z0F3SUJBZ0lVZTlSTW9hbWlORURqWERqam9WdDBrczZKVXFFd0RRWUpLb1pJaHZjTkFRRUwKQlFBd2dZWXhDekFKQmdOVkJBWVRBbGhZTVJJd0VBWURWUVFJREFsVGRHRjBaVTVoYldVeEVUQVBCZ05WQkFjTQpDRU5wZEhsT1lXMWxNUlF3RWdZRFZRUUtEQXREYjIxd1lXNTVUbUZ0WlRFYk1Ca0dBMVVFQ3d3U1EyOXRjR0Z1CmVWTmxZM1JwYjI1T1lXMWxNUjB3R3dZRFZRUUREQlJEYjIxdGIyNU9ZVzFsVDNKSWIzTjBibUZ0WlRBZUZ3MHkKTXpFeU1URXhNVFV6TURWYUZ3MHpNekV5TURneE1UVXpNRFZhTUlHR01Rc3dDUVlEVlFRR0V3SllXREVTTUJBRwpBMVVFQ0F3SlUzUmhkR1ZPWVcxbE1SRXdEd1lEVlFRSERBaERhWFI1VG1GdFpURVVNQklHQTFVRUNnd0xRMjl0CmNHRnVlVTVoYldVeEd6QVpCZ05WQkFzTUVrTnZiWEJoYm5sVFpXTjBhVzl1VG1GdFpURWRNQnNHQTFVRUF3d1UKUTI5dGJXOXVUbUZ0WlU5eVNHOXpkRzVoYldVd2dnSWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUNEd0F3Z2dJSwpBb0lDQVFDdC9KaXJrelB6cFBKUVdkOEJsTGIzU2dWU1B2L1RjZFdSQXFBaUlpNTBkMEwvN2gxQjkzejJuaTVNCjdyYkRPY3RmU2kyb2FCTG9uYzNmOGJEOExwZjNjT2lNamJkVmRZNCtBN3FjZVU1VURZdXdYK29hZVhNS2d3MC8KT29rbFI5eVFQc0hFU25wa0NwVmFQVm9sN2czeThUc3NnbFVnQTBJRjY4dnlGRk9iZ3Jja3dVOGUyeElEU1hzZApYbGF6a1RmV0oyb3d6aWhTblR1REtyUGc3REZWdHNHcGlvdExDTUVtQmhzUHl4NTl1ZTFTdFFvanhjNndnWHFtCjFmZE1UK25KZW9pUVJ1SURpQ0lKYUhuK0ZvV2cyQi90L3EwbGxvMllSSlFJY1VnYisyWERFYzhXY0dXblZTaXQKQzd1bjNETzlZZXFRN0hFMFJEMFpQWWRUcUE3ZzB1bE5mUXg5M1gwZmxDTEJlVzZPa0drc014QnpBaXBMY28xaAp4ekdxcWE0ZnlqQUx5T2JLVFFLTXM5dnRjRUZ6RzgwSmROL3ByUGx3Ukp1VFpHOWRuS1loR1V2aEg0d3NhVXlFCjFHNkFZV0VuZC9XaGVicTVRSkFZWFRia1piUm5lUEhrMTFnZlcxSnpPN2VESUd4Y2s2VUNUZlJmRzZ4bDAwSDYKV3d1S1lDcktMSitIblYrdml6YTVGdjJ1ODBSRVBOSjJKaXZ4WC9tLzExeGRwNkkyYUZGblF5VFJiL1lsY082TgpEMWsrNFdYV1drWjZXMGRIVGMzYzdlRXlhV0FQc0YybWNsSDAwNEp6NjNNYzhONDkzdUZ4eWp5blk1SVR6UzZ6CjdTY1dtR2xlbEJSZHJHVE5mSU9SV0UzMzI3LzV5bFJoM2YzNk1vQWdVSnZZT2NTNkRRSURBUUFCbzJvd2FEQWQKQmdOVkhRNEVGZ1FVb25ZTzA4WlgwTHcrdEZBVmlCYk5mbzdwREQ0d0h3WURWUjBqQkJnd0ZvQVVvbllPMDhaWAowTHcrdEZBVmlCYk5mbzdwREQ0d0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBVkJnTlZIUkVFRGpBTWh3U3NFZ0FECmh3U3NFZ0FDTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElDQVFBZU5scTBGRlN1eTQ3aW1wQzlCWE5YVm5xcENMTmsKcHdmK3NBN2ttOGtwb1Z4VTFEOHA0WWRYZXh5ZHhsV3ZlNWsyZWExN2ZSVGQzZnlnaGdQcU04bW1FamtlRXFaRgpIRnpGYVpJQ2YrM2gxV29HSm15a3VjRTRnMzUvMk83cTgwMUl1amVYMCtsTU8vMHhuMXQxSVRWby9aOUxxY0dFCjd4MTEwMnByOE8ydEFqaVJKMm1CbUg4Qmp1SlhPd212bVUzbmJiS0FuYkxtZVRqQ1VhOUlhcU9OOXJGUW9yYWIKQUd6ZGZkNjMrcDY3NURZWS96WGh5dTJCbDV6aitpRFZKUGx4K0FNei9KcmNWNHVBUTkvbUZMVjVNNUVCbEFvdgo3aGNOSXc2UDdnV1JYWjJhaDZqa3FjeXRwcytXTGcrVDAxZy9JSlFyazlrZHMrN2piNzFvaE9VVzMweDlkMHpaCkpiRk9qSjdzYWh6Vmhub04weTNhZ3g2Zk44RGpKYmdYSjFlUFNTNzdIVXBnYy83anBCZDBhK3FONm1SandIT2MKbkZmcWVjeWtqb3dSSXNFMm0xakViL2NXZlUyZ05ERzI2SC8rd0dBSWQ4RkthQldkTlMvSUZRQzJPbTNxQndMTgp5ZFIycVM1aDduRG5pZlVabGFvdmFkTzhORWU0dExuNHhraGRpUHExdXZHbHI2V2I3ZUlWRDg3dnV5ekVGNmw2Cm5EL3dvOE9xV24xaDV0NDBRQUJtajlYbVBKeGR5a1VIM0Z5RDIyV283NE5SZ2Z0NkFJNHVnM3A2SFhVUGM0eFkKTjVDNUhnTGpSRldNWVFialZBenFwdzJMSnJUWWVUakh6TUdvVXBXN296azNrSno0WTMra3hpUFJGYVIzMHR3NgpCeGRsL25oYkRQOXZxZz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K