Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added a --no-module flag to the Operator e2e tests #673

Closed
wants to merge 8 commits into from
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ run: generate gen-semver fmt vet static-manifests ## Run a controller from your
podman-build: gen-semver build-base-image ## Build podman image with the manager.
podman build . -t ${DEFAULT_IMG} --build-arg BASEIMAGE=$(BASEIMAGE) --build-arg GOIMAGE=$(DEFAULT_GOIMAGE)

podman-build-no-cache: gen-semver build-base-image ## Build podman image with the manager.
podman build --no-cache . -t ${DEFAULT_IMG} --build-arg BASEIMAGE=$(BASEIMAGE) --build-arg GOIMAGE=$(DEFAULT_GOIMAGE)

podman-push: podman-build ## Builds, tags and pushes docker image with the manager.
podman tag ${DEFAULT_IMG} ${IMG}
podman push ${IMG}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
singular: csmrole
scope: Namespaced
versions:
- name: v1alpha1
- name: v1
schema:
openAPIV3Schema:
description: CSMRole is the Schema for the csmroles API
Expand Down Expand Up @@ -152,7 +152,7 @@ spec:
singular: csmtenant
scope: Namespaced
versions:
- name: v1alpha1
- name: v1
schema:
openAPIV3Schema:
description: CSMTenant is the Schema for the csmtenants API
Expand Down Expand Up @@ -299,7 +299,7 @@ spec:
singular: storage
scope: Namespaced
versions:
- name: v1alpha1
- name: v1
schema:
openAPIV3Schema:
description: Storage is the Schema for the storages API
Expand Down
2 changes: 1 addition & 1 deletion samples/authorization/csm-authorization_csmrole.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: csm-authorization.storage.dell.com/v1alpha1
apiVersion: csm-authorization.storage.dell.com/v1
kind: CSMRole
metadata:
labels:
Expand Down
2 changes: 1 addition & 1 deletion samples/authorization/csm-authorization_csmtenant.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: csm-authorization.storage.dell.com/v1alpha1
apiVersion: csm-authorization.storage.dell.com/v1
kind: CSMTenant
metadata:
labels:
Expand Down
2 changes: 1 addition & 1 deletion samples/authorization/csm-authorization_storage.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: csm-authorization.storage.dell.com/v1alpha1
apiVersion: csm-authorization.storage.dell.com/v1
kind: Storage
metadata:
name: powerflex
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,30 +74,22 @@ spec:
sentinel: sentinel
redisReplicas: 5
- name: vault
vaultConfigurations:
- identifier: vault0
address: https://10.0.0.1:8400
role: csm-authorization
skipCertificateValidation: true
# clientCertificate: base64-encoded certificate for cert/private-key pair -- add certificate here to use custom certificates
# for self-signed certs, leave empty string
# Allowed values: string
clientCertificate: ""
# clientKey: base64-encoded private key for cert/private-key pair -- add private key here to use custom certificates
# for self-signed certs, leave empty string
# Allowed values: string
clientKey: ""
# certificateAuthority: base64-encoded certificate authority for validating vault server certificate -- add certificate authority here to use custom certificates
# for self-signed certs, leave empty string
# Allowed values: string
certificateAuthority: ""
# - identifier: vault0
# address: https://10.0.0.1:8400
# role: csm-authorization
# skipCertificateValidation: true
# clientCertificate:
# clientKey:
# certificateAuthority:
vaultAddress: https://10.0.0.1:8400
vaultRole: csm-authorization
skipCertificateValidation: true
kvEnginePath: secret
# certificate: base64-encoded certificate for cert/private-key pair -- add cert here to use custom certificates
# for self-signed certs, leave empty string
# Allowed values: string
certificate: ""
# privateKey: base64-encoded private key for cert/private-key pair -- add private key here to use custom certificates
# for self-signed certs, leave empty string
# Allowed values: string
privateKey: ""
# certificateAuthority: base64-encoded certificate authority for validating vault server certificate -- add certificate authority here to use custom certificates
# for self-signed certs, leave empty string
# Allowed values: string
certificateAuthority: ""
---
apiVersion: v1
kind: ConfigMap
Expand Down
40 changes: 24 additions & 16 deletions samples/authorization/csm_authorization_proxy_server_v200.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,22 +74,30 @@ spec:
sentinel: sentinel
redisReplicas: 5
- name: vault
vaultAddress: https://10.0.0.1:8400
vaultRole: csm-authorization
skipCertificateValidation: true
kvEnginePath: secret
# certificate: base64-encoded certificate for cert/private-key pair -- add cert here to use custom certificates
# for self-signed certs, leave empty string
# Allowed values: string
certificate: ""
# privateKey: base64-encoded private key for cert/private-key pair -- add private key here to use custom certificates
# for self-signed certs, leave empty string
# Allowed values: string
privateKey: ""
# certificateAuthority: base64-encoded certificate authority for validating vault server certificate -- add certificate authority here to use custom certificates
# for self-signed certs, leave empty string
# Allowed values: string
certificateAuthority: ""
vaultConfigurations:
- identifier: vault0
address: https://10.0.0.1:8400
role: csm-authorization
skipCertificateValidation: true
# clientCertificate: base64-encoded certificate for cert/private-key pair -- add certificate here to use custom certificates
# for self-signed certs, leave empty string
# Allowed values: string
clientCertificate: ""
# clientKey: base64-encoded private key for cert/private-key pair -- add private key here to use custom certificates
# for self-signed certs, leave empty string
# Allowed values: string
clientKey: ""
# certificateAuthority: base64-encoded certificate authority for validating vault server certificate -- add certificate authority here to use custom certificates
# for self-signed certs, leave empty string
# Allowed values: string
certificateAuthority: ""
# - identifier: vault0
# address: https://10.0.0.1:8400
# role: csm-authorization
# skipCertificateValidation: true
# clientCertificate:
# clientKey:
# certificateAuthority:
---
apiVersion: v1
kind: ConfigMap
Expand Down
26 changes: 26 additions & 0 deletions samples/ocp/1.6.0/connectivity_client_v110.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
apiVersion: storage.dell.com/v1
kind: ApexConnectivityClient
metadata:
name: dell-connectivity-client
namespace: dell-connectivity-client
spec:
client:
csmClientType: "apexConnectivityClient"
configVersion: v1.1.0
connectionTarget: connect-into.dell.com
forceRemoveClient: true
common:
name: connectivity-client-docker-k8s
image: registry.connect.redhat.com/dell-emc/connectivity-client-docker-k8s@sha256:204be30a60ee2864cf8e9a8a49f13efbee14222c78f27307288f59b5eb188158
imagePullPolicy: IfNotPresent
initContainers:
- name: connectivity-client-init
image: registry.connect.redhat.com/dell-emc/connectivity-client-docker-k8s@sha256:204be30a60ee2864cf8e9a8a49f13efbee14222c78f27307288f59b5eb188158
imagePullPolicy: IfNotPresent
sideCars:
- name: kubernetes-proxy
image: docker.io/bitnami/kubectl@sha256:e9d32369b107d0ceeee228c4dc19eff372c26009f29a2fc8f22327508f608542
imagePullPolicy: IfNotPresent
- name: cert-persister
image: docker.io/dellemc/connectivity-cert-persister-k8s@sha256:aaa935f3ba99a91bf5f00c53de5cd69e23716645ea9690f050c4ed80834661fc
imagePullPolicy: IfNotPresent
Loading
Loading