Remove private repos (#4078)

Signed-off-by: Yee Hing Tong <[email protected]>

Dockerfile

@@ -7,22 +7,11 @@ FROM --platform=${BUILDPLATFORM} golang:1.19.1-bullseye AS flytebuilder
 ARG TARGETARCH
 ENV GOARCH "${TARGETARCH}"
 ENV GOOS linux
-ENV GOPRIVATE github.com/unionai/*
-RUN mkdir -m 0700 ~/.ssh
-RUN ssh-keyscan github.com >> ~/.ssh/known_hosts
-
-
 WORKDIR /flyteorg/build
-COPY go.mod.main ./go.mod
-COPY go.sum.main ./go.sum
-RUN go mod download
-RUN echo '\
-[url "ssh://[email protected]/"]\n\
-  insteadOf = https://github.com/'\
->> /root/.gitconfig
 
 COPY go.mod go.sum ./
-RUN --mount=type=ssh go mod download
+RUN go mod download
+
 COPY cmd cmd
 COPY --from=flyteconsole /app/ cmd/single/dist
 RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/root/go/pkg/mod \

docker/sandbox-bundled/Makefile

@@ -29,7 +29,7 @@ manifests:
 		kustomize/dev > manifests/dev.yaml
 
 .PHONY: build
-build: manifests
+build: flyte manifests
 	[ -n "$(shell docker buildx ls | awk '/^flyte-sandbox / {print $$1}')" ] || \
 		docker buildx create --name flyte-sandbox \
 		--driver docker-container --driver-opt image=moby/buildkit:master \
@@ -38,6 +38,17 @@ build: manifests
 	docker buildx build --ssh default --builder flyte-sandbox --allow security.insecure --load \
 		--tag flyte-sandbox:latest .
 
+# This is here because we want to be able to push locally, not depend on GH actions
+.PHONY: build_push
+build_push: flyte manifests
+	[ -n "$(shell docker buildx ls | awk '/^flyte-sandbox / {print $$1}')" ] || \
+		docker buildx create --name flyte-sandbox \
+		--driver docker-container --driver-opt image=moby/buildkit:master \
+		--buildkitd-flags '--allow-insecure-entitlement security.insecure' \
+		--platform linux/arm64,linux/amd64
+	docker buildx build --ssh default --builder flyte-sandbox --allow security.insecure --push \
+		--tag ghcr.io/flyteorg/flyte-sandbox:a_v0.1.1 .
+
 # Port map
 # 6443 - k8s API server
 # 30000 - Docker Registry

docker/sandbox-bundled/manifests/complete.yaml

@@ -1039,7 +1039,7 @@ type: Opaque
 ---
 apiVersion: v1
 data:
-  haSharedSecret: c2l3Tmcxamk4T0IzeFhRaQ==
+  haSharedSecret: Y3VXV2VjcGJLVk45dmN2Tw==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -1726,7 +1726,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
-        checksum/secret: df359fa9bbd8167da665194e617756ff21c294cd6dacfd5502ef7483bd102a4b
+        checksum/secret: 971f29937607f9728ed3a5e3cc93b6701c711df0d4bca6f9aca9486f9fb9fc70
       labels:
         app: docker-registry
         release: flyte-sandbox

docker/sandbox-bundled/manifests/dev.yaml

@@ -744,7 +744,7 @@ metadata:
 ---
 apiVersion: v1
 data:
-  haSharedSecret: Q0cyTENmQ2U5MW5lOFg1VQ==
+  haSharedSecret: enU1SDU5Rm54YjAyZkJEVA==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -1304,7 +1304,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
-        checksum/secret: 029b85e3af486b53f3d4f13ac2f1463b69b5b89cf3cacbdf9afbc92b6235c7d0
+        checksum/secret: 250199a936c62bc43b00e80aa130aae90835d75590681cc0b0078dc7c38b0a4b
       labels:
         app: docker-registry
         release: flyte-sandbox

go.mod

@@ -219,6 +219,6 @@ require (
 
 replace github.com/robfig/cron/v3 => github.com/unionai/cron/v3 v3.0.2-0.20220915080349-5790c370e63a
 
-replace github.com/flyteorg/flyteidl => github.com/unionai/flyteidl v1.5.14-0.20230916200054-78caf2c2eeb3
+replace github.com/flyteorg/flyteidl => github.com/flyteorg/flyteidl v1.5.14-0.20230916200054-78caf2c2eeb3
 
-replace github.com/flyteorg/flyteadmin => github.com/unionai/flyteadmin v1.1.115-0.20230922220028-90b279296f02
+replace github.com/flyteorg/flyteadmin => github.com/flyteorg/flyteadmin v1.1.115-0.20230926015535-b485d57f552d

go.sum

@@ -348,6 +348,10 @@ github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8S
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/flyteorg/datacatalog v1.0.48 h1:KPUV4uUZ0adLL9uvQ+pmGymdzDrwqeYJzpOk+DR+2e4=
 github.com/flyteorg/datacatalog v1.0.48/go.mod h1:VhtWkjCBJ9LZpt6uqTyKMYq1IAkW7dUeAdbWN9DI6h0=
+github.com/flyteorg/flyteadmin v1.1.115-0.20230926015535-b485d57f552d h1:jUG8aXeTNlzaLNVXziDRz74ekWJXCBFME7WMK2MEnYI=
+github.com/flyteorg/flyteadmin v1.1.115-0.20230926015535-b485d57f552d/go.mod h1:DoYsyQ2kEoOEt+xnRC96foR1eTVfKgOy1DRPLkgPh/Y=
+github.com/flyteorg/flyteidl v1.5.14-0.20230916200054-78caf2c2eeb3 h1:fR0h9To+esrELEIiT54ZOaNVU9apPVhrqqtIEa/daGU=
+github.com/flyteorg/flyteidl v1.5.14-0.20230916200054-78caf2c2eeb3/go.mod h1:EtE/muM2lHHgBabjYcxqe9TWeJSL0kXwbI0RgVwI4Og=
 github.com/flyteorg/flyteplugins v1.1.8 h1:UVYdqDdcIqz2JIso+m3MsaPSsTZJZyZQ6Eg7nhX9r/Y=
 github.com/flyteorg/flyteplugins v1.1.8/go.mod h1:sRxeatEOHq1b9bTxTRNcwoIkVTAVN9dTz8toXkfcz2E=
 github.com/flyteorg/flytepropeller v1.1.106 h1:o9wmCcki/YI3vwZ3NjiQApCCMtJo+1hwMHvYuIKe3GI=
@@ -1532,10 +1536,6 @@ github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGr
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/unionai/cron/v3 v3.0.2-0.20220915080349-5790c370e63a h1:pTbOzzOh94yt3WHt7uqZ1m6PUZth++GspSJGK9dEBC4=
 github.com/unionai/cron/v3 v3.0.2-0.20220915080349-5790c370e63a/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
-github.com/unionai/flyteadmin v1.1.115-0.20230922220028-90b279296f02 h1:UT7+HmFEo5trdkI3R9TWGHhfeCJTICAXiOvcc4ZhYpA=
-github.com/unionai/flyteadmin v1.1.115-0.20230922220028-90b279296f02/go.mod h1:DoYsyQ2kEoOEt+xnRC96foR1eTVfKgOy1DRPLkgPh/Y=
-github.com/unionai/flyteidl v1.5.14-0.20230916200054-78caf2c2eeb3 h1:GznIW2znW7PeixgNbSJxNIajqB5LlL98uEBOPA99HGI=
-github.com/unionai/flyteidl v1.5.14-0.20230916200054-78caf2c2eeb3/go.mod h1:EtE/muM2lHHgBabjYcxqe9TWeJSL0kXwbI0RgVwI4Og=
 github.com/unrolled/secure v0.0.0-20180918153822-f340ee86eb8b/go.mod h1:mnPT77IAdsi/kV7+Es7y+pXALeV3h7G6dQF6mNYjcLA=
 github.com/unrolled/secure v0.0.0-20181005190816-ff9db2ff917f/go.mod h1:mnPT77IAdsi/kV7+Es7y+pXALeV3h7G6dQF6mNYjcLA=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=