From e09a8eeca67371b5fb50bbe088022c8a3933d0d9 Mon Sep 17 00:00:00 2001 From: Jaideep Rao Date: Fri, 26 May 2023 16:11:58 -0400 Subject: [PATCH] chore: Update k3s version in github actions (#907) * upgrade k3s version to latest --------- Signed-off-by: Jaideep Rao --- .github/workflows/ci-build.yaml | 2 +- api/v1alpha1/argocd_types.go | 34 +++++++++++++++--------------- api/v1alpha1/argocdexport_types.go | 32 ++++++++++++++-------------- api/v1alpha1/groupversion_info.go | 4 ++-- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index 36a20a484..28700d9fc 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -46,7 +46,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - k3s-version: [ v1.22.5 ] + k3s-version: [ v1.27.1 ] # k3s-version: [v1.20.2, v1.19.2, v1.18.9, v1.17.11, v1.16.15] steps: - name: Download kuttl plugin diff --git a/api/v1alpha1/argocd_types.go b/api/v1alpha1/argocd_types.go index fa1c2fa91..8e257ddbe 100644 --- a/api/v1alpha1/argocd_types.go +++ b/api/v1alpha1/argocd_types.go @@ -39,22 +39,22 @@ func init() { // ArgoCD is the Schema for the argocds API // +k8s:openapi-gen=true // +kubebuilder:subresource:status -//+operator-sdk:csv:customresourcedefinitions:resources={{ArgoCD,v1alpha1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{ArgoCDExport,v1alpha1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{ConfigMap,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{CronJob,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{Deployment,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{Ingress,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{Job,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{PersistentVolumeClaim,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{Pod,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{Prometheus,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{ReplicaSet,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{Route,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{Secret,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{Service,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{ServiceMonitor,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{StatefulSet,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{ArgoCD,v1alpha1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{ArgoCDExport,v1alpha1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{ConfigMap,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{CronJob,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{Deployment,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{Ingress,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{Job,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{PersistentVolumeClaim,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{Pod,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{Prometheus,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{ReplicaSet,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{Route,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{Secret,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{Service,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{ServiceMonitor,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{StatefulSet,v1,""}} type ArgoCD struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` @@ -637,7 +637,7 @@ type ArgoCDMonitoringSpec struct { Enabled bool `json:"enabled"` } -//ArgoCDNodePlacementSpec is used to specify NodeSelector and Tolerations for Argo CD workloads +// ArgoCDNodePlacementSpec is used to specify NodeSelector and Tolerations for Argo CD workloads type ArgoCDNodePlacementSpec struct { // NodeSelector is a field of PodSpec, it is a map of key value pairs used for node selection NodeSelector map[string]string `json:"nodeSelector,omitempty"` diff --git a/api/v1alpha1/argocdexport_types.go b/api/v1alpha1/argocdexport_types.go index eb7e12481..f9e0e222c 100644 --- a/api/v1alpha1/argocdexport_types.go +++ b/api/v1alpha1/argocdexport_types.go @@ -30,22 +30,22 @@ import ( // +k8s:openapi-gen=true // +kubebuilder:subresource:status // +kubebuilder:resource:path=argocdexports,scope=Namespaced -//+operator-sdk:csv:customresourcedefinitions:resources={{ArgoCD,v1alpha1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{ArgoCDExport,v1alpha1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{ConfigMap,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{CronJob,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{Deployment,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{Ingress,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{Job,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{PersistentVolumeClaim,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{Pod,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{Prometheus,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{ReplicaSet,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{Route,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{Secret,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{Service,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{ServiceMonitor,v1,""}} -//+operator-sdk:csv:customresourcedefinitions:resources={{StatefulSet,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{ArgoCD,v1alpha1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{ArgoCDExport,v1alpha1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{ConfigMap,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{CronJob,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{Deployment,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{Ingress,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{Job,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{PersistentVolumeClaim,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{Pod,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{Prometheus,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{ReplicaSet,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{Route,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{Secret,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{Service,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{ServiceMonitor,v1,""}} +// +operator-sdk:csv:customresourcedefinitions:resources={{StatefulSet,v1,""}} type ArgoCDExport struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/api/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go index 529170a0a..54238ded5 100644 --- a/api/v1alpha1/groupversion_info.go +++ b/api/v1alpha1/groupversion_info.go @@ -15,8 +15,8 @@ limitations under the License. */ // Package v1alpha1 contains API Schema definitions for the argoproj.io v1alpha1 API group -//+kubebuilder:object:generate=true -//+groupName=argoproj.io +// +kubebuilder:object:generate=true +// +groupName=argoproj.io package v1alpha1 import (