Skip to content

Commit 44e22ed

Browse files
author
Alan Christie
committed
Updated for kopf 1.35.3 and k8s 19.15.0
1 parent 8f41461 commit 44e22ed

File tree

5 files changed

+14
-15
lines changed

5 files changed

+14
-15
lines changed

.github/workflows/build-tag.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
---
22
name: build tag
33

4-
# Actions for any 'unofficial' tag.
5-
#
6-
# It's not an official tag if it's not formed from 2 or 3 digits
7-
# (i.e. is not 'N.N[.N]'). We publish images using the tag as a tag.
4+
# Actions for any tag.
85

96
# -----------------
107
# Control variables (GitHub Secrets)
@@ -26,8 +23,6 @@ on:
2623
push:
2724
tags:
2825
- '**'
29-
- '![0-9]+.[0-9]+.[0-9]+'
30-
- '![0-9]+.[0-9]+'
3126

3227
jobs:
3328
build-tag:

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ The operator container, residing in the `operator` directory,
3131
is automatically built and pushed to Docker Hub using GitHub Actions.
3232

3333
You can build the image yourself using docker-compose.
34-
The following will build an operator image with the tag `1.0.0-alpha.1`: -
34+
The following will build an operator image with the tag `19.0.0-alpha.1`: -
3535

36-
$ export IMAGE_TAG=1.0.0-alpha.1
36+
$ export IMAGE_TAG=19.0.0-alpha.1
3737
$ docker-compose build
3838

3939
## Deploying into the Data Manager API

docker-compose.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,21 @@
55
# You can control some of the behaviour of the build
66
# with environment variables: -
77
#
8-
# - IMAGE_TAG The image version tag (default latest)
8+
# - IMAGE_TAG The image version tag(default 19.0.0)
9+
#
10+
# Note: The image tag MUST use the major version of the
11+
# kubernetes package the operator is built against.
12+
# The minor/patch values are free for your use.
913
#
1014
# i.e.: -
1115
#
12-
# IMAGE_TAG=1.0.0-alpha.1 docker-compose build
13-
# IMAGE_TAG=1.0.0-alpha.1 docker-compose push
16+
# IMAGE_TAG=19.0.0-alpha.1 docker-compose build
17+
# IMAGE_TAG=19.0.0-alpha.1 docker-compose push
1418

1519
version: '3.8'
1620

1721
services:
1822
operator:
1923
build:
2024
context: operator
21-
image: informaticsmatters/data-manager-jupyter-operator:${IMAGE_TAG:-latest}
25+
image: informaticsmatters/data-manager-jupyter-operator:${IMAGE_TAG:-19.0.0}

operator/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
kopf == 1.31.0
2-
kubernetes == 17.17.0
1+
kopf == 1.35.3
2+
kubernetes == 19.15.0

parameters-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# You can adjust the configuration using environment variables.
55

66
# The Operator image tag
7-
jo_image_tag: "{{ lookup('env', 'IM_DEV_JUPYTER_O_TAG') | default('1.1.4', True) }}"
7+
jo_image_tag: "{{ lookup('env', 'IM_DEV_JUPYTER_O_TAG') | default('19.0.0', True) }}"
88

99
# Here we use the Docker Desktop built-in Kubernetes cluster,
1010
# which has a default domain of 'kubernetes.docker.internal'

0 commit comments

Comments
 (0)