Skip to content

Commit

Permalink
Remove Image Resources
Browse files Browse the repository at this point in the history
This commit removes the Image Resources support.
Removal of `pipelineResources`, as in tektoncd#5967 has been broken up into removal of each resources packages for the `small PR` code standard.
This PR removes `github.com/tektoncd/pipeline/pkg/apis/resource/v1alpha1/image`
and the docs for image resources.
  • Loading branch information
JeromeJu committed Jan 25, 2023
1 parent d78d333 commit 226687c
Show file tree
Hide file tree
Showing 33 changed files with 116 additions and 2,452 deletions.
85 changes: 2 additions & 83 deletions cmd/controller/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@ limitations under the License.
package main

import (
"context"
"flag"
"log"
"net/http"
"os"
"time"

"github.com/tektoncd/pipeline/pkg/apis/pipeline"
"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
Expand All @@ -39,23 +37,11 @@ import (
"knative.dev/pkg/injection"
"knative.dev/pkg/injection/sharedmain"
"knative.dev/pkg/signals"

"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/exporters/jaeger"
"go.opentelemetry.io/otel/propagation"
"go.opentelemetry.io/otel/sdk/resource"
tracesdk "go.opentelemetry.io/otel/sdk/trace"
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
"go.opentelemetry.io/otel/trace"
)

const (
// ControllerLogKey is the name of the logger for the controller cmd
ControllerLogKey = "tekton-pipelines-controller"
// TracerProviderPipelineRun is the name of TraceProvider used pipeline reconciler
TracerProviderPipelineRun = "pipeline-reconciler"
// TracerProviderTaskRun is the name of TracerProvider used in taskrun reconciler
TracerProviderTaskRun = "taskrun-reconciler"
)

func main() {
Expand Down Expand Up @@ -117,83 +103,16 @@ func main() {
log.Fatal(http.ListenAndServe(":"+port, mux)) // #nosec G114 -- see https://github.com/securego/gosec#available-rules
}()

// initialize opentelemetry
tpPipelineRun, err := tracerProvider(TracerProviderPipelineRun)
if err != nil {
log.Printf("failed to initialize tracerProvider for pipelinerun, falling back to no-op provider, %s", err.Error())
tpPipelineRun = trace.NewNoopTracerProvider()
}
tpTaskrun, err := tracerProvider(TracerProviderTaskRun)
if err != nil {
log.Printf("failed to initialize tracerProvider for taskrun, falling back to no-op provider, %s", err.Error())
tpTaskrun = trace.NewNoopTracerProvider()
}
otel.SetTextMapPropagator(propagation.TraceContext{})
ctx, cancel := context.WithCancel(ctx)
defer cancel()

ctx = filteredinformerfactory.WithSelectors(ctx, v1beta1.ManagedByLabelKey)
sharedmain.MainWithConfig(ctx, ControllerLogKey, cfg,
taskrun.NewController(opts, clock.RealClock{}, tpTaskrun),
pipelinerun.NewController(opts, clock.RealClock{}, tpPipelineRun),
taskrun.NewController(opts, clock.RealClock{}),
pipelinerun.NewController(opts, clock.RealClock{}),
run.NewController(),
resolutionrequest.NewController(clock.RealClock{}),
customrun.NewController(),
)

// Cleanly shutdown and flush telemetry when the application exits.
defer func(ctx context.Context) {
// Do not make the application hang when it is shutdown.
ctx, cancel = context.WithTimeout(ctx, time.Second*5)
defer cancel()

// shutdown is only needed when tracerProvider is inialized with jaeger
// not needed when tracerProvider is NewNoopTracerProvider
if tp, ok := tpPipelineRun.(*tracesdk.TracerProvider); ok {
if err := tp.Shutdown(ctx); err != nil {
log.Printf("Unable to shutdown tracerProvider for pipelinerun, %s", err.Error())
}
}
if tp, ok := tpTaskrun.(*tracesdk.TracerProvider); ok {
if err := tp.Shutdown(ctx); err != nil {
log.Printf("Unable to shutdown tracerProvider for taskrun, %s", err.Error())
}
}
}(ctx)
}

func handler(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusOK)
}

// tracerProvider returns an OpenTelemetry TracerProvider configured to use
// the Jaeger exporter that will send spans to the provided url. The returned
// TracerProvider will also use a Resource configured with all the information
// about the application.
func tracerProvider(service string) (trace.TracerProvider, error) {
// Create the Jaeger exporter
// The following env variables are used by the sdk for creating the exporter
// - OTEL_EXPORTER_JAEGER_ENDPOINT is the HTTP endpoint for sending spans directly to a collector.
// - OTEL_EXPORTER_JAEGER_USER is the username to be sent as authentication to the collector endpoint.
// - OTEL_EXPORTER_JAEGER_PASSWORD is the password to be sent as authentication to the collector endpoint.

if _, e := os.LookupEnv("OTEL_EXPORTER_JAEGER_ENDPOINT"); !e {
// jaeger endpoint is not defined, disable tracing and return no-op tracerProvider
return trace.NewNoopTracerProvider(), nil
}

exp, err := jaeger.New(jaeger.WithCollectorEndpoint())
if err != nil {
return nil, err
}
// Initialize tracerProvider with the jaeger exporter
tp := tracesdk.NewTracerProvider(
tracesdk.WithBatcher(exp),
// Record information about the service in a Resource.
tracesdk.WithResource(resource.NewWithAttributes(
semconv.SchemaURL,
semconv.ServiceNameKey.String(service),
)),
)
return tp, nil
}
1 change: 0 additions & 1 deletion config/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ spec:
"-entrypoint-image", "ko://github.com/tektoncd/pipeline/cmd/entrypoint",
"-nop-image", "ko://github.com/tektoncd/pipeline/cmd/nop",
"-sidecarlogresults-image", "ko://github.com/tektoncd/pipeline/cmd/sidecarlogresults",
"-imagedigest-exporter-image", "ko://github.com/tektoncd/pipeline/cmd/imagedigestexporter",
"-pr-image", "ko://github.com/tektoncd/pipeline/cmd/pullrequest-init",
"-workingdirinit-image", "ko://github.com/tektoncd/pipeline/cmd/workingdirinit",

Expand Down
7 changes: 0 additions & 7 deletions docs/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -710,12 +710,6 @@ which results in:
"sha256": "83d5ec6addece4aac79898c9631ee669f5fee5a710a2ed1f98a6d40c19fb88f7"
}
},
{
"name": "gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/imagedigestexporter",
"digest": {
"sha256": "e4d77b5b8902270f37812f85feb70d57d6d0e1fed2f3b46f86baf534f19cd9c0"
}
},
{
"name": "gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/nop",
"digest": {
Expand Down Expand Up @@ -779,7 +773,6 @@ Similarly, you can verify the rest of the images which were published as part of
gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/git-init
gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/entrypoint
gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/nop
gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/imagedigestexporter
gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/pullrequest-init
gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/webhook
```
Expand Down
36 changes: 0 additions & 36 deletions examples/v1beta1/taskruns/optional-resources-with-clustertask.yaml

This file was deleted.

133 changes: 0 additions & 133 deletions examples/v1beta1/taskruns/optional-resources.yaml

This file was deleted.

Loading

0 comments on commit 226687c

Please sign in to comment.