diff --git a/.github/workflows/notebook_controller_integration_test.yaml b/.github/workflows/notebook_controller_integration_test.yaml index dd8caffe5fa..4482902ba6e 100644 --- a/.github/workflows/notebook_controller_integration_test.yaml +++ b/.github/workflows/notebook_controller_integration_test.yaml @@ -89,7 +89,7 @@ jobs: export PR_NOTEBOOK_IMG=localhost/${{env.IMG}}:${{env.TAG}} kustomize edit set image ${CURRENT_NOTEBOOK_IMG}=${PR_NOTEBOOK_IMG} - cat < params.env - cat <> $GITHUB_OUTPUT - name: Create pull request - uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6.1.0 + uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5 with: branch: ${{ steps.prepare.outputs.branch }} title: "Sync `${{ github.event.inputs.target }}` branch with `${{ github.event.inputs.source }}` branch" diff --git a/components/notebook-controller/Makefile b/components/notebook-controller/Makefile index 16f20349b02..019d1bd92eb 100644 --- a/components/notebook-controller/Makefile +++ b/components/notebook-controller/Makefile @@ -143,18 +143,18 @@ $(LOCALBIN): ## Ensure that the directory exists CONTROLLER_GEN = $(LOCALBIN)/controller-gen .PHONY: controller-gen controller-gen: ## Download controller-gen locally if necessary. - GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0 + GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.3 KUSTOMIZE = $(shell pwd)/bin/kustomize .PHONY: kustomize kustomize: ## Download kustomize locally if necessary. - $(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/v3/cmd/kustomize@v3.2.0) + $(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/v3/cmd/kustomize@v5.0.2) ENVTEST = $(shell pwd)/bin/setup-envtest -ENVTEST_VERSION?=release-0.14 +ENVTEST_VERSION?=v0.0.0-20240923090159-236e448db12c .PHONY: envtest -envtest: ## Download envtest-setup locally if necessary. +envtest: ## Download setup-envtest locally if necessary. $(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@$(ENVTEST_VERSION)) # go-get-tool will 'go get' any package $2 and install it to $1. diff --git a/components/notebook-controller/api/v1/zz_generated.deepcopy.go b/components/notebook-controller/api/v1/zz_generated.deepcopy.go index c786e832027..e94e9579e80 100644 --- a/components/notebook-controller/api/v1/zz_generated.deepcopy.go +++ b/components/notebook-controller/api/v1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* diff --git a/components/notebook-controller/api/v1alpha1/zz_generated.deepcopy.go b/components/notebook-controller/api/v1alpha1/zz_generated.deepcopy.go index 876bdb4dad7..d1d5cb19439 100644 --- a/components/notebook-controller/api/v1alpha1/zz_generated.deepcopy.go +++ b/components/notebook-controller/api/v1alpha1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* diff --git a/components/notebook-controller/api/v1beta1/zz_generated.deepcopy.go b/components/notebook-controller/api/v1beta1/zz_generated.deepcopy.go index c5c3d62abe1..f90e19f9631 100644 --- a/components/notebook-controller/api/v1beta1/zz_generated.deepcopy.go +++ b/components/notebook-controller/api/v1beta1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* diff --git a/components/notebook-controller/config/crd/bases/kubeflow.org_notebooks.yaml b/components/notebook-controller/config/crd/bases/kubeflow.org_notebooks.yaml index 38972807ca8..58637858839 100644 --- a/components/notebook-controller/config/crd/bases/kubeflow.org_notebooks.yaml +++ b/components/notebook-controller/config/crd/bases/kubeflow.org_notebooks.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.8.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.16.3 name: notebooks.kubeflow.org spec: group: kubeflow.org @@ -76,6 +75,7 @@ spec: type: object type: array type: object + x-kubernetes-map-type: atomic weight: format: int32 type: integer @@ -122,10 +122,12 @@ spec: type: object type: array type: object + x-kubernetes-map-type: atomic type: array required: - nodeSelectorTerms type: object + x-kubernetes-map-type: atomic type: object podAffinity: properties: @@ -157,6 +159,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -190,6 +193,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic namespaces: items: type: string @@ -233,6 +237,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -266,6 +271,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic namespaces: items: type: string @@ -307,6 +313,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -340,6 +347,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic namespaces: items: type: string @@ -383,6 +391,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -416,6 +425,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic namespaces: items: type: string @@ -461,6 +471,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic fieldRef: properties: apiVersion: @@ -470,6 +481,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: properties: containerName: @@ -485,6 +497,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: properties: key: @@ -496,6 +509,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name @@ -511,6 +525,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic prefix: type: string secretRef: @@ -520,6 +535,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic type: object type: array image: @@ -573,6 +589,14 @@ spec: required: - seconds type: object + sleep: + properties: + seconds: + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: properties: host: @@ -631,6 +655,14 @@ spec: required: - seconds type: object + sleep: + properties: + seconds: + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: properties: host: @@ -663,6 +695,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -767,6 +800,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -952,6 +986,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1115,6 +1150,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic fieldRef: properties: apiVersion: @@ -1124,6 +1160,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: properties: containerName: @@ -1139,6 +1176,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: properties: key: @@ -1150,6 +1188,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name @@ -1165,6 +1204,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic prefix: type: string secretRef: @@ -1174,6 +1214,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic type: object type: array image: @@ -1227,6 +1268,14 @@ spec: required: - seconds type: object + sleep: + properties: + seconds: + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: properties: host: @@ -1317,6 +1366,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1421,6 +1471,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1606,6 +1657,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1735,6 +1787,8 @@ spec: type: boolean hostUsers: type: boolean + hostUsers: + type: boolean hostname: type: string imagePullSecrets: @@ -1743,6 +1797,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic type: array initContainers: items: @@ -1775,6 +1830,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic fieldRef: properties: apiVersion: @@ -1784,6 +1840,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: properties: containerName: @@ -1799,6 +1856,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: properties: key: @@ -1810,6 +1868,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name @@ -1825,6 +1884,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic prefix: type: string secretRef: @@ -1834,6 +1894,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic type: object type: array image: @@ -1945,6 +2006,14 @@ spec: required: - seconds type: object + sleep: + properties: + seconds: + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: properties: host: @@ -1977,6 +2046,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2081,6 +2151,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2266,6 +2337,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2568,6 +2640,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -2661,6 +2734,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic user: type: string required: @@ -2677,6 +2751,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic volumeID: type: string required: @@ -2707,6 +2782,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic csi: properties: driver: @@ -2718,6 +2794,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic readOnly: type: boolean volumeAttributes: @@ -2744,6 +2821,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: format: int32 type: integer @@ -2764,6 +2842,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object @@ -2804,6 +2883,7 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic dataSourceRef: properties: apiGroup: @@ -2860,6 +2940,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic storageClassName: type: string volumeAttributesClassName: @@ -2908,6 +2989,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic required: - driver type: object @@ -2992,6 +3074,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic targetPortal: type: string required: @@ -3075,6 +3158,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic name: type: string optional: @@ -3108,6 +3192,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic downwardAPI: properties: items: @@ -3122,6 +3207,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: format: int32 type: integer @@ -3142,6 +3228,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object @@ -3169,6 +3256,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic serviceAccountToken: properties: audience: @@ -3223,6 +3311,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic user: type: string required: @@ -3244,6 +3333,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic sslEnabled: type: boolean storageMode: @@ -3295,6 +3385,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic volumeName: type: string volumeNamespace: @@ -3459,6 +3550,7 @@ spec: type: object type: array type: object + x-kubernetes-map-type: atomic weight: format: int32 type: integer @@ -3505,10 +3597,12 @@ spec: type: object type: array type: object + x-kubernetes-map-type: atomic type: array required: - nodeSelectorTerms type: object + x-kubernetes-map-type: atomic type: object podAffinity: properties: @@ -3540,6 +3634,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -3573,6 +3668,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic namespaces: items: type: string @@ -3616,6 +3712,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -3649,6 +3746,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic namespaces: items: type: string @@ -3690,6 +3788,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -3723,6 +3822,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic namespaces: items: type: string @@ -3766,6 +3866,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -3799,6 +3900,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic namespaces: items: type: string @@ -3844,6 +3946,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic fieldRef: properties: apiVersion: @@ -3853,6 +3956,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: properties: containerName: @@ -3868,6 +3972,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: properties: key: @@ -3879,6 +3984,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name @@ -3894,6 +4000,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic prefix: type: string secretRef: @@ -3903,6 +4010,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic type: object type: array image: @@ -3956,6 +4064,14 @@ spec: required: - seconds type: object + sleep: + properties: + seconds: + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: properties: host: @@ -4014,6 +4130,14 @@ spec: required: - seconds type: object + sleep: + properties: + seconds: + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: properties: host: @@ -4046,6 +4170,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4150,6 +4275,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4335,6 +4461,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4498,6 +4625,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic fieldRef: properties: apiVersion: @@ -4507,6 +4635,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: properties: containerName: @@ -4522,6 +4651,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: properties: key: @@ -4533,6 +4663,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name @@ -4548,6 +4679,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic prefix: type: string secretRef: @@ -4557,6 +4689,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic type: object type: array image: @@ -4610,6 +4743,14 @@ spec: required: - seconds type: object + sleep: + properties: + seconds: + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: properties: host: @@ -4668,6 +4809,14 @@ spec: required: - seconds type: object + sleep: + properties: + seconds: + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: properties: host: @@ -4700,6 +4849,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4804,6 +4954,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4989,6 +5140,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -5126,6 +5278,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic type: array initContainers: items: @@ -5158,6 +5311,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic fieldRef: properties: apiVersion: @@ -5167,6 +5321,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: properties: containerName: @@ -5182,6 +5337,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: properties: key: @@ -5193,6 +5349,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name @@ -5208,6 +5365,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic prefix: type: string secretRef: @@ -5217,6 +5375,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic type: object type: array image: @@ -5270,6 +5429,14 @@ spec: required: - seconds type: object + sleep: + properties: + seconds: + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: properties: host: @@ -5328,6 +5495,14 @@ spec: required: - seconds type: object + sleep: + properties: + seconds: + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: properties: host: @@ -5360,6 +5535,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -5464,6 +5640,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -5649,6 +5826,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -5951,6 +6129,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -6044,6 +6223,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic user: type: string required: @@ -6060,6 +6240,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic volumeID: type: string required: @@ -6090,6 +6271,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic csi: properties: driver: @@ -6101,6 +6283,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic readOnly: type: boolean volumeAttributes: @@ -6127,6 +6310,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: format: int32 type: integer @@ -6147,6 +6331,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object @@ -6187,6 +6372,7 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic dataSourceRef: properties: apiGroup: @@ -6197,6 +6383,8 @@ spec: type: string namespace: type: string + namespace: + type: string required: - kind - name @@ -6243,6 +6431,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic storageClassName: type: string volumeAttributesClassName: @@ -6291,6 +6480,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic required: - driver type: object @@ -6375,6 +6565,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic targetPortal: type: string required: @@ -6458,6 +6649,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic name: type: string optional: @@ -6491,6 +6683,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic downwardAPI: properties: items: @@ -6505,6 +6698,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: format: int32 type: integer @@ -6525,6 +6719,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object @@ -6552,6 +6747,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic serviceAccountToken: properties: audience: @@ -6606,6 +6802,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic user: type: string required: @@ -6627,6 +6824,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic sslEnabled: type: boolean storageMode: @@ -6678,6 +6876,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic volumeName: type: string volumeNamespace: @@ -6842,6 +7041,7 @@ spec: type: object type: array type: object + x-kubernetes-map-type: atomic weight: format: int32 type: integer @@ -6888,10 +7088,12 @@ spec: type: object type: array type: object + x-kubernetes-map-type: atomic type: array required: - nodeSelectorTerms type: object + x-kubernetes-map-type: atomic type: object podAffinity: properties: @@ -6923,6 +7125,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -6956,6 +7159,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic namespaces: items: type: string @@ -6999,6 +7203,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -7032,6 +7237,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic namespaces: items: type: string @@ -7073,6 +7279,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -7106,6 +7313,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic namespaces: items: type: string @@ -7149,6 +7357,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -7182,6 +7391,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic namespaces: items: type: string @@ -7227,6 +7437,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic fieldRef: properties: apiVersion: @@ -7236,6 +7447,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: properties: containerName: @@ -7251,6 +7463,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: properties: key: @@ -7262,6 +7475,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name @@ -7277,6 +7491,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic prefix: type: string secretRef: @@ -7286,6 +7501,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic type: object type: array image: @@ -7397,6 +7613,14 @@ spec: required: - seconds type: object + sleep: + properties: + seconds: + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: properties: host: @@ -7429,6 +7653,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -7533,6 +7758,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -7718,6 +7944,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -7881,6 +8108,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic fieldRef: properties: apiVersion: @@ -7890,6 +8118,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: properties: containerName: @@ -7905,6 +8134,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: properties: key: @@ -7916,6 +8146,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name @@ -7931,6 +8162,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic prefix: type: string secretRef: @@ -7940,6 +8172,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic type: object type: array image: @@ -7993,6 +8226,14 @@ spec: required: - seconds type: object + sleep: + properties: + seconds: + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: properties: host: @@ -8083,6 +8324,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -8187,6 +8429,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -8372,6 +8615,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -8509,6 +8753,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic type: array initContainers: items: @@ -8541,6 +8786,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic fieldRef: properties: apiVersion: @@ -8550,6 +8796,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic resourceFieldRef: properties: containerName: @@ -8565,6 +8812,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic secretKeyRef: properties: key: @@ -8576,6 +8824,7 @@ spec: required: - key type: object + x-kubernetes-map-type: atomic type: object required: - name @@ -8591,6 +8840,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic prefix: type: string secretRef: @@ -8600,6 +8850,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic type: object type: array image: @@ -8711,6 +8962,14 @@ spec: required: - seconds type: object + sleep: + properties: + seconds: + format: int64 + type: integer + required: + - seconds + type: object tcpSocket: properties: host: @@ -8743,6 +9002,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -8847,6 +9107,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -9032,6 +9293,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -9334,6 +9596,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic matchLabelKeys: items: type: string @@ -9427,6 +9690,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic user: type: string required: @@ -9443,6 +9707,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic volumeID: type: string required: @@ -9473,6 +9738,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic csi: properties: driver: @@ -9484,6 +9750,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic readOnly: type: boolean volumeAttributes: @@ -9510,6 +9777,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: format: int32 type: integer @@ -9530,6 +9798,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object @@ -9570,6 +9839,7 @@ spec: - kind - name type: object + x-kubernetes-map-type: atomic dataSourceRef: properties: apiGroup: @@ -9580,6 +9850,8 @@ spec: type: string namespace: type: string + namespace: + type: string required: - kind - name @@ -9626,10 +9898,13 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic storageClassName: type: string volumeAttributesClassName: type: string + volumeAttributesClassName: + type: string volumeMode: type: string volumeName: @@ -9674,6 +9949,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic required: - driver type: object @@ -9758,6 +10034,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic targetPortal: type: string required: @@ -9841,6 +10118,7 @@ spec: type: string type: object type: object + x-kubernetes-map-type: atomic name: type: string optional: @@ -9874,6 +10152,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic downwardAPI: properties: items: @@ -9888,6 +10167,7 @@ spec: required: - fieldPath type: object + x-kubernetes-map-type: atomic mode: format: int32 type: integer @@ -9908,6 +10188,7 @@ spec: required: - resource type: object + x-kubernetes-map-type: atomic required: - path type: object @@ -9935,6 +10216,7 @@ spec: optional: type: boolean type: object + x-kubernetes-map-type: atomic serviceAccountToken: properties: audience: @@ -9989,6 +10271,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic user: type: string required: @@ -10010,6 +10293,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic sslEnabled: type: boolean storageMode: @@ -10061,6 +10345,7 @@ spec: name: type: string type: object + x-kubernetes-map-type: atomic volumeName: type: string volumeNamespace: @@ -10164,9 +10449,3 @@ spec: storage: false subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/components/notebook-controller/config/rbac/role.yaml b/components/notebook-controller/config/rbac/role.yaml index 45f03d50237..a85ed1e901c 100644 --- a/components/notebook-controller/config/rbac/role.yaml +++ b/components/notebook-controller/config/rbac/role.yaml @@ -2,15 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - creationTimestamp: null name: role rules: -- apiGroups: - - apps - resources: - - statefulsets - verbs: - - '*' - apiGroups: - "" resources: @@ -36,6 +29,12 @@ rules: - services verbs: - '*' +- apiGroups: + - apps + resources: + - statefulsets + verbs: + - '*' - apiGroups: - kubeflow.org resources: diff --git a/components/odh-notebook-controller/Makefile b/components/odh-notebook-controller/Makefile index 345cb316724..b13c699f706 100644 --- a/components/odh-notebook-controller/Makefile +++ b/components/odh-notebook-controller/Makefile @@ -229,17 +229,17 @@ $(LOCALBIN): ## Ensure that the directory exists CONTROLLER_GEN = $(LOCALBIN)/controller-gen .PHONY: controller-gen controller-gen: ## Download controller-gen locally if necessary. - GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0 + GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.3 KUSTOMIZE = $(LOCALBIN)/kustomize .PHONY: kustomize kustomize: ## Download kustomize locally if necessary. - GOBIN=$(LOCALBIN) go install sigs.k8s.io/kustomize/v3/cmd/kustomize@v3.2.0 + GOBIN=$(LOCALBIN) go install sigs.k8s.io/kustomize/v3/cmd/kustomize@v5.0.2 ENVTEST = $(LOCALBIN)/setup-envtest .PHONY: envtest envtest: ## Download setup-envtest locally if necessary. - GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@v0.0.0-20230216140739-c98506dc3b8e + GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@v0.0.0-20240923090159-236e448db12c KTUNNEL = $(LOCALBIN)/ktunnel .PHONY: ktunnel diff --git a/components/odh-notebook-controller/config/rbac/role.yaml b/components/odh-notebook-controller/config/rbac/role.yaml index a4d8175dcc9..1551e236714 100644 --- a/components/odh-notebook-controller/config/rbac/role.yaml +++ b/components/odh-notebook-controller/config/rbac/role.yaml @@ -2,7 +2,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - creationTimestamp: null name: manager-role rules: - apiGroups: diff --git a/components/odh-notebook-controller/config/webhook/manifests.yaml b/components/odh-notebook-controller/config/webhook/manifests.yaml index 82e712dba7e..2083b9c3943 100644 --- a/components/odh-notebook-controller/config/webhook/manifests.yaml +++ b/components/odh-notebook-controller/config/webhook/manifests.yaml @@ -2,7 +2,6 @@ apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: - creationTimestamp: null name: mutating-webhook-configuration webhooks: - admissionReviewVersions: