Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix (extensions/tekton) : Update Tekton Model to v0.39.0 (#4243) #4382

Merged
merged 1 commit into from
Sep 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion extensions/tekton/client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,11 @@
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>tekton-model-triggers</artifactId>
<artifactId>tekton-model-triggers-v1alpha1</artifactId>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>tekton-model-triggers-v1beta1</artifactId>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@
import io.fabric8.tekton.pipeline.v1beta1.TaskList;
import io.fabric8.tekton.pipeline.v1beta1.TaskRun;
import io.fabric8.tekton.pipeline.v1beta1.TaskRunList;
import io.fabric8.tekton.triggers.v1beta1.ClusterTriggerBinding;
import io.fabric8.tekton.triggers.v1beta1.ClusterTriggerBindingList;
import io.fabric8.tekton.triggers.v1beta1.EventListener;
import io.fabric8.tekton.triggers.v1beta1.EventListenerList;
import io.fabric8.tekton.triggers.v1beta1.Trigger;
import io.fabric8.tekton.triggers.v1beta1.TriggerBinding;
import io.fabric8.tekton.triggers.v1beta1.TriggerBindingList;
import io.fabric8.tekton.triggers.v1beta1.TriggerList;
import io.fabric8.tekton.triggers.v1beta1.TriggerTemplate;
import io.fabric8.tekton.triggers.v1beta1.TriggerTemplateList;

public class V1beta1APIGroupClient extends ClientAdapter<V1beta1APIGroupClient> implements V1beta1APIGroupDSL {

Expand Down Expand Up @@ -62,4 +72,29 @@ public MixedOperation<TaskRun, TaskRunList, Resource<TaskRun>> taskRuns() {
public NonNamespaceOperation<ClusterTask, ClusterTaskList, Resource<ClusterTask>> clusterTasks() {
return resources(ClusterTask.class, ClusterTaskList.class);
}

@Override
public MixedOperation<Trigger, TriggerList, Resource<Trigger>> triggers() {
return resources(Trigger.class, TriggerList.class);
}

@Override
public MixedOperation<TriggerTemplate, TriggerTemplateList, Resource<TriggerTemplate>> triggerTemplates() {
return resources(TriggerTemplate.class, TriggerTemplateList.class);
}

@Override
public MixedOperation<TriggerBinding, TriggerBindingList, Resource<TriggerBinding>> triggerBindings() {
return resources(TriggerBinding.class, TriggerBindingList.class);
}

@Override
public MixedOperation<EventListener, EventListenerList, Resource<EventListener>> eventListeners() {
return resources(EventListener.class, EventListenerList.class);
}

@Override
public NonNamespaceOperation<ClusterTriggerBinding, ClusterTriggerBindingList, Resource<ClusterTriggerBinding>> clusterTriggerBindings() {
return resources(ClusterTriggerBinding.class, ClusterTriggerBindingList.class);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,16 @@
import io.fabric8.tekton.pipeline.v1beta1.TaskList;
import io.fabric8.tekton.pipeline.v1beta1.TaskRun;
import io.fabric8.tekton.pipeline.v1beta1.TaskRunList;
import io.fabric8.tekton.triggers.v1beta1.ClusterTriggerBinding;
import io.fabric8.tekton.triggers.v1beta1.ClusterTriggerBindingList;
import io.fabric8.tekton.triggers.v1beta1.EventListener;
import io.fabric8.tekton.triggers.v1beta1.EventListenerList;
import io.fabric8.tekton.triggers.v1beta1.Trigger;
import io.fabric8.tekton.triggers.v1beta1.TriggerBinding;
import io.fabric8.tekton.triggers.v1beta1.TriggerBindingList;
import io.fabric8.tekton.triggers.v1beta1.TriggerList;
import io.fabric8.tekton.triggers.v1beta1.TriggerTemplate;
import io.fabric8.tekton.triggers.v1beta1.TriggerTemplateList;

public interface V1beta1APIGroupDSL extends Client {
/**
Expand Down Expand Up @@ -66,4 +76,38 @@ public interface V1beta1APIGroupDSL extends Client {
*/
NonNamespaceOperation<ClusterTask, ClusterTaskList, Resource<ClusterTask>> clusterTasks();

/**
* API entrypoint for Trigger(triggers.tekton.dev/v1beta1)
*
* @return MixedOperation for Trigger class
*/
MixedOperation<Trigger, TriggerList, Resource<Trigger>> triggers();

/**
* API entrypoint for TriggerTemplate(triggers.tekton.dev/v1beta1)
*
* @return MixedOperation for TriggerTemplate class
*/
MixedOperation<TriggerTemplate, TriggerTemplateList, Resource<TriggerTemplate>> triggerTemplates();

/**
* API entrypoint for TriggerBinding(triggers.tekton.dev/v1beta1)
*
* @return MixedOperation for TriggerBinding class
*/
MixedOperation<TriggerBinding, TriggerBindingList, Resource<TriggerBinding>> triggerBindings();

/**
* API entrypoint for EventListener(triggers.tekton.dev/v1beta1)
*
* @return MixedOperation for EventListener class
*/
MixedOperation<EventListener, EventListenerList, Resource<EventListener>> eventListeners();

/**
* API entrypoint for ClusterTriggerBinding(triggers.tekton.dev/v1beta1)
*
* @return MixedOperation for ClusterTriggerBinding class
*/
NonNamespaceOperation<ClusterTriggerBinding, ClusterTriggerBindingList, Resource<ClusterTriggerBinding>> clusterTriggerBindings();
}
28 changes: 28 additions & 0 deletions extensions/tekton/generator-triggers-v1alpha1/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#
# Copyright (C) 2015 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

SHELL := /bin/bash

all: build

build: gobuild
pushd ../model-triggers-v1alpha1 && \
mvn clean install -o && \
popd

gobuild:
go mod vendor
CGO_ENABLED=0 GO111MODULE=on GO15VENDOREXPERIMENT=1 go run -mod=vendor -a ./cmd/generate/generate.go > ../model-triggers-v1alpha1/src/main/resources/schema/tekton-schema-triggers.json
19 changes: 19 additions & 0 deletions extensions/tekton/generator-triggers-v1alpha1/go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
module github.com/fabric8io/kubernetes-client/extensions/tekton/generator-triggers-v1alpha1

require (
github.com/fabric8io/kubernetes-client/generator v0.0.0
github.com/tektoncd/triggers v0.20.2
k8s.io/apiextensions-apiserver v0.23.4
k8s.io/apimachinery v0.23.5
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible // indirect
knative.dev/pkg v0.0.0-20220329144915-0a1ec2e0d46c
)

replace (
github.com/fabric8io/kubernetes-client/generator v0.0.0 => ./../../../generator
k8s.io/api => k8s.io/api v0.23.5
k8s.io/apimachinery => k8s.io/apimachinery v0.23.5
k8s.io/client-go => k8s.io/client-go v0.23.5
)

go 1.13