Skip to content

Commit

Permalink
Upgrade to Kubernetes v1.25
Browse files Browse the repository at this point in the history
  • Loading branch information
@halim-lee
halim-lee committed Sep 18, 2023
1 parent 055a7d0 commit 67b54b9
Show file tree
Hide file tree
Showing 18 changed files with 372 additions and 451 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
VERSION ?= 1.2.2
OPERATOR_SDK_RELEASE_VERSION ?= v1.24.0
OPERATOR_SDK_RELEASE_VERSION ?= v1.27.0

# CHANNELS define the bundle channels used in the bundle.
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "preview,fast,stable")
Expand Down
2 changes: 1 addition & 1 deletion bundle.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
LABEL operators.operatorframework.io.bundle.package.v1=runtime-component
LABEL operators.operatorframework.io.bundle.channels.v1=v1.2
LABEL operators.operatorframework.io.bundle.channel.default.v1=v1.2
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.24.0
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.27.0
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3

Expand Down
68 changes: 62 additions & 6 deletions bundle/manifests/rc.app.stacks_runtimecomponents.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2528,6 +2528,9 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
enableHttp2:
description: Whether to enable HTTP2.
type: boolean
followRedirects:
description: FollowRedirects configures whether scrape requests
follow HTTP 3xx redirects.
Expand Down Expand Up @@ -2558,15 +2561,27 @@ spec:
action:
default: replace
description: Action to perform based on regex matching.
Default is 'replace'
Default is 'replace'. uppercase and lowercase actions
require Prometheus >= 2.36.
enum:
- replace
- Replace
- keep
- Keep
- drop
- Drop
- hashmod
- HashMod
- labelmap
- LabelMap
- labeldrop
- LabelDrop
- labelkeep
- LabelKeep
- lowercase
- Lowercase
- uppercase
- Uppercase
type: string
modulus:
description: Modulus to take of the hash of the source
Expand Down Expand Up @@ -2706,7 +2721,8 @@ spec:
description: Optional HTTP URL parameters
type: object
path:
description: HTTP path to scrape for metrics.
description: HTTP path to scrape for metrics. If empty,
Prometheus uses the default value (e.g. `/metrics`).
type: string
port:
description: Name of the service port this endpoint refers
Expand All @@ -2731,15 +2747,27 @@ spec:
action:
default: replace
description: Action to perform based on regex matching.
Default is 'replace'
Default is 'replace'. uppercase and lowercase actions
require Prometheus >= 2.36.
enum:
- replace
- Replace
- keep
- Keep
- drop
- Drop
- hashmod
- HashMod
- labelmap
- LabelMap
- labeldrop
- LabelDrop
- labelkeep
- LabelKeep
- lowercase
- Lowercase
- uppercase
- Uppercase
type: string
modulus:
description: Modulus to take of the hash of the source
Expand Down Expand Up @@ -9501,6 +9529,9 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
enableHttp2:
description: Whether to enable HTTP2.
type: boolean
followRedirects:
description: FollowRedirects configures whether scrape requests
follow HTTP 3xx redirects.
Expand Down Expand Up @@ -9531,15 +9562,27 @@ spec:
action:
default: replace
description: Action to perform based on regex matching.
Default is 'replace'
Default is 'replace'. uppercase and lowercase actions
require Prometheus >= 2.36.
enum:
- replace
- Replace
- keep
- Keep
- drop
- Drop
- hashmod
- HashMod
- labelmap
- LabelMap
- labeldrop
- LabelDrop
- labelkeep
- LabelKeep
- lowercase
- Lowercase
- uppercase
- Uppercase
type: string
modulus:
description: Modulus to take of the hash of the source
Expand Down Expand Up @@ -9679,7 +9722,8 @@ spec:
description: Optional HTTP URL parameters
type: object
path:
description: HTTP path to scrape for metrics.
description: HTTP path to scrape for metrics. If empty,
Prometheus uses the default value (e.g. `/metrics`).
type: string
port:
description: Name of the service port this endpoint refers
Expand All @@ -9704,15 +9748,27 @@ spec:
action:
default: replace
description: Action to perform based on regex matching.
Default is 'replace'
Default is 'replace'. uppercase and lowercase actions
require Prometheus >= 2.36.
enum:
- replace
- Replace
- keep
- Keep
- drop
- Drop
- hashmod
- HashMod
- labelmap
- LabelMap
- labeldrop
- LabelDrop
- labelkeep
- LabelKeep
- lowercase
- Lowercase
- uppercase
- Uppercase
type: string
modulus:
description: Modulus to take of the hash of the source
Expand Down
12 changes: 6 additions & 6 deletions bundle/manifests/runtime-component.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
"name": "runtimecomponent-sample"
},
"spec": {
"applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:6bf52d536e94d6aa6eaa3ca9639e0fe9f5e71dbd891c50362939dd6aca519d02",
"applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:f7c7da21059eef8734cf0d43a417609aecf68bfe89d0be8e61012fade5877a01",
"expose": true,
"manageTLS": true,
"replicas": 1,
Expand Down Expand Up @@ -41,7 +41,7 @@ metadata:
"name": "runtimecomponent-sample"
},
"spec": {
"applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:6bf52d536e94d6aa6eaa3ca9639e0fe9f5e71dbd891c50362939dd6aca519d02",
"applicationImage": "icr.io/appcafe/open-liberty/samples/getting-started@sha256:f7c7da21059eef8734cf0d43a417609aecf68bfe89d0be8e61012fade5877a01",
"expose": true,
"replicas": 1,
"service": {
Expand All @@ -68,11 +68,11 @@ metadata:
categories: Application Runtime
certified: "true"
containerImage: icr.io/appcafe/runtime-component-operator:daily
createdAt: "2023-08-22T16:46:50Z"
createdAt: "2023-09-18T19:57:40Z"
description: Deploys any runtime component with dynamic and auto-tuning configuration
olm.skipRange: '>=0.8.0 <1.2.2'
operators.openshift.io/infrastructure-features: '["disconnected"]'
operators.operatorframework.io/builder: operator-sdk-v1.24.0
operators.operatorframework.io/builder: operator-sdk-v1.27.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/application-stacks/runtime-component-operator
support: Community
Expand Down Expand Up @@ -976,7 +976,7 @@ spec:
fieldRef:
fieldPath: metadata.annotations['olm.targetNamespaces']
- name: RELATED_IMAGE_LIBERTY_SAMPLE_APP
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:6bf52d536e94d6aa6eaa3ca9639e0fe9f5e71dbd891c50362939dd6aca519d02
value: icr.io/appcafe/open-liberty/samples/getting-started@sha256:f7c7da21059eef8734cf0d43a417609aecf68bfe89d0be8e61012fade5877a01
- name: RELATED_IMAGE_RUNTIME_COMPONENT_OPERATOR
value: icr.io/appcafe/runtime-component-operator:daily
image: icr.io/appcafe/runtime-component-operator:daily
Expand Down Expand Up @@ -1259,7 +1259,7 @@ spec:
provider:
name: Community
relatedImages:
- image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:6bf52d536e94d6aa6eaa3ca9639e0fe9f5e71dbd891c50362939dd6aca519d02
- image: icr.io/appcafe/open-liberty/samples/getting-started@sha256:f7c7da21059eef8734cf0d43a417609aecf68bfe89d0be8e61012fade5877a01
name: liberty-sample-app
- image: icr.io/appcafe/runtime-component-operator:daily
name: runtime-component-operator
Expand Down
2 changes: 1 addition & 1 deletion bundle/metadata/annotations.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ annotations:
operators.operatorframework.io.bundle.package.v1: runtime-component
operators.operatorframework.io.bundle.channels.v1: v1.2
operators.operatorframework.io.bundle.channel.default.v1: v1.2
operators.operatorframework.io.metrics.builder: operator-sdk-v1.24.0
operators.operatorframework.io.metrics.builder: operator-sdk-v1.27.0
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3

Expand Down
68 changes: 62 additions & 6 deletions config/crd/bases/rc.app.stacks_runtimecomponents.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2525,6 +2525,9 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
enableHttp2:
description: Whether to enable HTTP2.
type: boolean
followRedirects:
description: FollowRedirects configures whether scrape requests
follow HTTP 3xx redirects.
Expand Down Expand Up @@ -2555,15 +2558,27 @@ spec:
action:
default: replace
description: Action to perform based on regex matching.
Default is 'replace'
Default is 'replace'. uppercase and lowercase actions
require Prometheus >= 2.36.
enum:
- replace
- Replace
- keep
- Keep
- drop
- Drop
- hashmod
- HashMod
- labelmap
- LabelMap
- labeldrop
- LabelDrop
- labelkeep
- LabelKeep
- lowercase
- Lowercase
- uppercase
- Uppercase
type: string
modulus:
description: Modulus to take of the hash of the source
Expand Down Expand Up @@ -2703,7 +2718,8 @@ spec:
description: Optional HTTP URL parameters
type: object
path:
description: HTTP path to scrape for metrics.
description: HTTP path to scrape for metrics. If empty,
Prometheus uses the default value (e.g. `/metrics`).
type: string
port:
description: Name of the service port this endpoint refers
Expand All @@ -2728,15 +2744,27 @@ spec:
action:
default: replace
description: Action to perform based on regex matching.
Default is 'replace'
Default is 'replace'. uppercase and lowercase actions
require Prometheus >= 2.36.
enum:
- replace
- Replace
- keep
- Keep
- drop
- Drop
- hashmod
- HashMod
- labelmap
- LabelMap
- labeldrop
- LabelDrop
- labelkeep
- LabelKeep
- lowercase
- Lowercase
- uppercase
- Uppercase
type: string
modulus:
description: Modulus to take of the hash of the source
Expand Down Expand Up @@ -9498,6 +9526,9 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
enableHttp2:
description: Whether to enable HTTP2.
type: boolean
followRedirects:
description: FollowRedirects configures whether scrape requests
follow HTTP 3xx redirects.
Expand Down Expand Up @@ -9528,15 +9559,27 @@ spec:
action:
default: replace
description: Action to perform based on regex matching.
Default is 'replace'
Default is 'replace'. uppercase and lowercase actions
require Prometheus >= 2.36.
enum:
- replace
- Replace
- keep
- Keep
- drop
- Drop
- hashmod
- HashMod
- labelmap
- LabelMap
- labeldrop
- LabelDrop
- labelkeep
- LabelKeep
- lowercase
- Lowercase
- uppercase
- Uppercase
type: string
modulus:
description: Modulus to take of the hash of the source
Expand Down Expand Up @@ -9676,7 +9719,8 @@ spec:
description: Optional HTTP URL parameters
type: object
path:
description: HTTP path to scrape for metrics.
description: HTTP path to scrape for metrics. If empty,
Prometheus uses the default value (e.g. `/metrics`).
type: string
port:
description: Name of the service port this endpoint refers
Expand All @@ -9701,15 +9745,27 @@ spec:
action:
default: replace
description: Action to perform based on regex matching.
Default is 'replace'
Default is 'replace'. uppercase and lowercase actions
require Prometheus >= 2.36.
enum:
- replace
- Replace
- keep
- Keep
- drop
- Drop
- hashmod
- HashMod
- labelmap
- LabelMap
- labeldrop
- LabelDrop
- labelkeep
- LabelKeep
- lowercase
- Lowercase
- uppercase
- Uppercase
type: string
modulus:
description: Modulus to take of the hash of the source
Expand Down
Loading

0 comments on commit 67b54b9

Please sign in to comment.