diff --git a/.github/actions/create-k3d-cluster/action.yaml b/.github/actions/create-k3d-cluster/action.yaml index 47d423cf..d4e5ea46 100644 --- a/.github/actions/create-k3d-cluster/action.yaml +++ b/.github/actions/create-k3d-cluster/action.yaml @@ -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 diff --git a/components/operator/api/v1alpha1/dockerregistry_types.go b/components/operator/api/v1alpha1/dockerregistry_types.go index 52525ef2..eccf7bda 100644 --- a/components/operator/api/v1alpha1/dockerregistry_types.go +++ b/components/operator/api/v1alpha1/dockerregistry_types.go @@ -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"` diff --git a/config/operator/base/crd/bases/operator.kyma-project.io_dockerregistries.yaml b/config/operator/base/crd/bases/operator.kyma-project.io_dockerregistries.yaml index 56e314d2..49254788 100644 --- a/config/operator/base/crd/bases/operator.kyma-project.io_dockerregistries.yaml +++ b/config/operator/base/crd/bases/operator.kyma-project.io_dockerregistries.yaml @@ -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 @@ -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: |- @@ -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 diff --git a/config/operator/base/rbac/role.yaml b/config/operator/base/rbac/role.yaml index 31e06fc0..35870270 100644 --- a/config/operator/base/rbac/role.yaml +++ b/config/operator/base/rbac/role.yaml @@ -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 @@ -44,19 +32,6 @@ rules: - list - patch - watch -- apiGroups: - - "" - resources: - - namespaces - verbs: - - create - - delete - - deletecollection - - get - - list - - patch - - update - - watch - apiGroups: - "" resources: @@ -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: @@ -121,18 +71,6 @@ rules: - apps resources: - daemonsets - verbs: - - create - - delete - - deletecollection - - get - - list - - patch - - update - - watch -- apiGroups: - - apps - resources: - deployments verbs: - create @@ -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 @@ -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: diff --git a/hack/gardener.mk b/hack/gardener.mk index 8b78a6cc..c36d5a7f 100644 --- a/hack/gardener.mk +++ b/hack/gardener.mk @@ -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 diff --git a/hack/tools.mk b/hack/tools.mk index 38acb93a..326ce3ad 100644 --- a/hack/tools.mk +++ b/hack/tools.mk @@ -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 @@ -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) @@ -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.