Skip to content

Commit

Permalink
Merge pull request #216 from gianlucam76/prep
Browse files Browse the repository at this point in the history
Prepare for release v0.36.0
  • Loading branch information
gianlucam76 authored Aug 17, 2024
2 parents 84a892a + c1dcf63 commit da70cdd
Show file tree
Hide file tree
Showing 11 changed files with 283 additions and 382 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7
- name: Set up Go
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # tag=v5.0.1
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # tag=v5.0.2
with:
go-version: 1.22.0
go-version: 1.22.5
- name: Build
run: make build
- name: FMT
Expand All @@ -33,11 +33,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7
- name: Set up Go
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # tag=v5.0.1
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # tag=v5.0.2
with:
go-version: 1.22.0
go-version: 1.22.5
- name: ut
run: make test
env:
Expand All @@ -46,11 +46,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7
- name: Set up Go
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # tag=v5.0.1
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # tag=v5.0.2
with:
go-version: 1.22.0
go-version: 1.22.5
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@main
with:
Expand All @@ -74,11 +74,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # tag=v4.1.5
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag=v4.1.7
- name: Set up Go
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # tag=v5.0.1
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # tag=v5.0.2
with:
go-version: 1.22.0
go-version: 1.22.5
- name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@main
with:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.22 AS builder
FROM golang:1.22.5 AS builder

ARG BUILDOS
ARG TARGETARCH
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Image URL to use all building/pushing image targets
IMG ?= controller:latest
# KUBEBUILDER_ENVTEST_KUBERNETES_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
KUBEBUILDER_ENVTEST_KUBERNETES_VERSION = 1.30.0
KUBEBUILDER_ENVTEST_KUBERNETES_VERSION = 1.31.0

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
ifeq (,$(shell go env GOBIN))
Expand All @@ -25,7 +25,7 @@ ARCH ?= amd64
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 ?= main
TAG ?= v0.36.0

.PHONY: all
all: build
Expand Down Expand Up @@ -67,8 +67,8 @@ CLUSTERCTL := $(TOOLS_BIN_DIR)/clusterctl
KIND := $(TOOLS_BIN_DIR)/kind
KUBECTL := $(TOOLS_BIN_DIR)/kubectl

GOLANGCI_LINT_VERSION := "v1.57.2"
CLUSTERCTL_VERSION := "v1.7.4"
GOLANGCI_LINT_VERSION := "v1.59.0"
CLUSTERCTL_VERSION := "v1.8.1"


KUSTOMIZE_VER := v5.3.0
Expand Down Expand Up @@ -167,7 +167,7 @@ endif
# K8S_VERSION for the Kind cluster can be set as environment variable. If not defined,
# this default value is used
ifndef K8S_VERSION
K8S_VERSION := v1.30.0
K8S_VERSION := v1.31.0
endif

KIND_CONFIG ?= kind-cluster.yaml
Expand Down
2 changes: 1 addition & 1 deletion config/default/manager_image_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ spec:
spec:
containers:
# Change the value of image field below to your controller image URL
- image: docker.io/projectsveltos/healthcheck-manager:main
- image: docker.io/projectsveltos/healthcheck-manager:v0.36.0
name: manager
59 changes: 3 additions & 56 deletions config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,29 +47,8 @@ rules:
- cluster.x-k8s.io
resources:
- clusters
verbs:
- get
- list
- watch
- apiGroups:
- cluster.x-k8s.io
resources:
- clusters/status
verbs:
- get
- list
- watch
- apiGroups:
- cluster.x-k8s.io
resources:
- machines
verbs:
- get
- list
- watch
- apiGroups:
- cluster.x-k8s.io
resources:
- machines/status
verbs:
- get
Expand All @@ -79,13 +58,6 @@ rules:
- config.projectsveltos.io
resources:
- clustersummaries
verbs:
- get
- list
- watch
- apiGroups:
- config.projectsveltos.io
resources:
- clustersummaries/status
verbs:
- get
Expand All @@ -95,6 +67,7 @@ rules:
- lib.projectsveltos.io
resources:
- clusterhealthchecks
- reloaderreports
verbs:
- create
- delete
Expand All @@ -121,39 +94,21 @@ rules:
- lib.projectsveltos.io
resources:
- debuggingconfigurations
verbs:
- get
- list
- watch
- apiGroups:
- lib.projectsveltos.io
resources:
- healthcheckreports
verbs:
- create
- delete
- get
- list
- update
- watch
- apiGroups:
- lib.projectsveltos.io
resources:
- healthchecks
- sveltosclusters/status
verbs:
- get
- list
- watch
- apiGroups:
- lib.projectsveltos.io
resources:
- reloaderreports
- healthcheckreports
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
Expand All @@ -165,11 +120,3 @@ rules:
- list
- update
- watch
- apiGroups:
- lib.projectsveltos.io
resources:
- sveltosclusters/status
verbs:
- get
- list
- watch
Loading

0 comments on commit da70cdd

Please sign in to comment.