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

Bump k8s version #241

Merged
merged 2 commits into from
Nov 22, 2024
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/actions/create-k3d-cluster/action.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
name: 'Create k3d cluster'
description: 'Action for creating k3d cluster'
name: "Create k3d cluster"
description: "Action for creating k3d cluster"

runs:
using: 'composite'
using: "composite"
steps:
- name: create k3d cluster
uses: AbsaOSS/k3d-action@4e8b3239042be1dc0aed6c5eb80c13b18200fc79 #v2.4.0
with:
k3d-version: "v5.7.4"
cluster-name: "k3dCluster"
args: >-
--agents 1
--image rancher/k3s:v1.29.3-k3s1
--image rancher/k3s:v1.31.2-k3s1
--port 80:80@loadbalancer
--port 443:443@loadbalancer
--wait
1 change: 0 additions & 1 deletion components/operator/api/v1alpha1/dockerregistry_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ type DockerRegistryStatus struct {

// State signifies current state of DockerRegistry.
// Value can be one of ("Ready", "Processing", "Error", "Deleting").
// +kubebuilder:validation:Required
// +kubebuilder:validation:Enum=Processing;Deleting;Ready;Error;Warning
State State `json:"state,omitempty"`

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.5
name: dockerregistries.operator.kyma-project.io
spec:
group: operator.kyma-project.io
Expand Down Expand Up @@ -135,16 +135,8 @@ spec:
conditions:
description: Conditions associated with CustomStatus.
items:
description: "Condition contains details for one aspect of the current
state of this API Resource.\n---\nThis struct is intended for
direct use as an array at the field path .status.conditions. For
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
observations of a foo's current state.\n\t // Known .status.conditions.type
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
\ // other fields\n\t}"
description: Condition contains details for one aspect of the current
state of this API Resource.
properties:
lastTransitionTime:
description: |-
Expand Down Expand Up @@ -185,12 +177,7 @@ spec:
- Unknown
type: string
type:
description: |-
type of condition in CamelCase or in foo.example.com/CamelCase.
---
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
useful (see .node.status.conditions), the ability to deconflict is important.
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
description: type of condition in CamelCase or in foo.example.com/CamelCase.
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
Expand Down
102 changes: 2 additions & 100 deletions config/operator/base/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,8 @@ rules:
- ""
resources:
- configmaps
- secrets
- serviceaccounts
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
- configmaps
- namespaces
- persistentvolumeclaims
- secrets
- serviceaccounts
- services
Expand All @@ -44,19 +32,6 @@ rules:
- list
- patch
- watch
- apiGroups:
- ""
resources:
- namespaces
verbs:
- create
- delete
- deletecollection
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
Expand All @@ -65,31 +40,6 @@ rules:
- get
- list
- watch
- apiGroups:
- ""
resources:
- persistentvolumeclaims
verbs:
- create
- delete
- deletecollection
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
- secrets
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- admissionregistration.k8s.io
resources:
Expand Down Expand Up @@ -121,18 +71,6 @@ rules:
- apps
resources:
- daemonsets
verbs:
- create
- delete
- deletecollection
- get
- list
- patch
- update
- watch
- apiGroups:
- apps
resources:
- deployments
verbs:
- create
Expand Down Expand Up @@ -225,31 +163,7 @@ rules:
- operator.kyma-project.io
resources:
- dockerregistries
verbs:
- create
- delete
- deletecollection
- get
- list
- patch
- update
- watch
- apiGroups:
- operator.kyma-project.io
resources:
- dockerregistries/finalizers
verbs:
- create
- delete
- deletecollection
- get
- list
- patch
- update
- watch
- apiGroups:
- operator.kyma-project.io
resources:
- dockerregistries/status
verbs:
- create
Expand All @@ -271,18 +185,6 @@ rules:
resources:
- clusterrolebindings
- clusterroles
verbs:
- create
- delete
- deletecollection
- get
- list
- patch
- update
- watch
- apiGroups:
- rbac.authorization.k8s.io
resources:
- rolebindings
- roles
verbs:
Expand Down
2 changes: 1 addition & 1 deletion hack/gardener.mk
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SHOOT=test-${GIT_COMMIT_SHA}
ifneq (,$(GARDENER_SA_PATH))
GARDENER_K8S_VERSION=$(shell kubectl --kubeconfig=${GARDENER_SA_PATH} get cloudprofiles.core.gardener.cloud ${GARDENER_INFRASTRUCTURE} -o=jsonpath='{.spec.kubernetes.versions[0].version}')
else
GARDENER_K8S_VERSION=1.29.3
GARDENER_K8S_VERSION=1.31.2
endif

.PHONY: provision-gardener
Expand Down
6 changes: 3 additions & 3 deletions hack/tools.mk
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ $(KYMA):

########## Kustomize ###########
KUSTOMIZE ?= $(LOCALBIN)/kustomize
KUSTOMIZE_VERSION ?= v4.5.5
KUSTOMIZE_VERSION ?= v5.5.0
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"

.PHONY: kustomize
Expand All @@ -40,7 +40,7 @@ $(KUSTOMIZE): $(LOCALBIN)
test -s $(LOCALBIN)/kustomize || { curl -Ss $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); }

########## Controller-Gen ###########
CONTROLLER_TOOLS_VERSION ?= v0.14.0
CONTROLLER_TOOLS_VERSION ?= v0.16.5
CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen

.PHONY: controller-gen $(CONTROLLER_GEN)
Expand All @@ -57,7 +57,7 @@ $(error Error: path is empty: $1)
endef

# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.27.1
ENVTEST_K8S_VERSION = 1.30.0

.PHONY: envtest
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
Expand Down
Loading