Merge pull request #1 from kubeflow/master

pulling latest changes from kubeflow/tf-operator to deepak-muley/tf-operator
deepak-muley · Aug 13, 2021 · a9ad979 · a9ad979
2 parents c60dabb + e78151f
commit a9ad979
Show file tree

Hide file tree

Showing 48 changed files with 339 additions and 812 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,8 @@
 # Changelog
 
-## [v1.1.1](https://github.com/kubeflow/tf-operator/tree/v1.1.1) (2021-08-03)
+## [v1.2.0](https://github.com/kubeflow/tf-operator/tree/v1.2.0) (2021-08-03)
 
-[Full Changelog](https://github.com/kubeflow/tf-operator/compare/v1.1.0...v1.1.1)
+[Full Changelog](https://github.com/kubeflow/tf-operator/compare/v1.1.0...v1.2.0)
 
 ## Features
 

diff --git a/Makefile b/Makefile
@@ -38,7 +38,7 @@ help: ## Display this help.
 ##@ Development
 
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./pkg/apis/..." output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./pkg/apis/..." output:crd:artifacts:config=manifests/base
 
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./pkg/apis/..."

diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
diff --git a/config/crd/kustomizeconfig.yaml b/config/crd/kustomizeconfig.yaml
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
diff --git a/config/default/manager_config_patch.yaml b/config/default/manager_config_patch.yaml
diff --git a/config/manager/controller_manager_config.yaml b/config/manager/controller_manager_config.yaml
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
diff --git a/config/prometheus/kustomization.yaml b/config/prometheus/kustomization.yaml
diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml
diff --git a/config/rbac/auth_proxy_client_clusterrole.yaml b/config/rbac/auth_proxy_client_clusterrole.yaml
diff --git a/config/rbac/auth_proxy_role.yaml b/config/rbac/auth_proxy_role.yaml
diff --git a/config/rbac/auth_proxy_role_binding.yaml b/config/rbac/auth_proxy_role_binding.yaml
diff --git a/config/rbac/auth_proxy_service.yaml b/config/rbac/auth_proxy_service.yaml
diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml
diff --git a/config/rbac/leader_election_role.yaml b/config/rbac/leader_election_role.yaml
diff --git a/config/rbac/leader_election_role_binding.yaml b/config/rbac/leader_election_role_binding.yaml
diff --git a/config/rbac/mxjob_editor_role.yaml b/config/rbac/mxjob_editor_role.yaml
diff --git a/config/rbac/mxjob_viewer_role.yaml b/config/rbac/mxjob_viewer_role.yaml
diff --git a/config/rbac/pytorchjob_editor_role.yaml b/config/rbac/pytorchjob_editor_role.yaml