support for example pipeline (#210)

* support for example pipeline

* wip

* wip

* remove ingress annotation

Author: oren-codefresh

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.0.190
+VERSION=v0.0.191
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")

cmd/commands/git-source.go

@@ -73,6 +73,7 @@ type (
 		CreateDemoResources bool
 		Exclude             string
 		Include             string
+		IngressHost		 	string
 	}
 
 	GitSourceDeleteOptions struct {
@@ -99,6 +100,7 @@ type (
 		runtimeName string
 		gsCloneOpts *git.CloneOptions
 		gsFs        fs.FS
+		ingressHost string
 	}
 )
 
@@ -249,6 +251,7 @@ func createDemoResources(ctx context.Context, opts *GitSourceCreateOptions, gsRe
 			runtimeName: opts.RuntimeName,
 			gsCloneOpts: opts.GsCloneOpts,
 			gsFs:        gsFs,
+			ingressHost: opts.IngressHost,
 		})
 		if err != nil {
 			return fmt.Errorf("failed to create github example pipeline. Error: %w", err)
@@ -668,7 +671,7 @@ func createGithubExamplePipeline(opts *gitSourceGithubExampleOptions) error {
 
 	// Create a github eventsource that will listen to push events in the git source repo
 	gsRepoURL := opts.gsCloneOpts.URL()
-	eventSource := createGithubExampleEventSource(gsRepoURL)
+	eventSource := createGithubExampleEventSource(gsRepoURL, opts.ingressHost)
 	eventSourceFilePath := opts.gsFs.Join(opts.gsCloneOpts.Path(), store.Get().GithubExampleEventSourceFileName)
 	err = opts.gsCloneOpts.FS.WriteYamls(eventSourceFilePath, eventSource)
 	if err != nil {
@@ -688,16 +691,15 @@ func createGithubExamplePipeline(opts *gitSourceGithubExampleOptions) error {
 
 func createGithubExampleIngress() *netv1.Ingress {
 	return ingressutil.CreateIngress(&ingressutil.CreateIngressOptions{
-		Name: store.Get().GithubExampleIngressObjectName,
+		Name: store.Get().CodefreshDeliveryPipelines,
 		Paths: []ingressutil.IngressPath{
 			{
 				Path:        store.Get().GithubExampleEventSourceEndpointPath,
 				PathType:    netv1.PathTypeImplementationSpecific,
 				ServiceName: store.Get().GithubExampleEventSourceObjectName + "-eventsource-svc",
 				ServicePort: store.Get().GithubExampleEventSourceServicePort,
 			},
-		},
-	})
+		},	})
 }
 
 func getRepoOwnerAndNameFromRepoURL(repoURL string) (owner string, name string) {
@@ -708,7 +710,7 @@ func getRepoOwnerAndNameFromRepoURL(repoURL string) (owner string, name string)
 	return owner, name
 }
 
-func createGithubExampleEventSource(repoURL string) *eventsourcev1alpha1.EventSource {
+func createGithubExampleEventSource(repoURL string, ingressHost string) *eventsourcev1alpha1.EventSource {
 	repoOwner, repoName := getRepoOwnerAndNameFromRepoURL(repoURL)
 
 	return &eventsourcev1alpha1.EventSource{
@@ -733,7 +735,7 @@ func createGithubExampleEventSource(repoURL string) *eventsourcev1alpha1.EventSo
 				store.Get().GithubExampleEventName: {
 					Webhook: &eventsourcev1alpha1.WebhookContext{
 						Endpoint: store.Get().GithubExampleEventSourceEndpointPath,
-						URL:      "http://replace-with-real-public-url",
+						URL:      strings.Trim(ingressHost, "/"),
 						Port:     store.Get().GithubExampleEventSourceTargetPort,
 						Method:   "POST",
 					},

cmd/commands/runtime.go

@@ -431,6 +431,7 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 		GsName:              store.Get().GitSourceName,
 		RuntimeName:         opts.RuntimeName,
 		CreateDemoResources: opts.InstallDemoResources,
+		IngressHost: 	   opts.IngressHost,
 	})
 	appendLogToSummary(gitSrcMessage, err)
 	if err != nil {

docs/releases/release_notes.md

@@ -23,7 +23,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.190/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.191/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.190/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.191/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

manifests/runtime.yaml

@@ -1,26 +1,26 @@
 apiVersion: codefresh.io/v1alpha1
 kind: Runtime
 metadata:
-    name: '{{ name }}'
-    namespace: '{{ namespace }}'
+  name: "{{ name }}"
+  namespace: "{{ namespace }}"
 spec:
-    defVersion: 1.0.0
-    version: 0.0.190
-    bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
-    components:
-        - name: events
-          type: kustomize
-          url: github.com/codefresh-io/cli-v2/manifests/argo-events
-          wait: true
-        - name: rollouts
-          type: kustomize
-          url: github.com/codefresh-io/cli-v2/manifests/argo-rollouts
-        - name: workflows
-          type: kustomize
-          url: github.com/codefresh-io/cli-v2/manifests/argo-workflows
-        - name: argocd-agent
-          type: kustomize
-          url: github.com/codefresh-io/cli-v2/manifests/argo-agent
-        - name: app-proxy
-          type: kustomize
-          url: github.com/codefresh-io/cli-v2/manifests/app-proxy
+  defVersion: 1.0.0
+  version: 0.0.191
+  bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
+  components:
+    - name: events
+      type: kustomize
+      url: github.com/codefresh-io/cli-v2/manifests/argo-events
+      wait: true
+    - name: rollouts
+      type: kustomize
+      url: github.com/codefresh-io/cli-v2/manifests/argo-rollouts
+    - name: workflows
+      type: kustomize
+      url: github.com/codefresh-io/cli-v2/manifests/argo-workflows
+    - name: argocd-agent
+      type: kustomize
+      url: github.com/codefresh-io/cli-v2/manifests/argo-agent
+    - name: app-proxy
+      type: kustomize
+      url: github.com/codefresh-io/cli-v2/manifests/app-proxy

pkg/store/store.go

@@ -68,6 +68,7 @@ type Store struct {
 	ArgoWFServicePort                    int32
 	BinaryName                           string
 	Codefresh                            string
+	CodefreshDeliveryPipelines           string
 	CFComponentType                      string
 	CFGitSourceType                      string
 	CFRuntimeDefType                     string
@@ -151,6 +152,7 @@ func init() {
 	s.ArgoWFServicePort = 2746
 	s.BinaryName = binaryName
 	s.Codefresh = "codefresh"
+	s.CodefreshDeliveryPipelines = "codefresh-delivery-pipelines"
 	s.CFComponentType = "component"
 	s.CFGitSourceType = "git-source"
 	s.CFRuntimeDefType = "runtimeDef"
@@ -193,15 +195,15 @@ func init() {
 	s.CronExampleEventName = "example-with-interval"
 	s.CronExampleTriggerTemplateName = "hello-world"
 	s.CronExampleDependencyName = "calendar-dep"
-	s.GithubExampleEventSourceFileName = "event-source.git-source.yaml"
-	s.GithubExampleEventSourceObjectName = "github"
-	s.GithubExampleEventSourceEndpointPath = "/git-source/"
+	s.GithubExampleEventSourceFileName = "push-github.event-source.yaml"
+	s.GithubExampleEventSourceObjectName = "push-github"
+	s.GithubExampleEventSourceEndpointPath = "/webhooks/push-github/"
 	s.GithubExampleEventSourceTargetPort = "13000"
 	s.GithubExampleEventSourceServicePort = 13000
-	s.GithubExampleIngressFileName = "ingress.git-source.yaml"
+	s.GithubExampleIngressFileName = fmt.Sprintf("%s.ingress.yaml", s.CodefreshDeliveryPipelines)
 	s.GithubExampleIngressObjectName = "github"
-	s.GithubExampleSensorFileName = "sensor.git-source.yaml"
-	s.GithubExampleSensorObjectName = "github"
+	s.GithubExampleSensorFileName = "push-github.sensor.yaml"
+	s.GithubExampleSensorObjectName = "push-github"
 	s.GithubExampleWfTemplateFileName = "workflow-template.hello-world.yaml"
 	s.GithubExampleEventName = "push"
 	s.GithubExampleTriggerTemplateName = "hello-world"