Skip to content

Commit

Permalink
Merge pull request #17 from gianlucam76/release-0.34
Browse files Browse the repository at this point in the history
Release v0.34.1
  • Loading branch information
gianlucam76 authored Jul 12, 2024
2 parents e474136 + a7fe248 commit 1246284
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARCH ?= $(shell go env GOARCH)
OS ?= $(shell uname -s | tr A-Z a-z)
K8S_LATEST_VER ?= $(shell curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
TAG ?= v0.34.0
TAG ?= v0.34.1

# Directories.
ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
Expand Down
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ require (
github.com/TwiN/go-color v1.4.1
github.com/onsi/ginkgo/v2 v2.19.0
github.com/onsi/gomega v1.33.1
github.com/projectsveltos/addon-controller v0.34.0
github.com/projectsveltos/event-manager v0.34.0
github.com/projectsveltos/libsveltos v0.34.0
github.com/projectsveltos/sveltosctl v0.34.0
github.com/projectsveltos/addon-controller v0.34.1
github.com/projectsveltos/event-manager v0.34.1
github.com/projectsveltos/libsveltos v0.34.1
github.com/projectsveltos/sveltosctl v0.34.1
github.com/spf13/pflag v1.0.5
k8s.io/api v0.30.2
k8s.io/apimachinery v0.30.2
Expand Down
16 changes: 8 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,14 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/projectsveltos/addon-controller v0.34.0 h1:gC8FX8IqdrmxFppanph+R9esiwr0W5ocuCGVT9fzKfo=
github.com/projectsveltos/addon-controller v0.34.0/go.mod h1:8yKll7KzXaCqDNZEiCD2lHGEHNrUPWq4kNA5OrCu0s0=
github.com/projectsveltos/event-manager v0.34.0 h1:MkMJEfUaOxBJ3EtI0BZAsVBKl6xRwWeGbAQ9tuH/Dks=
github.com/projectsveltos/event-manager v0.34.0/go.mod h1:FDOSj6/JiX/8OJRHOigOWRi+bUZ9dnklKe/IStADM2M=
github.com/projectsveltos/libsveltos v0.34.0 h1:1HYQR/Q2RkWPOZre9QJowKTUuX4PnU6x2/ev6A3xYes=
github.com/projectsveltos/libsveltos v0.34.0/go.mod h1:U5pdpUNAgHaI5JAmZRHBu/Crf11h/wTAZ2H5cXef6bg=
github.com/projectsveltos/sveltosctl v0.34.0 h1:c3wWInYJ/ESc9La2uXjT//NmZUB6Tjf8qWrQIxovpTg=
github.com/projectsveltos/sveltosctl v0.34.0/go.mod h1:JQhmFsHB910gC/N9P9e+os5XvgHvSmYlT9OSJK8CdpU=
github.com/projectsveltos/addon-controller v0.34.1 h1:VUDYRVtbdh1ozagd3QohxCvA33AQOtKwQr4OE5jwFtI=
github.com/projectsveltos/addon-controller v0.34.1/go.mod h1:lcdId90dNWjGwBH9cPV8YZsgYD2AjI2rOx/o4i63qPw=
github.com/projectsveltos/event-manager v0.34.1 h1:PDE1NBSIb8rmxesYCFZZEB3slZ09PJqqIwBnoqJERYw=
github.com/projectsveltos/event-manager v0.34.1/go.mod h1:wJapJ7pyrCNoX/zRuxnJh/TqxYSxKddlIhrj9xKJvj0=
github.com/projectsveltos/libsveltos v0.34.1 h1:x85Y09xrTgUPFDIkxHYCl/sNz61Oxx5yaMl1K6dI6M0=
github.com/projectsveltos/libsveltos v0.34.1/go.mod h1:U5pdpUNAgHaI5JAmZRHBu/Crf11h/wTAZ2H5cXef6bg=
github.com/projectsveltos/sveltosctl v0.34.1 h1:p4xMprABjDUPQ8imwKa5mBc4V1rXe5yt9oanVv7gu8c=
github.com/projectsveltos/sveltosctl v0.34.1/go.mod h1:3LinU5U/wAseIpnrV6C62mMGBk4Z0hi8QigukLRw5BM=
github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE=
github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho=
github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
Expand Down
2 changes: 1 addition & 1 deletion k8s/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
containers:
- command:
- /conversion-webhook
image: projectsveltos/webhook-conversion:v0.34.0
image: projectsveltos/webhook-conversion:v0.34.1
name: sveltos-webhook
ports:
- containerPort: 9443
Expand Down
2 changes: 1 addition & 1 deletion manifest/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
containers:
- command:
- /conversion-webhook
image: projectsveltos/webhook-conversion:v0.34.0
image: projectsveltos/webhook-conversion:v0.34.1
name: sveltos-webhook
ports:
- containerPort: 9443
Expand Down
18 changes: 18 additions & 0 deletions test/fv/eventtrigger_conversion_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"github.com/projectsveltos/event-manager/api/v1alpha1"
"github.com/projectsveltos/event-manager/api/v1beta1"
libsveltosv1alpha1 "github.com/projectsveltos/libsveltos/api/v1alpha1"
libsveltosv1beta1 "github.com/projectsveltos/libsveltos/api/v1beta1"
)

var _ = Describe("EventTrigger", func() {
Expand Down Expand Up @@ -64,6 +65,23 @@ var _ = Describe("EventTrigger", func() {
Expect(len(dst.Spec.SourceClusterSelector.LabelSelector.MatchLabels)).To(Equal(1))
Expect(dst.Spec.SourceClusterSelector.LabelSelector.MatchLabels[key]).To(Equal(value))

Byf("Setting EventTrigger.v1beta1 Patches")
dst.Spec.Patches = []libsveltosv1beta1.Patch{
{
Patch: `- op: add
path: /metadata/annotations/projectsveltos.io~1driftDetectionIgnore
value: ok`,
Target: &libsveltosv1beta1.PatchSelector{
Group: "apps",
Version: "v1",
Kind: "Deployment",
Namespace: "kyverno",
Name: "kyverno-admission-controller",
},
},
}
Expect(k8sClient.Update(context.TODO(), dst)).To(Succeed())

currentEventTrigger := &v1alpha1.EventTrigger{}
Expect(k8sClient.Get(context.TODO(),
types.NamespacedName{Name: eventTrigger.Name},
Expand Down

0 comments on commit 1246284

Please sign in to comment.