Skip to content

Commit ea4e749

Browse files
Merge pull request #292 from timflannagan/ci/artifacts-dir-overriding-kubectl
Sync OLM commits 04/25
2 parents f70f4d6 + 8d57118 commit ea4e749

File tree

11 files changed

+16
-108
lines changed

11 files changed

+16
-108
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ e2e/operator-registry: ## Run e2e registry tests
122122
$(MAKE) e2e WHAT=operator-registry
123123

124124
e2e/olm: ## Run e2e olm tests
125-
$(MAKE) e2e WHAT=operator-lifecycle-manager E2E_INSTALL_NS=openshift-operator-lifecycle-manager E2E_TEST_NS=openshift-operators E2E_TIMEOUT=120m
125+
$(MAKE) e2e WHAT=operator-lifecycle-manager E2E_INSTALL_NS=openshift-operator-lifecycle-manager E2E_TEST_NS=openshift-operators E2E_TIMEOUT=120m KUBECTL=oc
126126

127127
.PHONY: vendor
128128
vendor:

staging/operator-lifecycle-manager/.github/workflows/retest.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

staging/operator-lifecycle-manager/Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,6 @@ endif
254254
# OLM - Install/Uninstall/Run #
255255
################################
256256

257-
.PHONY: run-console-local
258-
run-console-local:
259-
@echo Running script to run the OLM console locally:
260-
. ./scripts/run_console_local.sh
261-
262257
.PHONY: uninstall
263258
uninstall:
264259
@echo Uninstalling OLM:

staging/operator-lifecycle-manager/README.md

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<img src="/logo.svg#gh-light-mode-only" height="125px" alt="Operator Lifecycle Manager"></img>
2-
<img src="/logo-dark-mode.svg#gh-dark-mode-only" height="125px" alt="Operator Lifecycle Manager"></img>
1+
<img src="logo/logo.svg#gh-light-mode-only" height="125px" alt="Operator Lifecycle Manager"></img>
2+
<img src="logo/logo-dark-mode.svg#gh-dark-mode-only" height="125px" alt="Operator Lifecycle Manager"></img>
33

44
[![Container Repository on Quay.io](https://quay.io/repository/operator-framework/olm/status "Container Repository on Quay.io")](https://quay.io/repository/operator-framework/olm)
55
[![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
@@ -10,7 +10,6 @@
1010

1111
User documentation can be found on the [OLM website][olm-docs].
1212

13-
1413
## Overview
1514

1615
This project is a component of the [Operator Framework](https://github.com/operator-framework), an open source toolkit to manage Kubernetes native applications, called Operators, in an effective, automated, and scalable way. Read more in the [introduction blog post](https://operatorhub.io/what-is-an-operator) and learn about practical use cases at the [OLM website][olm-docs].
@@ -56,18 +55,6 @@ Install OLM on a Kubernetes cluster by following the [installation guide][instal
5655

5756
For a complete end-to-end example of how OLM fits into the Operator Framework, see the [Operator Framework website](https://operatorframework.io/about/) and the [Getting Started guide on OperatorHub.io](https://operatorhub.io/getting-started).
5857

59-
## User Interface (Running the console Locally)
60-
61-
Use the admin console to interact with and visualize the resources managed by OLM. Create subscriptions, approve install plans, identify Operator-managed resources, and more.
62-
63-
Ensure `kubectl` is pointing at a cluster and run:
64-
65-
```shell
66-
make run-console-local
67-
```
68-
69-
Then visit `http://localhost:9000` to view the console.
70-
7158
## Contributing your Operator
7259

7360
Have an awesome Operator you want to share? Checkout the [publishing docs](https://operatorhub.io/contribute) to learn about contributing to [OperatorHub.io](https://operatorhub.io/).
@@ -97,7 +84,7 @@ Learn more about the components used by OLM by reading about the [architecture]
9784

9885
OLM standardizes interactions with operators by requiring that the interface to an operator be via the Kubernetes API. Because we expect users to define the interfaces to their applications, OLM currently uses CRDs to define the Kubernetes API interactions.
9986

100-
Examples: [EtcdCluster CRD](https://github.com/redhat-openshift-ecosystem/community-operators-prod/blob/main/operators/etcd/0.9.4/etcdclusters.etcd.database.coreos.com.crd.yaml),
87+
Examples: [EtcdCluster CRD](https://github.com/redhat-openshift-ecosystem/community-operators-prod/blob/main/operators/etcd/0.9.4/etcdclusters.etcd.database.coreos.com.crd.yaml),
10188
[EtcdBackup CRD](https://github.com/redhat-openshift-ecosystem/community-operators-prod/blob/main/operators/etcd/0.9.4/etcdbackups.etcd.database.coreos.com.crd.yaml)
10289

10390
## Descriptors
@@ -112,10 +99,10 @@ To minimize the effort required to run an application on kubernetes, OLM handles
11299

113100
This is achieved through additional metadata on the application definition. Each operator must define:
114101

115-
- The CRDs that it is responsible for managing.
116-
- e.g., the etcd operator manages `EtcdCluster`.
117-
- The CRDs that it depends on.
118-
- e.g., the vault operator depends on `EtcdCluster`, because Vault is backed by etcd.
102+
- The CRDs that it is responsible for managing.
103+
- e.g., the etcd operator manages `EtcdCluster`.
104+
- The CRDs that it depends on.
105+
- e.g., the vault operator depends on `EtcdCluster`, because Vault is backed by etcd.
119106

120107
Basic dependency resolution is then possible by finding, for each “required” CRD, the corresponding operator that manages it and installing it as well. Dependency resolution can be further constrained by the way a user interacts with catalogs.
121108

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Logo
2+
3+
Home for the OLM related logos.

staging/operator-lifecycle-manager/scripts/run_console_local.sh

Lines changed: 0 additions & 67 deletions
This file was deleted.

staging/operator-lifecycle-manager/test/e2e/collect-ci-artifacts.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ set -o errexit
77
: "${KUBECONFIG:?}"
88
: "${TEST_NAMESPACE:?}"
99
: "${TEST_ARTIFACTS_DIR:?}"
10+
: "${KUBECTL:=kubectl}"
1011

12+
echo "Using the ${KUBECTL} kubectl binary"
13+
echo "Using the ${TEST_ARTIFACTS_DIR} output directory"
1114
mkdir -p "${TEST_ARTIFACTS_DIR}"
1215

1316
commands=()
@@ -23,5 +26,5 @@ echo "Storing the test artifact output in the ${TEST_ARTIFACTS_DIR} directory"
2326
for command in "${commands[@]}"; do
2427
echo "Collecting ${command} output..."
2528
COMMAND_OUTPUT_FILE=${TEST_ARTIFACTS_DIR}/${command// /_}
26-
kubectl -n ${TEST_NAMESPACE} ${command} >> "${COMMAND_OUTPUT_FILE}"
29+
${KUBECTL} -n ${TEST_NAMESPACE} ${command} >> "${COMMAND_OUTPUT_FILE}"
2730
done

staging/operator-lifecycle-manager/test/e2e/ctx/ctx.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ func (ctx TestContext) DumpNamespaceArtifacts(namespace string) error {
131131
"TEST_NAMESPACE=" + namespace,
132132
"TEST_ARTIFACTS_DIR=" + logDir,
133133
"KUBECONFIG=" + kubeconfigPath,
134+
"KUBECTL=" + os.Getenv("KUBECTL"),
134135
}
135136

136137
cmd := exec.Command(ctx.artifactsScriptPath)

0 commit comments

Comments
 (0)