adjust remaining refs towards new repo

cbarbian-sap · cbarbian-sap · commit f52c87bda73e · 2023-04-27T12:18:02.000+02:00
diff --git a/go.mod b/go.mod
@@ -5,8 +5,8 @@ go 1.19
 require (
 	github.com/Masterminds/sprig/v3 v3.2.3
 	github.com/pkg/errors v0.9.1
+	github.com/sap/go-generics v0.1.0
 	github.com/spf13/pflag v1.0.5
-	github.tools.sap/cs-devops/go-generics v0.0.2
 	k8s.io/api v0.26.2
 	k8s.io/apiextensions-apiserver v0.26.2
 	k8s.io/apimachinery v0.26.2
@@ -20,7 +20,6 @@ require (
 )
 
 require (
-	golang.org/x/net v0.7.0 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver/v3 v3.2.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
@@ -64,6 +63,7 @@ require (
 	github.com/xlab/treeprint v1.1.0 // indirect
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	golang.org/x/crypto v0.5.0 // indirect
+	golang.org/x/net v0.7.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
 	golang.org/x/sys v0.5.0 // indirect
 	golang.org/x/term v0.5.0 // indirect
diff --git a/go.sum b/go.sum
@@ -260,6 +260,8 @@ github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1
 github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
 github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/sap/go-generics v0.1.0 h1:KULBMVpCZsNkx9+gEAHRAauvMX2ZeIIJ4k2wrQnA1BI=
+github.com/sap/go-generics v0.1.0/go.mod h1:8L5jyDKi/FHKG/R+qwyy9h1TymA7XO5YSu+J/27gTCg=
 github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
 github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
@@ -292,8 +294,6 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.tools.sap/cs-devops/go-generics v0.0.2 h1:TuWjPmmVEiFS322FfxH1pDPhQXwXZ0fSt1IUKdtHmas=
-github.tools.sap/cs-devops/go-generics v0.0.2/go.mod h1:Mm/S+J1+u7VNTixBp/WZpqD+7GFOsLdyAdfTiXYbAzw=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
diff --git a/internal/helm/capabilities.go b/internal/helm/capabilities.go
@@ -17,7 +17,8 @@ limitations under the License.
 package helm
 
 import (
-	"github.tools.sap/cs-devops/go-generics/slices"
+	"github.com/sap/go-generics/slices"
+
 	"k8s.io/client-go/discovery"
 )
 
diff --git a/internal/helm/hooks.go b/internal/helm/hooks.go
@@ -22,6 +22,7 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
+
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
diff --git a/pkg/component/component.go b/pkg/component/component.go
@@ -19,9 +19,10 @@ package component
 import (
 	"reflect"
 
-	"github.com/sap/component-operator-runtime/pkg/types"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	"github.com/sap/component-operator-runtime/pkg/types"
 )
 
 // Instantiate given Component type T; panics unless T is a pointer type.
diff --git a/pkg/component/reconcile.go b/pkg/component/reconcile.go
@@ -27,6 +27,7 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
+	"github.com/sap/go-generics/slices"
 
 	corev1 "k8s.io/api/core/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
@@ -51,8 +52,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
-	"github.tools.sap/cs-devops/go-generics/slices"
-
 	"github.com/sap/component-operator-runtime/internal/backoff"
 	"github.com/sap/component-operator-runtime/pkg/manifests"
 	"github.com/sap/component-operator-runtime/pkg/types"
diff --git a/pkg/component/types.go b/pkg/component/types.go
@@ -17,9 +17,10 @@ limitations under the License.
 package component
 
 import (
-	"github.com/sap/component-operator-runtime/pkg/types"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/sap/component-operator-runtime/pkg/types"
 )
 
 // Component is the central interface that component operators have to implement.
diff --git a/pkg/component/util.go b/pkg/component/util.go
@@ -20,14 +20,16 @@ import (
 	"crypto/sha256"
 	"encoding/hex"
 
-	"github.com/sap/component-operator-runtime/pkg/types"
-	"github.tools.sap/cs-devops/go-generics/slices"
+	"github.com/sap/go-generics/slices"
+
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/sap/component-operator-runtime/pkg/types"
 )
 
 func sha256hash(data []byte) string {
diff --git a/pkg/manifests/generator.go b/pkg/manifests/generator.go
@@ -18,6 +18,7 @@ package manifests
 
 import (
 	"github.com/pkg/errors"
+
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/sap/component-operator-runtime/pkg/types"
diff --git a/pkg/manifests/helm.go b/pkg/manifests/helm.go
@@ -29,14 +29,14 @@ import (
 	"text/template"
 
 	"github.com/Masterminds/sprig/v3"
+	"github.com/sap/go-generics/slices"
+
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	utilyaml "k8s.io/apimachinery/pkg/util/yaml"
 	"k8s.io/client-go/discovery"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	kyaml "sigs.k8s.io/yaml"
 
-	"github.tools.sap/cs-devops/go-generics/slices"
-
 	"github.com/sap/component-operator-runtime/internal/helm"
 	"github.com/sap/component-operator-runtime/internal/templatex"
 	"github.com/sap/component-operator-runtime/pkg/types"
diff --git a/pkg/manifests/kustomize.go b/pkg/manifests/kustomize.go
@@ -26,6 +26,7 @@ import (
 	"text/template"
 
 	"github.com/Masterminds/sprig/v3"
+
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	utilyaml "k8s.io/apimachinery/pkg/util/yaml"
 	"sigs.k8s.io/controller-runtime/pkg/client"
diff --git a/pkg/manifests/transformer.go b/pkg/manifests/transformer.go
@@ -24,9 +24,11 @@ import (
 	"text/template"
 
 	"github.com/Masterminds/sprig/v3"
+
+	kyaml "sigs.k8s.io/yaml"
+
 	"github.com/sap/component-operator-runtime/internal/templatex"
 	"github.com/sap/component-operator-runtime/pkg/types"
-	kyaml "sigs.k8s.io/yaml"
 )
 
 type TemplateParameterTransformer struct {
diff --git a/scaffold/templates/Dockerfile.tpl b/scaffold/templates/Dockerfile.tpl
@@ -3,20 +3,13 @@ FROM golang:{{ .goVersion }} as builder
 ARG TARGETOS
 ARG TARGETARCH
 
-# Flag github.tools.sap as private source
-ENV GOPRIVATE=github.tools.sap
-
-# Setup git credential helper
-RUN git config --global credential.helper '!f(){ printf "username=%s\npassword=%s\n" token "$(cat /run/secrets/github-token)"; };f'
-RUN --mount=type=secret,id=github-token,required=true test -s /run/secrets/github-token
-
 WORKDIR /workspace
 # Copy the Go Modules manifests
 COPY go.mod go.mod
 COPY go.sum go.sum
 # cache deps before building and copying source so that we don't need to re-download as much
 # and so that source changes don't invalidate our downloaded layer
-RUN --mount=type=secret,id=github-token,required=true go mod download
+RUN go mod download
 
 # Copy the go source
 COPY main.go main.go
diff --git a/scaffold/templates/Makefile.tpl b/scaffold/templates/Makefile.tpl
@@ -64,8 +64,7 @@ run: manifests generate fmt vet ## Run a controller from your host.
 # Build docker image in current architecture and tag it as ${IMG}.
 .PHONY: docker-build
 docker-build: ## Build docker image with the manager.
-	test -n "${GITHUB_TOKEN}" || (echo "Environment variable GITHUB_TOKEN unset or empty"; exit 1)
-	docker build -t ${IMG} --secret id=github-token,env=GITHUB_TOKEN .
+	docker build -t ${IMG} .
 
 # Push docker image to the target specified in ${IMG}.
 .PHONY: docker-push
@@ -76,12 +75,11 @@ docker-push: ## Push docker image with the manager.
 PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
 .PHONY: docker-buildx
 docker-buildx: ## Build and push docker image for the manager for cross-platform support
-	test -n "${GITHUB_TOKEN}" || (echo "Environment variable GITHUB_TOKEN unset or empty"; exit 1)
 	# copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile
 	sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross
 	- docker buildx create --name project-v3-builder
 	docker buildx use project-v3-builder
-	- docker buildx build --push --secret id=github-token,env=GITHUB_TOKEN --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross .
+	- docker buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross .
 	- docker buildx rm project-v3-builder
 	rm Dockerfile.cross
 
diff --git a/website/content/en/docs/getting-started/_index.md b/website/content/en/docs/getting-started/_index.md
@@ -13,7 +13,7 @@ and how to start with the implementation of the operator.
 First of all, you have to download the component-operator-runtime scaffolding tool from the [releases page](https://github.com/sap/component-operator-runtime/releases/). In the following we assume that the downloaded `scaffold` executable
 is somehwere in your path (for example, as /usr/local/bin/scaffold-component-operator).
 
-Then, you need a git repository for the operator code; in this example, we call it github.tools.sap/myorg/mycomponent-manager.
+Then, you need a git repository for the operator code; in this example, we call it github.com/myorg/mycomponent-manager.
 We assume that you have cloned the empty repository to your local desktop, and have changed the current directory
 to the checked out repository.
 
@@ -26,7 +26,7 @@ scaffold-component-operator \
   --group-version v1alpha1 \
   --kind MyComponent \
   --operator-name mycomponent-manager.kyma-project.io \
-  --go-module github.tools.sap/myorg/mycomponent-manager \
+  --go-module github.com/myorg/mycomponent-manager \
   --image mycomponent-manager-operator:latest \
   .
 ```
diff --git a/website/content/en/docs/usage/overview.md b/website/content/en/docs/usage/overview.md
@@ -14,7 +14,7 @@ project, such as
 ```bash
 kubebuilder init \
   --domain kyma-project.io \
-  --repo github.tools.sap/myorg/mycomponent-manager \
+  --repo github.com/myorg/mycomponent-manager \
   --project-name=mycomponent-manager \
   --plugins=go/v4-alpha
 
diff --git a/website/content/en/docs/usage/scaffolder.md b/website/content/en/docs/usage/scaffolder.md
@@ -16,7 +16,7 @@ After installing the scaffolder, a new project can be created like this:
 scaffold \
   --kind MyComponent \
   --operator-name mycomponent-manager.kyma-project.io \
-  --go-module github.tools.sap/myorg/mycomponent-manager \
+  --go-module github.com/myorg/mycomponent-manager \
   --image mycomponent-manager-operator:latest \
   <output-directory>
 ```

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ limitations under the License.`
`17`	`17`	`package helm`
`18`	`18`
`19`	`19`	`import (`
`20`		`- "github.tools.sap/cs-devops/go-generics/slices"`
	`20`	`+ "github.com/sap/go-generics/slices"`
	`21`	`+`
`21`	`22`	`"k8s.io/client-go/discovery"`
`22`	`23`	`)`
`23`	`24`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ import (`
`22`	`22`	`"strings"`
`23`	`23`
`24`	`24`	`"github.com/pkg/errors"`
	`25`	`+`
`25`	`26`	`"sigs.k8s.io/controller-runtime/pkg/client"`
`26`	`27`	`)`
`27`	`28`