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

Setting up 23.7.1 branch #1208

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ before_install:
script:
- |
echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USER}" --password-stdin
if [ "${TRAVIS_BRANCH}" == "px-rel-23.7.0" ]; then
export DOCKER_HUB_OPERATOR_TAG=23.7.0-dev
export DOCKER_HUB_OPERATOR_TEST_TAG=23.7.0-dev
if [ "${TRAVIS_BRANCH}" == "px-rel-23.7.1" ]; then
export DOCKER_HUB_OPERATOR_TAG=23.7.1-dev
export DOCKER_HUB_OPERATOR_TEST_TAG=23.7.1-dev
else
export DOCKER_HUB_OPERATOR_TAG=`git rev-parse --short HEAD`
export DOCKER_HUB_OPERATOR_TEST_TAG=`git rev-parse --short HEAD`
Expand All @@ -21,7 +21,7 @@ script:
if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
make deploy;
make integration-test-deploy;
if [ "${TRAVIS_BRANCH}" == "px-rel-23.7.0" ]; then
if [ "${TRAVIS_BRANCH}" == "px-rel-23.7.1" ]; then
make bundle catalog
fi
fi
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ ifndef DOCKER_HUB_REGISTRY_IMG
$(warning DOCKER_HUB_REGISTRY_IMG not defined, using '$(DOCKER_HUB_REGISTRY_IMG)' instead)
endif
ifndef BASE_REGISTRY_IMG
BASE_REGISTRY_IMG := docker.io/portworx/px-operator-registry:23.5.1
BASE_REGISTRY_IMG := docker.io/portworx/px-operator-registry:23.7.0
$(warning BASE_REGISTRY_IMG not defined, using '$(BASE_REGISTRY_IMG)' instead)
endif

Expand Down Expand Up @@ -56,7 +56,7 @@ ifeq ($(BUILD_TYPE),debug)
BUILDFLAGS += -gcflags "-N -l"
endif

RELEASE_VER := 23.7.0
RELEASE_VER := 23.7.1
BASE_DIR := $(shell git rev-parse --show-toplevel)
GIT_SHA := $(shell git rev-parse --short HEAD)
BIN := $(BASE_DIR)/bin
Expand Down
3,919 changes: 3,919 additions & 0 deletions deploy/olm-catalog/portworx/23.7.1/core_v1_storagecluster_crd.yaml

Large diffs are not rendered by default.

172 changes: 172 additions & 0 deletions deploy/olm-catalog/portworx/23.7.1/core_v1_storagenode_crd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: storagenodes.core.libopenstorage.org
spec:
group: core.libopenstorage.org
names:
kind: StorageNode
listKind: StorageNodeList
plural: storagenodes
singular: storagenode
shortNames:
- sn
scope: Namespaced
versions:
- name: v1
served: true
storage: true
subresources:
status: {}
additionalPrinterColumns:
- name: ID
type: string
description: The corresponding Kubernetes node name for the storage node
jsonPath: .status.nodeUid
- name: Status
type: string
description: The status of the storage node
jsonPath: .status.phase
- name: Version
type: string
description: The version of the storage node
jsonPath: .spec.version
- name: Age
type: date
description: The age of the storage cluster
jsonPath: .metadata.creationTimestamp
schema:
openAPIV3Schema:
type: object
properties:
spec:
type: object
description: The desired behavior of the storage node. Currently changing the spec does
not affect the actual storage node in the cluster. Eventually spec in StorageNode will
override the spec from StorageCluster so that configuration can be overridden at node
level.
properties:
version:
type: string
description: Version of the storage driver on the node.
cloudStorage:
type: object
description: Details of storage on the node for cloud environments.
properties:
driveConfigs:
type: array
description: List of cloud drive configs for the storage node.
items:
type: object
properties:
type:
type: string
description: Type of cloud drive.
sizeInGiB:
type: integer
format: int64
minimum: 0
description: Size of cloud drive in GiB.
iops:
type: integer
format: int64
minimum: 0
description: IOPS required from the cloud drive.
options:
type: object
x-kubernetes-preserve-unknown-fields: true
description: Additional options for the cloud drive.
status:
type: object
description: Most recently observed status of the storage node. The data may not be up
to date.
properties:
nodeUid:
type: string
description: Unique ID of the storage node.
phase:
type: string
description: Phase of the StorageNode is a simple, high-level summary of where
the StorageNode is in its lifecycle. The condition array contains more detailed
information about the state of the node.
network:
type: object
description: Contains network information used by the storage node
properties:
dataIP:
type: string
description: IP address used by the storage driver for data traffic.
mgmtIP:
type: string
description: IP address used by the storage driver for management traffic.
storage:
type: object
description: Contains details of the status of storage for the node
properties:
totalSize:
type: string
description: Cumulative total size of all storage pools on the node.
usedSize:
type: string
description: Cumulative used size of all storage pools on the node.
conditions:
type: array
description: Contains details for the current condition of this storage node.
items:
type: object
properties:
type:
type: string
description: Type of the condition.
status:
type: string
description: Status of the condition.
reason:
type: string
description: Reason is a unique one-word reason about the current state
of the cluster.
message:
type: string
description: Message is the human readable message indicating details about the
current state of the cluster.
lastTransitionTime:
type: string
format: date-time
description: Time at which the condition changed.
checks:
type: array
description: Contains list of pre or post flight checks that are performed by the Operator
items:
type: object
properties:
type:
type: string
description: Type of the check.
reason:
type: string
description: Reason for success or failure of the check
success:
type: boolean
description: If true, the check was successful
geography:
type: object
description: Contains topology information for the storage node.
properties:
region:
type: string
description: Region in which the storage node is placed.
zone:
type: string
description: Zone in which the storage node is placed.
rack:
type: string
description: Rack on which the storage node is placed.
- name: v1alpha1
served: false
storage: false
subresources:
status: {}
schema:
openAPIV3Schema:
type: object
x-kubernetes-preserve-unknown-fields: true

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions deploy/olm-catalog/portworx/portworx.package.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
packageName: portworx-certified
channels:
- name: alpha
currentCSV: portworx-operator.v23.7.0
currentCSV: portworx-operator.v23.7.1
- name: stable
currentCSV: portworx-operator.v23.7.0
currentCSV: portworx-operator.v23.7.1
defaultChannel: stable
2 changes: 1 addition & 1 deletion deploy/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
spec:
containers:
- name: portworx-operator
image: portworx/px-operator:1.11.0-dev
image: portworx/px-operator:23.7.1-dev
imagePullPolicy: Always
command:
- /operator
Expand Down
Loading