change api version

tektoncd · Mar 25, 2020 · e138dd7 · e138dd7
1 parent 28e6565
commit e138dd7
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 58 deletions.
diff --git a/docs/create-ingress.yaml b/docs/create-ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: tekton.dev/v1alpha1
+apiVersion: tekton.dev/v1beta1
 kind: Task
 metadata:
   name: create-ingress
@@ -7,24 +7,23 @@ spec:
   - name: work
     emptyDir: {}
 
-  inputs:
-    params:
-    - name: CreateCertificate
-      description: "Enables/disables the creation of a self-signed certificate for $(inputs.params.ExternalDomain)"
-      default: "true"
-    - name: CertificateKeyPassphrase
-      description: "Phrase that protects private key. This must be provided when the self-signed certificate is created"
-    - name: CertificateSecretName
-      description: "Secret name for Ingress certificate. The Secret should not exist if the self-signed certificate creation is enabled"
-    - name: ExternalDomain
-      description: "The external domain for the EventListener e.g. `$(inputs.params.EventListenerName).PROXYIP.nip.io`"
-    - name: Service
-      description: "The name of the Service used in the Ingress. This will also be the name of the Ingress."
-    - name: ServicePort
-      description: "The service port that the ingress is being created on"
-    - name: ServiceUID
-      description: "The uid of the service. If set, this creates an owner reference on the service"
-      default: ""
+  params:
+  - name: CreateCertificate
+    description: "Enables/disables the creation of a self-signed certificate for $(inputs.params.ExternalDomain)"
+    default: "true"
+  - name: CertificateKeyPassphrase
+    description: "Phrase that protects private key. This must be provided when the self-signed certificate is created"
+  - name: CertificateSecretName
+    description: "Secret name for Ingress certificate. The Secret should not exist if the self-signed certificate creation is enabled"
+  - name: ExternalDomain
+    description: "The external domain for the EventListener e.g. `$(inputs.params.EventListenerName).PROXYIP.nip.io`"
+  - name: Service
+    description: "The name of the Service used in the Ingress. This will also be the name of the Ingress."
+  - name: ServicePort
+    description: "The service port that the ingress is being created on"
+  - name: ServiceUID
+    description: "The uid of the service. If set, this creates an owner reference on the service"
+    default: ""
 
   steps:
   - name: generate-certificate

diff --git a/docs/create-webhook.yaml b/docs/create-webhook.yaml
@@ -1,4 +1,4 @@
-apiVersion: tekton.dev/v1alpha1
+apiVersion: tekton.dev/v1beta1
 kind: Task
 metadata:
   name: create-webhook
@@ -8,28 +8,27 @@ spec:
     secret:
       secretName: $(inputs.params.GitHubSecretName)
 
-  inputs:
-    params:
-    - name: ExternalDomain
-      description: "The external domain for the EventListener e.g. `$(inputs.params.EventListenerName).<PROXYIP>.nip.io`"
-    - name: GitHubUser
-      description: "The GitHub user"
-    - name: GitHubRepo
-      description: "The GitHub repo where the webhook will be created"
-    - name: GitHubOrg
-      description: "The GitHub organization where the webhook will be created"
-    - name: GitHubSecretName
-      description: "The Secret name for GitHub access token. This is always mounted and must exist"
-    - name: GitHubAccessTokenKey
-      description: "The GitHub access token key name"
-    - name: GitHubSecretStringKey
-      description: "The GitHub secret string key name"
-    - name: GitHubDomain
-      description: "The GitHub domain. Override for GitHub Enterprise"
-      default: "github.com"
-    - name: WebhookEvents
-      description: "List of events the webhook will send notifications for"
-      default: '[\"push\",\"pull_request\"]'
+  params:
+  - name: ExternalDomain
+    description: "The external domain for the EventListener e.g. `$(inputs.params.EventListenerName).<PROXYIP>.nip.io`"
+  - name: GitHubUser
+    description: "The GitHub user"
+  - name: GitHubRepo
+    description: "The GitHub repo where the webhook will be created"
+  - name: GitHubOrg
+    description: "The GitHub organization where the webhook will be created"
+  - name: GitHubSecretName
+    description: "The Secret name for GitHub access token. This is always mounted and must exist"
+  - name: GitHubAccessTokenKey
+    description: "The GitHub access token key name"
+  - name: GitHubSecretStringKey
+    description: "The GitHub secret string key name"
+  - name: GitHubDomain
+    description: "The GitHub domain. Override for GitHub Enterprise"
+    default: "github.com"
+  - name: WebhookEvents
+    description: "List of events the webhook will send notifications for"
+    default: '[\"push\",\"pull_request\"]'
   steps:
   - name: create-webhook
     image: pstauffer/curl:latest

diff --git a/pkg/apis/triggers/v1alpha1/event_listener_validation.go b/pkg/apis/triggers/v1alpha1/event_listener_validation.go
@@ -62,7 +62,7 @@ func (t *EventListenerTrigger) validate(ctx context.Context) *apis.FieldError {
 		}
 	}
 	if t.Template.Name == "" {
-		return apis.ErrMissingField(fmt.Sprintf("template.name"))
+		return apis.ErrMissingField("template.name")
 	}
 	for i, interceptor := range t.Interceptors {
 		if err := interceptor.validate(ctx).ViaField(fmt.Sprintf("interceptors[%d]", i)); err != nil {

diff --git a/test/e2e-tests-ingress.sh b/test/e2e-tests-ingress.sh
@@ -140,27 +140,26 @@ EXTERNAL_DOMAIN="${SERVICE_NAME}.192.168.0.1.nip.io"
 
 # Create Ingress using Ingress Task
 cat << DONE | kubectl apply -f -
-apiVersion: tekton.dev/v1alpha1
+apiVersion: tekton.dev/v1beta1
 kind: TaskRun
 metadata:
   name: ${INGRESS_TASKRUN_NAME}
 spec:
   taskRef:
     name: create-ingress
-  inputs:
-    params:
-    - name: CertificateKeyPassphrase
-      value: ${CERTIFICATE_KEY_PASSPHRASE}
-    - name: CertificateSecretName
-      value: ${CERTIFICATE_SECRET_NAME}
-    - name: ExternalDomain
-      value: ${EXTERNAL_DOMAIN}
-    - name: Service
-      value: ${SERVICE_NAME}
-    - name: ServicePort
-      value: "8080"
-    - name: ServiceUID
-      value: ${SERVICE_UID}
+  params:
+  - name: CertificateKeyPassphrase
+    value: ${CERTIFICATE_KEY_PASSPHRASE}
+  - name: CertificateSecretName
+    value: ${CERTIFICATE_SECRET_NAME}
+  - name: ExternalDomain
+    value: ${EXTERNAL_DOMAIN}
+  - name: Service
+    value: ${SERVICE_NAME}
+  - name: ServicePort
+    value: "8080"
+  - name: ServiceUID
+    value: ${SERVICE_UID}
   timeout: 1000s
   serviceAccountName: default
 DONE