Skip to content

Commit

Permalink
Merge pull request DataWorkflowServices#10 from roehrich-hpe/release-…
Browse files Browse the repository at this point in the history
…v0.0.3

Release v0.0.3
  • Loading branch information
roehrich-hpe authored Sep 14, 2023
2 parents 3adce62 + 597c8e8 commit 96d2a0e
Show file tree
Hide file tree
Showing 62 changed files with 105 additions and 101 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/default/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/dws/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
namespace: dws-operator-system
namespace: dws-system
resources:
- "test-ruleset.yaml"
2 changes: 1 addition & 1 deletion config/dws/test-ruleset.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: dws.cray.hpe.com/v1alpha2
apiVersion: dataworkflowservices.github.io/v1alpha2
kind: DWDirectiveRule
metadata:
name: rules
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: manager-role
rules:
- apiGroups:
- dws.cray.hpe.com
- dataworkflowservices.github.io
resources:
- workflows
verbs:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/base-workflow.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: dws.cray.hpe.com/v1alpha2
apiVersion: dataworkflowservices.github.io/v1alpha2
kind: Workflow
metadata:
name: base
Expand Down
2 changes: 1 addition & 1 deletion config/samples/complex-workflow.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: dws.cray.hpe.com/v1alpha2
apiVersion: dataworkflowservices.github.io/v1alpha2
kind: Workflow
metadata:
name: complex
Expand Down
12 changes: 6 additions & 6 deletions controllers/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down Expand Up @@ -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")
Expand All @@ -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"),
},
}

Expand Down
8 changes: 4 additions & 4 deletions controllers/workflow_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion controllers/workflow_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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.13
github.com/ghodss/yaml v1.0.0
github.com/go-logr/logr v1.2.4
github.com/google/go-cmp v0.5.9
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -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.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=
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

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

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

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

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

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

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

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

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

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

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

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

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

Loading

0 comments on commit 96d2a0e

Please sign in to comment.