From 2a622200c713c03ea7673a94f0b2f91a025fd7ea Mon Sep 17 00:00:00 2001 From: Dean Roehrich Date: Wed, 13 Sep 2023 16:13:17 -0500 Subject: [PATCH 1/2] Follow DWS from HewlettPackard/dws to DataWorkflowServices/dws (#8) Signed-off-by: Dean Roehrich --- Makefile | 4 ++-- config/default/kustomization.yaml | 2 +- config/dws/kustomization.yaml | 2 +- config/dws/test-ruleset.yaml | 2 +- config/manager/kustomization.yaml | 2 +- config/rbac/role.yaml | 2 +- config/samples/base-workflow.yaml | 2 +- config/samples/complex-workflow.yaml | 2 +- controllers/suite_test.go | 12 ++++++------ controllers/workflow_controller.go | 8 ++++---- controllers/workflow_controller_test.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- main.go | 2 +- .../dws/LICENSE | 0 .../dws/api/v1alpha2/clientmount_types.go | 4 ++-- .../dws/api/v1alpha2/clientmount_webhook.go | 0 .../dws/api/v1alpha2/computes_types.go | 0 .../dws/api/v1alpha2/computes_webhook.go | 0 .../dws/api/v1alpha2/conversion.go | 0 .../dws/api/v1alpha2/directivebreakdown_types.go | 4 ++-- .../api/v1alpha2/directivebreakdown_webhook.go | 0 .../dws/api/v1alpha2/dwdirectiverule_types.go | 4 ++-- .../dws/api/v1alpha2/dwdirectiverule_webhook.go | 0 .../dws/api/v1alpha2/groupversion_info.go | 4 ++-- .../dws/api/v1alpha2/owner_labels.go | 8 ++++---- .../v1alpha2/persistentstorageinstance_types.go | 8 ++++---- .../persistentstorageinstance_webhook.go | 0 .../dws/api/v1alpha2/resource.go | 0 .../dws/api/v1alpha2/resource_error.go | 4 ++++ .../dws/api/v1alpha2/servers_types.go | 4 ++-- .../dws/api/v1alpha2/servers_webhook.go | 0 .../dws/api/v1alpha2/storage_types.go | 8 ++++---- .../dws/api/v1alpha2/storage_webhook.go | 0 .../api/v1alpha2/systemconfiguration_types.go | 2 +- .../api/v1alpha2/systemconfiguration_webhook.go | 0 .../dws/api/v1alpha2/workflow_types.go | 6 +++--- .../dws/api/v1alpha2/workflow_webhook.go | 10 +++++----- .../dws/api/v1alpha2/zz_generated.deepcopy.go | 2 +- .../dws/config/crd/bases/crd.go | 0 ...workflowservices.github.io_clientmounts.yaml} | 4 ++-- ...dataworkflowservices.github.io_computes.yaml} | 4 ++-- ...wservices.github.io_directivebreakdowns.yaml} | 4 ++-- ...flowservices.github.io_dwdirectiverules.yaml} | 4 ++-- ...es.github.io_persistentstorageinstances.yaml} | 4 ++-- .../dataworkflowservices.github.io_servers.yaml} | 4 ++-- ...dataworkflowservices.github.io_storages.yaml} | 4 ++-- ...services.github.io_systemconfigurations.yaml} | 4 ++-- ...ataworkflowservices.github.io_workflows.yaml} | 4 ++-- .../dws/config/webhook/kustomization.yaml | 0 .../dws/config/webhook/kustomizeconfig.yaml | 0 .../dws/config/webhook/manifests.yaml | 8 ++++---- .../dws/config/webhook/service.yaml | 0 .../dws/config/webhook/service_account.yaml | 0 .../dws/config/webhook/webhook.go | 0 .../dws/controllers/clientmount_controller.go | 14 +++++++------- .../dws/controllers/metrics/metrics.go | 0 .../dws/controllers/workflow_controller.go | 16 ++++++++-------- .../dws/utils/dwdparse/dwdparse.go | 0 .../dws/utils/dwdparse/zz_generated.deepcopy.go | 0 .../dws/utils/updater/status_updater.go | 0 vendor/modules.txt | 16 ++++++++-------- 62 files changed, 105 insertions(+), 101 deletions(-) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/LICENSE (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/clientmount_types.go (98%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/clientmount_webhook.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/computes_types.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/computes_webhook.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/conversion.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/directivebreakdown_types.go (98%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/directivebreakdown_webhook.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/dwdirectiverule_types.go (92%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/dwdirectiverule_webhook.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/groupversion_info.go (89%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/owner_labels.go (96%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/persistentstorageinstance_types.go (93%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/persistentstorageinstance_webhook.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/resource.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/resource_error.go (97%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/servers_types.go (97%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/servers_webhook.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/storage_types.go (95%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/storage_webhook.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/systemconfiguration_types.go (98%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/systemconfiguration_webhook.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/workflow_types.go (98%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/workflow_webhook.go (92%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/api/v1alpha2/zz_generated.deepcopy.go (99%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/config/crd/bases/crd.go (100%) rename vendor/github.com/{HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_clientmounts.yaml => DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_clientmounts.yaml} (99%) rename vendor/github.com/{HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_computes.yaml => DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_computes.yaml} (97%) rename vendor/github.com/{HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_directivebreakdowns.yaml => DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_directivebreakdowns.yaml} (99%) rename vendor/github.com/{HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_dwdirectiverules.yaml => DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_dwdirectiverules.yaml} (98%) rename vendor/github.com/{HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_persistentstorageinstances.yaml => DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_persistentstorageinstances.yaml} (99%) rename vendor/github.com/{HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_servers.yaml => DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_servers.yaml} (99%) rename vendor/github.com/{HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_storages.yaml => DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_storages.yaml} (99%) rename vendor/github.com/{HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_systemconfigurations.yaml => DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_systemconfigurations.yaml} (99%) rename vendor/github.com/{HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_workflows.yaml => DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_workflows.yaml} (99%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/config/webhook/kustomization.yaml (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/config/webhook/kustomizeconfig.yaml (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/config/webhook/manifests.yaml (81%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/config/webhook/service.yaml (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/config/webhook/service_account.yaml (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/config/webhook/webhook.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/controllers/clientmount_controller.go (87%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/controllers/metrics/metrics.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/controllers/workflow_controller.go (93%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/utils/dwdparse/dwdparse.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/utils/dwdparse/zz_generated.deepcopy.go (100%) rename vendor/github.com/{HewlettPackard => DataWorkflowServices}/dws/utils/updater/status_updater.go (100%) diff --git a/Makefile b/Makefile index 75a9943..0227571 100644 --- a/Makefile +++ b/Makefile @@ -26,8 +26,8 @@ # This variable is used to construct full image tags for bundle and catalog images. # # For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both -# cray.hpe.com/dws-operator-bundle:$VERSION and cray.hpe.com/dws-operator-catalog:$VERSION. -IMAGE_TAG_BASE ?= ghcr.io/dataworkflowservices/dws-test-driver-operator +# cray.hpe.com/dws-bundle:$VERSION and cray.hpe.com/dws-catalog:$VERSION. +IMAGE_TAG_BASE ?= ghcr.io/dataworkflowservices/dws-test-driver # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.26.0 diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index e3bc2a6..2784737 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -1,5 +1,5 @@ # Adds namespace to all resources. -namespace: dws-test-operator-system +namespace: dws-test-system # Value of this field is prepended to the # names of all resources, e.g. a deployment named diff --git a/config/dws/kustomization.yaml b/config/dws/kustomization.yaml index 9a89148..f13bda1 100644 --- a/config/dws/kustomization.yaml +++ b/config/dws/kustomization.yaml @@ -1,3 +1,3 @@ -namespace: dws-operator-system +namespace: dws-system resources: - "test-ruleset.yaml" \ No newline at end of file diff --git a/config/dws/test-ruleset.yaml b/config/dws/test-ruleset.yaml index 16d24f7..85c6dd2 100644 --- a/config/dws/test-ruleset.yaml +++ b/config/dws/test-ruleset.yaml @@ -1,4 +1,4 @@ -apiVersion: dws.cray.hpe.com/v1alpha2 +apiVersion: dataworkflowservices.github.io/v1alpha2 kind: DWDirectiveRule metadata: name: rules diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 34d4ec8..1206006 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: - name: controller - newName: ghcr.io/dataworkflowservices/dws-test-driver-operator + newName: ghcr.io/dataworkflowservices/dws-test-driver newTag: 0.0.1 diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 23b7019..bb41e8f 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -5,7 +5,7 @@ metadata: name: manager-role rules: - apiGroups: - - dws.cray.hpe.com + - dataworkflowservices.github.io resources: - workflows verbs: diff --git a/config/samples/base-workflow.yaml b/config/samples/base-workflow.yaml index 18f7d7f..e5a2290 100644 --- a/config/samples/base-workflow.yaml +++ b/config/samples/base-workflow.yaml @@ -1,4 +1,4 @@ -apiVersion: dws.cray.hpe.com/v1alpha2 +apiVersion: dataworkflowservices.github.io/v1alpha2 kind: Workflow metadata: name: base diff --git a/config/samples/complex-workflow.yaml b/config/samples/complex-workflow.yaml index 9737fe8..2ea33bb 100644 --- a/config/samples/complex-workflow.yaml +++ b/config/samples/complex-workflow.yaml @@ -1,4 +1,4 @@ -apiVersion: dws.cray.hpe.com/v1alpha2 +apiVersion: dataworkflowservices.github.io/v1alpha2 kind: Workflow metadata: name: complex diff --git a/controllers/suite_test.go b/controllers/suite_test.go index c96ecdd..ff0a761 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -22,8 +22,8 @@ import ( "path/filepath" "testing" - dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2" - dwsctrls "github.com/HewlettPackard/dws/controllers" + dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2" + dwsctrls "github.com/DataWorkflowServices/dws/controllers" "github.com/ghodss/yaml" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -41,8 +41,8 @@ import ( //+kubebuilder:scaffold:imports - _ "github.com/HewlettPackard/dws/config/crd/bases" - _ "github.com/HewlettPackard/dws/config/webhook" + _ "github.com/DataWorkflowServices/dws/config/crd/bases" + _ "github.com/DataWorkflowServices/dws/config/webhook" ) // These tests use Ginkgo (BDD-style Go testing framework). Refer to @@ -80,7 +80,7 @@ var _ = BeforeSuite(func() { ctx, cancel = context.WithCancel(context.TODO()) webhookPaths := []string{ - filepath.Join("..", "vendor", "github.com", "HewlettPackard", "dws", "config", "webhook"), + filepath.Join("..", "vendor", "github.com", "DataWorkflowServices", "dws", "config", "webhook"), } By("bootstrapping test environment") @@ -89,7 +89,7 @@ var _ = BeforeSuite(func() { ErrorIfCRDPathMissing: true, CRDDirectoryPaths: []string{ // filepath.Join("..", "config", "crd", "bases"), - filepath.Join("..", "vendor", "github.com", "HewlettPackard", "dws", "config", "crd", "bases"), + filepath.Join("..", "vendor", "github.com", "DataWorkflowServices", "dws", "config", "crd", "bases"), }, } diff --git a/controllers/workflow_controller.go b/controllers/workflow_controller.go index b0e0588..2cb5759 100644 --- a/controllers/workflow_controller.go +++ b/controllers/workflow_controller.go @@ -20,9 +20,9 @@ import ( "context" "strings" - dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2" - dwdparse "github.com/HewlettPackard/dws/utils/dwdparse" - "github.com/HewlettPackard/dws/utils/updater" + dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2" + dwdparse "github.com/DataWorkflowServices/dws/utils/dwdparse" + "github.com/DataWorkflowServices/dws/utils/updater" "github.com/go-logr/logr" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -39,7 +39,7 @@ type WorkflowReconciler struct { Scheme *runtime.Scheme } -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=workflows,verbs=get;list;watch;update;patch +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=workflows,verbs=get;list;watch;update;patch // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state. diff --git a/controllers/workflow_controller_test.go b/controllers/workflow_controller_test.go index 3bab7bb..5536a40 100644 --- a/controllers/workflow_controller_test.go +++ b/controllers/workflow_controller_test.go @@ -31,7 +31,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" - dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2" + dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2" ) func ignoreExactTime(x, y *metav1.MicroTime) bool { diff --git a/go.mod b/go.mod index 8da102a..50601a3 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/DataWorkflowServices/dws-test-driver go 1.19 require ( - github.com/HewlettPackard/dws v0.0.11 + github.com/DataWorkflowServices/dws v0.0.1-0.20230913204342-e78d55d24550 github.com/ghodss/yaml v1.0.0 github.com/go-logr/logr v1.2.4 github.com/google/go-cmp v0.5.9 diff --git a/go.sum b/go.sum index 0c94b77..205ff18 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/HewlettPackard/dws v0.0.11 h1:4IAgljdLsfNuMwg0exUkmph/W/2N94ASJ7Zin79XKOU= -github.com/HewlettPackard/dws v0.0.11/go.mod h1:YvNzcgAPmwhl/YQj6dMwsB9OpwbI5bp/41kINfFiXX8= +github.com/DataWorkflowServices/dws v0.0.1-0.20230913204342-e78d55d24550 h1:AMJUdu+Rt5vLEWbdnI5LDqytR5tgZbkYTS9fztMWNL4= +github.com/DataWorkflowServices/dws v0.0.1-0.20230913204342-e78d55d24550/go.mod h1:ZQsfcByZ05Ah9yrgOJsN3JPz4jo374DrdVv8kvcIquA= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= diff --git a/main.go b/main.go index d4a9624..8846259 100644 --- a/main.go +++ b/main.go @@ -25,7 +25,7 @@ import ( // to ensure that exec-entrypoint and run can make use of them. _ "k8s.io/client-go/plugin/pkg/client/auth" - dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2" + dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2" kruntime "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" diff --git a/vendor/github.com/HewlettPackard/dws/LICENSE b/vendor/github.com/DataWorkflowServices/dws/LICENSE similarity index 100% rename from vendor/github.com/HewlettPackard/dws/LICENSE rename to vendor/github.com/DataWorkflowServices/dws/LICENSE diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/clientmount_types.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/clientmount_types.go similarity index 98% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/clientmount_types.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/clientmount_types.go index e4f375d..ce0f051 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/clientmount_types.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/clientmount_types.go @@ -1,5 +1,5 @@ /* - * Copyright 2021, 2022 Hewlett Packard Enterprise Development LP + * Copyright 2021-2023 Hewlett Packard Enterprise Development LP * Other additional copyright holders may be indicated within. * * The entirety of this work is licensed under the Apache License, @@ -20,7 +20,7 @@ package v1alpha2 import ( - "github.com/HewlettPackard/dws/utils/updater" + "github.com/DataWorkflowServices/dws/utils/updater" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/clientmount_webhook.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/clientmount_webhook.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/clientmount_webhook.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/clientmount_webhook.go diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/computes_types.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/computes_types.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/computes_types.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/computes_types.go diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/computes_webhook.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/computes_webhook.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/computes_webhook.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/computes_webhook.go diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/conversion.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/conversion.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/conversion.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/conversion.go diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/directivebreakdown_types.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/directivebreakdown_types.go similarity index 98% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/directivebreakdown_types.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/directivebreakdown_types.go index df5c95b..4a57756 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/directivebreakdown_types.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/directivebreakdown_types.go @@ -1,5 +1,5 @@ /* - * Copyright 2021, 2022 Hewlett Packard Enterprise Development LP + * Copyright 2021-2023 Hewlett Packard Enterprise Development LP * Other additional copyright holders may be indicated within. * * The entirety of this work is licensed under the Apache License, @@ -20,7 +20,7 @@ package v1alpha2 import ( - "github.com/HewlettPackard/dws/utils/updater" + "github.com/DataWorkflowServices/dws/utils/updater" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/directivebreakdown_webhook.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/directivebreakdown_webhook.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/directivebreakdown_webhook.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/directivebreakdown_webhook.go diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/dwdirectiverule_types.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/dwdirectiverule_types.go similarity index 92% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/dwdirectiverule_types.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/dwdirectiverule_types.go index 05e9324..e5b352f 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/dwdirectiverule_types.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/dwdirectiverule_types.go @@ -1,5 +1,5 @@ /* - * Copyright 2021, 2022 Hewlett Packard Enterprise Development LP + * Copyright 2021-2023 Hewlett Packard Enterprise Development LP * Other additional copyright holders may be indicated within. * * The entirety of this work is licensed under the Apache License, @@ -20,7 +20,7 @@ package v1alpha2 import ( - "github.com/HewlettPackard/dws/utils/dwdparse" + "github.com/DataWorkflowServices/dws/utils/dwdparse" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/dwdirectiverule_webhook.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/dwdirectiverule_webhook.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/dwdirectiverule_webhook.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/dwdirectiverule_webhook.go diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/groupversion_info.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/groupversion_info.go similarity index 89% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/groupversion_info.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/groupversion_info.go index bd2d625..22374c4 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/groupversion_info.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/groupversion_info.go @@ -19,7 +19,7 @@ // Package v1alpha2 contains API Schema definitions for the dws v1alpha2 API group // +kubebuilder:object:generate=true -// +groupName=dws.cray.hpe.com +// +groupName=dataworkflowservices.github.io package v1alpha2 import ( @@ -29,7 +29,7 @@ import ( var ( // GroupVersion is group version used to register these objects - GroupVersion = schema.GroupVersion{Group: "dws.cray.hpe.com", Version: "v1alpha2"} + GroupVersion = schema.GroupVersion{Group: "dataworkflowservices.github.io", Version: "v1alpha2"} // SchemeBuilder is used to add go types to the GroupVersionKind scheme SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion} diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/owner_labels.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/owner_labels.go similarity index 96% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/owner_labels.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/owner_labels.go index c1401ba..22c64b3 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/owner_labels.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/owner_labels.go @@ -1,5 +1,5 @@ /* - * Copyright 2022 Hewlett Packard Enterprise Development LP + * Copyright 2022-2023 Hewlett Packard Enterprise Development LP * Other additional copyright holders may be indicated within. * * The entirety of this work is licensed under the Apache License, @@ -31,9 +31,9 @@ import ( ) const ( - OwnerKindLabel = "dws.cray.hpe.com/owner.kind" - OwnerNameLabel = "dws.cray.hpe.com/owner.name" - OwnerNamespaceLabel = "dws.cray.hpe.com/owner.namespace" + OwnerKindLabel = "dataworkflowservices.github.io/owner.kind" + OwnerNameLabel = "dataworkflowservices.github.io/owner.name" + OwnerNamespaceLabel = "dataworkflowservices.github.io/owner.namespace" ) // +kubebuilder:object:generate=false diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/persistentstorageinstance_types.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/persistentstorageinstance_types.go similarity index 93% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/persistentstorageinstance_types.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/persistentstorageinstance_types.go index 90e196b..346a60f 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/persistentstorageinstance_types.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/persistentstorageinstance_types.go @@ -1,5 +1,5 @@ /* - * Copyright 2021, 2022 Hewlett Packard Enterprise Development LP + * Copyright 2021-2023 Hewlett Packard Enterprise Development LP * Other additional copyright holders may be indicated within. * * The entirety of this work is licensed under the Apache License, @@ -20,7 +20,7 @@ package v1alpha2 import ( - "github.com/HewlettPackard/dws/utils/updater" + "github.com/DataWorkflowServices/dws/utils/updater" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -29,10 +29,10 @@ import ( const ( // PersistentStorageNameLabel is defined for resources that relate to the name of a DWS PersistentStorageInstance - PersistentStorageNameLabel = "dws.cray.hpe.com/persistentstorage.name" + PersistentStorageNameLabel = "dataworkflowservices.github.io/persistentstorage.name" // PersistentStorageNamespaceLabel is defined for resources that relate to the namespace of a DWS PersistentStorageInstance - PersistentStorageNamespaceLabel = "dws.cray.hpe.com/persistentstorage.namespace" + PersistentStorageNamespaceLabel = "dataworkflowservices.github.io/persistentstorage.namespace" ) // PersistentStorageInstanceState specifies the golang type for PSIState diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/persistentstorageinstance_webhook.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/persistentstorageinstance_webhook.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/persistentstorageinstance_webhook.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/persistentstorageinstance_webhook.go diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/resource.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/resource.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/resource.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/resource.go diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/resource_error.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/resource_error.go similarity index 97% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/resource_error.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/resource_error.go index 49ba6aa..fdcac35 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/resource_error.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/resource_error.go @@ -174,6 +174,10 @@ func (e *ResourceErrorInfo) Error() string { return fmt.Sprintf("%s error: %s", strings.ToLower(string(e.Type)), message) } +func (e *ResourceErrorInfo) GetUserMessage() string { + return fmt.Sprintf("%s error: %s", string(e.Type), e.UserMessage) +} + func (e *ResourceError) SetResourceErrorAndLog(err error, log logr.Logger) { e.SetResourceError(err) if err == nil { diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/servers_types.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/servers_types.go similarity index 97% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/servers_types.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/servers_types.go index 3ce6bc6..5870a73 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/servers_types.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/servers_types.go @@ -1,5 +1,5 @@ /* - * Copyright 2021, 2022 Hewlett Packard Enterprise Development LP + * Copyright 2021-2023 Hewlett Packard Enterprise Development LP * Other additional copyright holders may be indicated within. * * The entirety of this work is licensed under the Apache License, @@ -20,7 +20,7 @@ package v1alpha2 import ( - "github.com/HewlettPackard/dws/utils/updater" + "github.com/DataWorkflowServices/dws/utils/updater" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/servers_webhook.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/servers_webhook.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/servers_webhook.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/servers_webhook.go diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/storage_types.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/storage_types.go similarity index 95% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/storage_types.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/storage_types.go index 1c527e4..4609fba 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/storage_types.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/storage_types.go @@ -1,5 +1,5 @@ /* - * Copyright 2021, 2022 Hewlett Packard Enterprise Development LP + * Copyright 2021-2023 Hewlett Packard Enterprise Development LP * Other additional copyright holders may be indicated within. * * The entirety of this work is licensed under the Apache License, @@ -20,14 +20,14 @@ package v1alpha2 import ( - "github.com/HewlettPackard/dws/utils/updater" + "github.com/DataWorkflowServices/dws/utils/updater" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) const ( // StorageTypeLabel is the label key used for tagging Storage resources - // with a driver specific label. For example: dws.cray.hpe.com/storage=Rabbit - StorageTypeLabel = "dws.cray.hpe.com/storage" + // with a driver specific label. For example: dataworkflowservices.github.io/storage=Rabbit + StorageTypeLabel = "dataworkflowservices.github.io/storage" ) // StorageSpec defines the desired specifications of Storage resource diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/storage_webhook.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/storage_webhook.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/storage_webhook.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/storage_webhook.go diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/systemconfiguration_types.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/systemconfiguration_types.go similarity index 98% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/systemconfiguration_types.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/systemconfiguration_types.go index c89ad18..f9d36cf 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/systemconfiguration_types.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/systemconfiguration_types.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/HewlettPackard/dws/utils/updater" + "github.com/DataWorkflowServices/dws/utils/updater" ) // SystemConfigurationComputeNode describes a compute node in the system diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/systemconfiguration_webhook.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/systemconfiguration_webhook.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/systemconfiguration_webhook.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/systemconfiguration_webhook.go diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/workflow_types.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/workflow_types.go similarity index 98% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/workflow_types.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/workflow_types.go index 388dfa5..9d35b43 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/workflow_types.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/workflow_types.go @@ -23,7 +23,7 @@ import ( "fmt" "strings" - "github.com/HewlettPackard/dws/utils/updater" + "github.com/DataWorkflowServices/dws/utils/updater" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" @@ -31,10 +31,10 @@ import ( const ( // WorkflowNameLabel is defined for resources that relate to the name of a DWS Workflow - WorkflowNameLabel = "dws.cray.hpe.com/workflow.name" + WorkflowNameLabel = "dataworkflowservices.github.io/workflow.name" // WorkflowNamespaceLabel is defined for resources that relate to the namespace of a DWS Workflow - WorkflowNamespaceLabel = "dws.cray.hpe.com/workflow.namespace" + WorkflowNamespaceLabel = "dataworkflowservices.github.io/workflow.namespace" ) // WorkflowState is the enumeration of the state of the workflow diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/workflow_webhook.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/workflow_webhook.go similarity index 92% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/workflow_webhook.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/workflow_webhook.go index 2bea5ab..ebfbb37 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/workflow_webhook.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/workflow_webhook.go @@ -1,5 +1,5 @@ /* - * Copyright 2021, 2022 Hewlett Packard Enterprise Development LP + * Copyright 2021-2023 Hewlett Packard Enterprise Development LP * Other additional copyright holders may be indicated within. * * The entirety of this work is licensed under the Apache License, @@ -33,10 +33,10 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/webhook" - "github.com/HewlettPackard/dws/utils/dwdparse" + "github.com/DataWorkflowServices/dws/utils/dwdparse" ) -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=dwdirectiverules,verbs=get;list;watch +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=dwdirectiverules,verbs=get;list;watch // log is for logging in this package. var workflowlog = logf.Log.WithName("workflow-resource") @@ -51,7 +51,7 @@ func (w *Workflow) SetupWebhookWithManager(mgr ctrl.Manager) error { Complete() } -//+kubebuilder:webhook:path=/mutate-dws-cray-hpe-com-v1alpha2-workflow,mutating=true,failurePolicy=fail,sideEffects=None,groups=dws.cray.hpe.com,resources=workflows,verbs=create,versions=v1alpha2,name=mworkflow.kb.io,admissionReviewVersions={v1,v1beta1} +//+kubebuilder:webhook:path=/mutate-dataworkflowservices-github-io-v1alpha2-workflow,mutating=true,failurePolicy=fail,sideEffects=None,groups=dataworkflowservices.github.io,resources=workflows,verbs=create,versions=v1alpha2,name=mworkflow.kb.io,admissionReviewVersions={v1,v1beta1} var _ webhook.Defaulter = &Workflow{} @@ -70,7 +70,7 @@ func (w *Workflow) Default() { } // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation. -//+kubebuilder:webhook:path=/validate-dws-cray-hpe-com-v1alpha2-workflow,mutating=false,failurePolicy=fail,sideEffects=None,groups=dws.cray.hpe.com,resources=workflows,verbs=create;update,versions=v1alpha2,name=vworkflow.kb.io,admissionReviewVersions={v1,v1beta1} +//+kubebuilder:webhook:path=/validate-dataworkflowservices-github-io-v1alpha2-workflow,mutating=false,failurePolicy=fail,sideEffects=None,groups=dataworkflowservices.github.io,resources=workflows,verbs=create;update,versions=v1alpha2,name=vworkflow.kb.io,admissionReviewVersions={v1,v1beta1} var _ webhook.Validator = &Workflow{} diff --git a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/zz_generated.deepcopy.go b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/zz_generated.deepcopy.go similarity index 99% rename from vendor/github.com/HewlettPackard/dws/api/v1alpha2/zz_generated.deepcopy.go rename to vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/zz_generated.deepcopy.go index 96f72a9..311f646 100644 --- a/vendor/github.com/HewlettPackard/dws/api/v1alpha2/zz_generated.deepcopy.go +++ b/vendor/github.com/DataWorkflowServices/dws/api/v1alpha2/zz_generated.deepcopy.go @@ -25,7 +25,7 @@ package v1alpha2 import ( - "github.com/HewlettPackard/dws/utils/dwdparse" + "github.com/DataWorkflowServices/dws/utils/dwdparse" "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" diff --git a/vendor/github.com/HewlettPackard/dws/config/crd/bases/crd.go b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/crd.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/config/crd/bases/crd.go rename to vendor/github.com/DataWorkflowServices/dws/config/crd/bases/crd.go diff --git a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_clientmounts.yaml b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_clientmounts.yaml similarity index 99% rename from vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_clientmounts.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_clientmounts.yaml index 716467d..7bb9232 100644 --- a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_clientmounts.yaml +++ b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_clientmounts.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.12.0 - name: clientmounts.dws.cray.hpe.com + name: clientmounts.dataworkflowservices.github.io spec: - group: dws.cray.hpe.com + group: dataworkflowservices.github.io names: kind: ClientMount listKind: ClientMountList diff --git a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_computes.yaml b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_computes.yaml similarity index 97% rename from vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_computes.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_computes.yaml index 5671794..87bfe94 100644 --- a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_computes.yaml +++ b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_computes.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.12.0 - name: computes.dws.cray.hpe.com + name: computes.dataworkflowservices.github.io spec: - group: dws.cray.hpe.com + group: dataworkflowservices.github.io names: kind: Computes listKind: ComputesList diff --git a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_directivebreakdowns.yaml b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_directivebreakdowns.yaml similarity index 99% rename from vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_directivebreakdowns.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_directivebreakdowns.yaml index ede580e..18015f2 100644 --- a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_directivebreakdowns.yaml +++ b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_directivebreakdowns.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.12.0 - name: directivebreakdowns.dws.cray.hpe.com + name: directivebreakdowns.dataworkflowservices.github.io spec: - group: dws.cray.hpe.com + group: dataworkflowservices.github.io names: kind: DirectiveBreakdown listKind: DirectiveBreakdownList diff --git a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_dwdirectiverules.yaml b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_dwdirectiverules.yaml similarity index 98% rename from vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_dwdirectiverules.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_dwdirectiverules.yaml index bc76eff..c178107 100644 --- a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_dwdirectiverules.yaml +++ b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_dwdirectiverules.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.12.0 - name: dwdirectiverules.dws.cray.hpe.com + name: dwdirectiverules.dataworkflowservices.github.io spec: - group: dws.cray.hpe.com + group: dataworkflowservices.github.io names: kind: DWDirectiveRule listKind: DWDirectiveRuleList diff --git a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_persistentstorageinstances.yaml b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_persistentstorageinstances.yaml similarity index 99% rename from vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_persistentstorageinstances.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_persistentstorageinstances.yaml index 274055a..c0d1475 100644 --- a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_persistentstorageinstances.yaml +++ b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_persistentstorageinstances.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.12.0 - name: persistentstorageinstances.dws.cray.hpe.com + name: persistentstorageinstances.dataworkflowservices.github.io spec: - group: dws.cray.hpe.com + group: dataworkflowservices.github.io names: kind: PersistentStorageInstance listKind: PersistentStorageInstanceList diff --git a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_servers.yaml b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_servers.yaml similarity index 99% rename from vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_servers.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_servers.yaml index 74649af..134bd56 100644 --- a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_servers.yaml +++ b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_servers.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.12.0 - name: servers.dws.cray.hpe.com + name: servers.dataworkflowservices.github.io spec: - group: dws.cray.hpe.com + group: dataworkflowservices.github.io names: kind: Servers listKind: ServersList diff --git a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_storages.yaml b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_storages.yaml similarity index 99% rename from vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_storages.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_storages.yaml index 72a8f39..2f89e87 100644 --- a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_storages.yaml +++ b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_storages.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.12.0 - name: storages.dws.cray.hpe.com + name: storages.dataworkflowservices.github.io spec: - group: dws.cray.hpe.com + group: dataworkflowservices.github.io names: kind: Storage listKind: StorageList diff --git a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_systemconfigurations.yaml b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_systemconfigurations.yaml similarity index 99% rename from vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_systemconfigurations.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_systemconfigurations.yaml index acfad52..61da5a2 100644 --- a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_systemconfigurations.yaml +++ b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_systemconfigurations.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.12.0 - name: systemconfigurations.dws.cray.hpe.com + name: systemconfigurations.dataworkflowservices.github.io spec: - group: dws.cray.hpe.com + group: dataworkflowservices.github.io names: kind: SystemConfiguration listKind: SystemConfigurationList diff --git a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_workflows.yaml b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_workflows.yaml similarity index 99% rename from vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_workflows.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_workflows.yaml index 7cf158b..5b90590 100644 --- a/vendor/github.com/HewlettPackard/dws/config/crd/bases/dws.cray.hpe.com_workflows.yaml +++ b/vendor/github.com/DataWorkflowServices/dws/config/crd/bases/dataworkflowservices.github.io_workflows.yaml @@ -4,9 +4,9 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.12.0 - name: workflows.dws.cray.hpe.com + name: workflows.dataworkflowservices.github.io spec: - group: dws.cray.hpe.com + group: dataworkflowservices.github.io names: kind: Workflow listKind: WorkflowList diff --git a/vendor/github.com/HewlettPackard/dws/config/webhook/kustomization.yaml b/vendor/github.com/DataWorkflowServices/dws/config/webhook/kustomization.yaml similarity index 100% rename from vendor/github.com/HewlettPackard/dws/config/webhook/kustomization.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/webhook/kustomization.yaml diff --git a/vendor/github.com/HewlettPackard/dws/config/webhook/kustomizeconfig.yaml b/vendor/github.com/DataWorkflowServices/dws/config/webhook/kustomizeconfig.yaml similarity index 100% rename from vendor/github.com/HewlettPackard/dws/config/webhook/kustomizeconfig.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/webhook/kustomizeconfig.yaml diff --git a/vendor/github.com/HewlettPackard/dws/config/webhook/manifests.yaml b/vendor/github.com/DataWorkflowServices/dws/config/webhook/manifests.yaml similarity index 81% rename from vendor/github.com/HewlettPackard/dws/config/webhook/manifests.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/webhook/manifests.yaml index 9183b3f..794e369 100644 --- a/vendor/github.com/HewlettPackard/dws/config/webhook/manifests.yaml +++ b/vendor/github.com/DataWorkflowServices/dws/config/webhook/manifests.yaml @@ -11,12 +11,12 @@ webhooks: service: name: webhook-service namespace: system - path: /mutate-dws-cray-hpe-com-v1alpha2-workflow + path: /mutate-dataworkflowservices-github-io-v1alpha2-workflow failurePolicy: Fail name: mworkflow.kb.io rules: - apiGroups: - - dws.cray.hpe.com + - dataworkflowservices.github.io apiVersions: - v1alpha2 operations: @@ -37,12 +37,12 @@ webhooks: service: name: webhook-service namespace: system - path: /validate-dws-cray-hpe-com-v1alpha2-workflow + path: /validate-dataworkflowservices-github-io-v1alpha2-workflow failurePolicy: Fail name: vworkflow.kb.io rules: - apiGroups: - - dws.cray.hpe.com + - dataworkflowservices.github.io apiVersions: - v1alpha2 operations: diff --git a/vendor/github.com/HewlettPackard/dws/config/webhook/service.yaml b/vendor/github.com/DataWorkflowServices/dws/config/webhook/service.yaml similarity index 100% rename from vendor/github.com/HewlettPackard/dws/config/webhook/service.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/webhook/service.yaml diff --git a/vendor/github.com/HewlettPackard/dws/config/webhook/service_account.yaml b/vendor/github.com/DataWorkflowServices/dws/config/webhook/service_account.yaml similarity index 100% rename from vendor/github.com/HewlettPackard/dws/config/webhook/service_account.yaml rename to vendor/github.com/DataWorkflowServices/dws/config/webhook/service_account.yaml diff --git a/vendor/github.com/HewlettPackard/dws/config/webhook/webhook.go b/vendor/github.com/DataWorkflowServices/dws/config/webhook/webhook.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/config/webhook/webhook.go rename to vendor/github.com/DataWorkflowServices/dws/config/webhook/webhook.go diff --git a/vendor/github.com/HewlettPackard/dws/controllers/clientmount_controller.go b/vendor/github.com/DataWorkflowServices/dws/controllers/clientmount_controller.go similarity index 87% rename from vendor/github.com/HewlettPackard/dws/controllers/clientmount_controller.go rename to vendor/github.com/DataWorkflowServices/dws/controllers/clientmount_controller.go index 87bbc21..a06797e 100644 --- a/vendor/github.com/HewlettPackard/dws/controllers/clientmount_controller.go +++ b/vendor/github.com/DataWorkflowServices/dws/controllers/clientmount_controller.go @@ -1,5 +1,5 @@ /* - * Copyright 2021, 2022 Hewlett Packard Enterprise Development LP + * Copyright 2021-2023 Hewlett Packard Enterprise Development LP * Other additional copyright holders may be indicated within. * * The entirety of this work is licensed under the Apache License, @@ -31,8 +31,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/predicate" - dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2" - "github.com/HewlettPackard/dws/utils/updater" + dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2" + "github.com/DataWorkflowServices/dws/utils/updater" ) // ClientMountReconciler reconciles a ClientMount object @@ -44,12 +44,12 @@ type ClientMountReconciler struct { const ( // finalizerClientMount defines the key used for the finalizer - finalizerClientMount = "dws.cray.hpe.com/client_mount" + finalizerClientMount = "dataworkflowservices.github.io/client_mount" ) -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=clientmounts,verbs=get;list;watch;create;update;patch;delete -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=clientmounts/status,verbs=get;update;patch -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=clientmounts/finalizers,verbs=update +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=clientmounts,verbs=get;list;watch;create;update;patch;delete +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=clientmounts/status,verbs=get;update;patch +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=clientmounts/finalizers,verbs=update // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state. diff --git a/vendor/github.com/HewlettPackard/dws/controllers/metrics/metrics.go b/vendor/github.com/DataWorkflowServices/dws/controllers/metrics/metrics.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/controllers/metrics/metrics.go rename to vendor/github.com/DataWorkflowServices/dws/controllers/metrics/metrics.go diff --git a/vendor/github.com/HewlettPackard/dws/controllers/workflow_controller.go b/vendor/github.com/DataWorkflowServices/dws/controllers/workflow_controller.go similarity index 93% rename from vendor/github.com/HewlettPackard/dws/controllers/workflow_controller.go rename to vendor/github.com/DataWorkflowServices/dws/controllers/workflow_controller.go index fb1576a..81ae02d 100644 --- a/vendor/github.com/HewlettPackard/dws/controllers/workflow_controller.go +++ b/vendor/github.com/DataWorkflowServices/dws/controllers/workflow_controller.go @@ -1,5 +1,5 @@ /* - * Copyright 2021, 2022 Hewlett Packard Enterprise Development LP + * Copyright 2021-2023 Hewlett Packard Enterprise Development LP * Other additional copyright holders may be indicated within. * * The entirety of this work is licensed under the Apache License, @@ -37,14 +37,14 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - dwsv1alpha2 "github.com/HewlettPackard/dws/api/v1alpha2" - "github.com/HewlettPackard/dws/controllers/metrics" - "github.com/HewlettPackard/dws/utils/updater" + dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2" + "github.com/DataWorkflowServices/dws/controllers/metrics" + "github.com/DataWorkflowServices/dws/utils/updater" ) const ( // finalizerDwsWorkflow is the finalizer string used by this controller - finalizerDwsWorkflow = "dws.cray.hpe.com/workflow" + finalizerDwsWorkflow = "dataworkflowservices.github.io/workflow" ) // Define condition values @@ -61,9 +61,9 @@ type WorkflowReconciler struct { ChildObjects []dwsv1alpha2.ObjectList } -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=workflows,verbs=get;list;watch;update;patch -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=workflows/finalizers,verbs=update -//+kubebuilder:rbac:groups=dws.cray.hpe.com,resources=computes,verbs=get;create;list;watch;update;patch;delete;deletecollection +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=workflows,verbs=get;list;watch;update;patch +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=workflows/finalizers,verbs=update +//+kubebuilder:rbac:groups=dataworkflowservices.github.io,resources=computes,verbs=get;create;list;watch;update;patch;delete;deletecollection // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state. diff --git a/vendor/github.com/HewlettPackard/dws/utils/dwdparse/dwdparse.go b/vendor/github.com/DataWorkflowServices/dws/utils/dwdparse/dwdparse.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/utils/dwdparse/dwdparse.go rename to vendor/github.com/DataWorkflowServices/dws/utils/dwdparse/dwdparse.go diff --git a/vendor/github.com/HewlettPackard/dws/utils/dwdparse/zz_generated.deepcopy.go b/vendor/github.com/DataWorkflowServices/dws/utils/dwdparse/zz_generated.deepcopy.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/utils/dwdparse/zz_generated.deepcopy.go rename to vendor/github.com/DataWorkflowServices/dws/utils/dwdparse/zz_generated.deepcopy.go diff --git a/vendor/github.com/HewlettPackard/dws/utils/updater/status_updater.go b/vendor/github.com/DataWorkflowServices/dws/utils/updater/status_updater.go similarity index 100% rename from vendor/github.com/HewlettPackard/dws/utils/updater/status_updater.go rename to vendor/github.com/DataWorkflowServices/dws/utils/updater/status_updater.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 8b79127..1344ca7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,12 +1,12 @@ -# github.com/HewlettPackard/dws v0.0.11 +# github.com/DataWorkflowServices/dws v0.0.1-0.20230913204342-e78d55d24550 ## explicit; go 1.19 -github.com/HewlettPackard/dws/api/v1alpha2 -github.com/HewlettPackard/dws/config/crd/bases -github.com/HewlettPackard/dws/config/webhook -github.com/HewlettPackard/dws/controllers -github.com/HewlettPackard/dws/controllers/metrics -github.com/HewlettPackard/dws/utils/dwdparse -github.com/HewlettPackard/dws/utils/updater +github.com/DataWorkflowServices/dws/api/v1alpha2 +github.com/DataWorkflowServices/dws/config/crd/bases +github.com/DataWorkflowServices/dws/config/webhook +github.com/DataWorkflowServices/dws/controllers +github.com/DataWorkflowServices/dws/controllers/metrics +github.com/DataWorkflowServices/dws/utils/dwdparse +github.com/DataWorkflowServices/dws/utils/updater # github.com/beorn7/perks v1.0.1 ## explicit; go 1.11 github.com/beorn7/perks/quantile From d78b0a6c8e7514177fed4a013396c688511037e4 Mon Sep 17 00:00:00 2001 From: Dean Roehrich Date: Thu, 14 Sep 2023 12:35:18 -0500 Subject: [PATCH 2/2] Pin DWS to v0.0.13 (#9) Signed-off-by: Dean Roehrich --- go.mod | 2 +- go.sum | 4 ++-- vendor/modules.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 50601a3..5f6fefe 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/DataWorkflowServices/dws-test-driver go 1.19 require ( - github.com/DataWorkflowServices/dws v0.0.1-0.20230913204342-e78d55d24550 + github.com/DataWorkflowServices/dws v0.0.13 github.com/ghodss/yaml v1.0.0 github.com/go-logr/logr v1.2.4 github.com/google/go-cmp v0.5.9 diff --git a/go.sum b/go.sum index 205ff18..f4c5f9f 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataWorkflowServices/dws v0.0.1-0.20230913204342-e78d55d24550 h1:AMJUdu+Rt5vLEWbdnI5LDqytR5tgZbkYTS9fztMWNL4= -github.com/DataWorkflowServices/dws v0.0.1-0.20230913204342-e78d55d24550/go.mod h1:ZQsfcByZ05Ah9yrgOJsN3JPz4jo374DrdVv8kvcIquA= +github.com/DataWorkflowServices/dws v0.0.13 h1:9bpv7P8WgmNDtCHtZpjR3H5Wy+l4N6vnyAnkP69c2Yc= +github.com/DataWorkflowServices/dws v0.0.13/go.mod h1:ZQsfcByZ05Ah9yrgOJsN3JPz4jo374DrdVv8kvcIquA= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= diff --git a/vendor/modules.txt b/vendor/modules.txt index 1344ca7..dbcd980 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,4 @@ -# github.com/DataWorkflowServices/dws v0.0.1-0.20230913204342-e78d55d24550 +# github.com/DataWorkflowServices/dws v0.0.13 ## explicit; go 1.19 github.com/DataWorkflowServices/dws/api/v1alpha2 github.com/DataWorkflowServices/dws/config/crd/bases