Merge pull request #10947 from kadel/update-olm-addon-0.17.0
Update olm addon to v0.17.0pull/10506/head
commit
114e826ede
File diff suppressed because it is too large
Load Diff
|
@ -78,9 +78,9 @@ spec:
|
||||||
command:
|
command:
|
||||||
- /bin/olm
|
- /bin/olm
|
||||||
args:
|
args:
|
||||||
- -namespace
|
- --namespace
|
||||||
- $(OPERATOR_NAMESPACE)
|
- $(OPERATOR_NAMESPACE)
|
||||||
- -writeStatusName
|
- --writeStatusName
|
||||||
- ""
|
- ""
|
||||||
image: {{.CustomRegistries.OLM | default .ImageRepository | default .Registries.OLM }}{{.Images.OLM}}
|
image: {{.CustomRegistries.OLM | default .ImageRepository | default .Registries.OLM }}{{.Images.OLM}}
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
|
@ -113,7 +113,7 @@ spec:
|
||||||
|
|
||||||
|
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
beta.kubernetes.io/os: linux
|
kubernetes.io/os: linux
|
||||||
---
|
---
|
||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
|
@ -143,6 +143,8 @@ spec:
|
||||||
- '-namespace'
|
- '-namespace'
|
||||||
- olm
|
- olm
|
||||||
- -configmapServerImage=quay.io/operator-framework/configmap-operator-registry:latest
|
- -configmapServerImage=quay.io/operator-framework/configmap-operator-registry:latest
|
||||||
|
- -util-image
|
||||||
|
- {{.CustomRegistries.OLM | default .ImageRepository | default .Registries.OLM }}{{.Images.OLM}}
|
||||||
image: {{.CustomRegistries.OLM | default .ImageRepository | default .Registries.OLM }}{{.Images.OLM}}
|
image: {{.CustomRegistries.OLM | default .ImageRepository | default .Registries.OLM }}{{.Images.OLM}}
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
ports:
|
ports:
|
||||||
|
@ -168,7 +170,7 @@ spec:
|
||||||
|
|
||||||
|
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
beta.kubernetes.io/os: linux
|
kubernetes.io/os: linux
|
||||||
---
|
---
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
|
@ -222,7 +224,7 @@ metadata:
|
||||||
name: packageserver
|
name: packageserver
|
||||||
namespace: olm
|
namespace: olm
|
||||||
labels:
|
labels:
|
||||||
olm.version: 0.14.1
|
olm.version: 0.17.0
|
||||||
spec:
|
spec:
|
||||||
displayName: Package Server
|
displayName: Package Server
|
||||||
description: Represents an Operator package that is available from a given CatalogSource which will resolve to a ClusterServiceVersion.
|
description: Represents an Operator package that is available from a given CatalogSource which will resolve to a ClusterServiceVersion.
|
||||||
|
@ -297,7 +299,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
serviceAccountName: olm-operator-serviceaccount
|
serviceAccountName: olm-operator-serviceaccount
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
beta.kubernetes.io/os: linux
|
kubernetes.io/os: linux
|
||||||
containers:
|
containers:
|
||||||
- name: packageserver
|
- name: packageserver
|
||||||
command:
|
command:
|
||||||
|
@ -308,7 +310,7 @@ spec:
|
||||||
- --global-namespace
|
- --global-namespace
|
||||||
- olm
|
- olm
|
||||||
image: {{.CustomRegistries.OLM | default .ImageRepository | default .Registries.OLM }}{{.Images.OLM}}
|
image: {{.CustomRegistries.OLM | default .ImageRepository | default .Registries.OLM }}{{.Images.OLM}}
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: Always
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 5443
|
- containerPort: 5443
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
|
@ -326,8 +328,16 @@ spec:
|
||||||
requests:
|
requests:
|
||||||
cpu: 10m
|
cpu: 10m
|
||||||
memory: 50Mi
|
memory: 50Mi
|
||||||
|
securityContext:
|
||||||
|
runAsUser: 1000
|
||||||
|
volumeMounts:
|
||||||
|
- name: tmpfs
|
||||||
|
mountPath: /tmp
|
||||||
|
volumes:
|
||||||
|
- name: tmpfs
|
||||||
|
emptyDir: {}
|
||||||
maturity: alpha
|
maturity: alpha
|
||||||
version: 0.14.1
|
version: 0.17.0
|
||||||
apiservicedefinitions:
|
apiservicedefinitions:
|
||||||
owned:
|
owned:
|
||||||
- group: packages.operators.coreos.com
|
- group: packages.operators.coreos.com
|
||||||
|
|
|
@ -305,7 +305,7 @@ var Addons = map[string]*Addon{
|
||||||
"olm.yaml",
|
"olm.yaml",
|
||||||
"0640"),
|
"0640"),
|
||||||
}, false, "olm", map[string]string{
|
}, false, "olm", map[string]string{
|
||||||
"OLM": "operator-framework/olm:0.14.1@sha256:0d15ffb5d10a176ef6e831d7865f98d51255ea5b0d16403618c94a004d049373",
|
"OLM": "operator-framework/olm:v0.17.0@sha256:de396b540b82219812061d0d753440d5655250c621c753ed1dc67d6154741607",
|
||||||
"UpstreamCommunityOperators": "operator-framework/upstream-community-operators:07bbc13@sha256:cc7b3fdaa1ccdea5866fcd171669dc0ed88d3477779d8ed32e3712c827e38cc0",
|
"UpstreamCommunityOperators": "operator-framework/upstream-community-operators:07bbc13@sha256:cc7b3fdaa1ccdea5866fcd171669dc0ed88d3477779d8ed32e3712c827e38cc0",
|
||||||
}, map[string]string{
|
}, map[string]string{
|
||||||
"OLM": "quay.io",
|
"OLM": "quay.io",
|
||||||
|
|
|
@ -462,7 +462,6 @@ func validateHelmTillerAddon(ctx context.Context, t *testing.T, profile string)
|
||||||
|
|
||||||
// validateOlmAddon tests the OLM addon
|
// validateOlmAddon tests the OLM addon
|
||||||
func validateOlmAddon(ctx context.Context, t *testing.T, profile string) {
|
func validateOlmAddon(ctx context.Context, t *testing.T, profile string) {
|
||||||
t.Skipf("Skipping olm test till this timeout issue is solved https://github.com/operator-framework/operator-lifecycle-manager/issues/1534#issuecomment-632342257")
|
|
||||||
defer PostMortemLogs(t, profile)
|
defer PostMortemLogs(t, profile)
|
||||||
|
|
||||||
client, err := kapi.Client(profile)
|
client, err := kapi.Client(profile)
|
||||||
|
|
Loading…
Reference in New Issue