Skip to content
This repository has been archived by the owner on Oct 15, 2024. It is now read-only.

Commit

Permalink
Update makefile components (#314)
Browse files Browse the repository at this point in the history
- envtest to `v1.30.0`
- controller-gen to `v0.15.0`
- kustomize to `v5.4.1`
  • Loading branch information
damyan authored May 15, 2024
1 parent a1a56c2 commit ea6f194
Show file tree
Hide file tree
Showing 25 changed files with 3,975 additions and 3,445 deletions.
6 changes: 3 additions & 3 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
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
ENVTEST_K8S_VERSION = 1.26.0
ENVTEST_K8S_VERSION = 1.30.0

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
ifeq (,$(shell go env GOBIN))
Expand Down Expand Up @@ -146,8 +146,8 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
ENVTEST ?= $(LOCALBIN)/setup-envtest

## Tool Versions
KUSTOMIZE_VERSION ?= v3.8.7
CONTROLLER_TOOLS_VERSION ?= v0.11.1
KUSTOMIZE_VERSION ?= v5.4.1
CONTROLLER_TOOLS_VERSION ?= v0.15.0

KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
.PHONY: kustomize
Expand Down
1 change: 0 additions & 1 deletion apis/etherpad/v1alpha2/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion apis/jitsi/v1beta1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion apis/jitsiautoscaler/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion apis/whiteboard/v1alpha2/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

718 changes: 384 additions & 334 deletions config/crd/bases/jitsi.meeting.ko_jibris.yaml

Large diffs are not rendered by default.

554 changes: 293 additions & 261 deletions config/crd/bases/jitsi.meeting.ko_jicofoes.yaml

Large diffs are not rendered by default.

718 changes: 384 additions & 334 deletions config/crd/bases/jitsi.meeting.ko_jigasis.yaml

Large diffs are not rendered by default.

554 changes: 293 additions & 261 deletions config/crd/bases/jitsi.meeting.ko_jvbs.yaml

Large diffs are not rendered by default.

285 changes: 155 additions & 130 deletions config/crd/bases/jitsi.meeting.ko_prosodies.yaml

Large diffs are not rendered by default.

285 changes: 155 additions & 130 deletions config/crd/bases/jitsi.meeting.ko_webs.yaml

Large diffs are not rendered by default.

20 changes: 12 additions & 8 deletions config/crd/bases/meeting.ko_autoscalers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.15.0
name: autoscalers.meeting.ko
spec:
group: meeting.ko
Expand All @@ -21,14 +20,19 @@ spec:
description: AutoScaler is the Schema for the autoScalers API.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand Down
285 changes: 155 additions & 130 deletions config/crd/bases/meeting.ko_etherpads.yaml

Large diffs are not rendered by default.

285 changes: 155 additions & 130 deletions config/crd/bases/meeting.ko_whiteboards.yaml

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: meeting-role
rules:
- apiGroups:
Expand Down
718 changes: 384 additions & 334 deletions deploy/helm/meeting-chart/crds/jitsi.meeting.ko_jibris.yaml

Large diffs are not rendered by default.

554 changes: 293 additions & 261 deletions deploy/helm/meeting-chart/crds/jitsi.meeting.ko_jicofoes.yaml

Large diffs are not rendered by default.

718 changes: 384 additions & 334 deletions deploy/helm/meeting-chart/crds/jitsi.meeting.ko_jigasis.yaml

Large diffs are not rendered by default.

554 changes: 293 additions & 261 deletions deploy/helm/meeting-chart/crds/jitsi.meeting.ko_jvbs.yaml

Large diffs are not rendered by default.

285 changes: 155 additions & 130 deletions deploy/helm/meeting-chart/crds/jitsi.meeting.ko_prosodies.yaml

Large diffs are not rendered by default.

285 changes: 155 additions & 130 deletions deploy/helm/meeting-chart/crds/jitsi.meeting.ko_webs.yaml

Large diffs are not rendered by default.

20 changes: 12 additions & 8 deletions deploy/helm/meeting-chart/crds/meeting.ko_autoscalers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.15.0
name: autoscalers.meeting.ko
spec:
group: meeting.ko
Expand All @@ -21,14 +20,19 @@ spec:
description: AutoScaler is the Schema for the autoScalers API.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand Down
Loading

0 comments on commit ea6f194

Please sign in to comment.