Skip to content
Closed
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
2 changes: 1 addition & 1 deletion Makefile.kube_git.var
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KUBE_GIT_MAJOR=1
KUBE_GIT_MINOR=26
KUBE_GIT_VERSION=v1.26.0
KUBE_GIT_COMMIT=9eb81c20e0fde9d068ed83e58c8fc870412958a9
KUBE_GIT_COMMIT=149fe529fd7884d0799753f3ed54f2a89d8036d9
KUBE_GIT_TREE_STATE=clean
10 changes: 5 additions & 5 deletions assets/components/lvms/topolvm-controller_deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
- command:
- /topolvm-controller
- --cert-dir=/certs
image: {{ .ReleaseImage.topolvm_csi }}
image: '{{ .ReleaseImage.topolvm_csi }}'
livenessProbe:
failureThreshold: 3
httpGet:
Expand Down Expand Up @@ -69,7 +69,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: {{ .ReleaseImage.topolvm_csi_provisioner }}
image: '{{ .ReleaseImage.topolvm_csi_provisioner }}'
name: csi-provisioner
resources:
requests:
Expand All @@ -80,7 +80,7 @@ spec:
name: socket-dir
- args:
- --csi-address=/run/topolvm/csi-topolvm.sock
image: {{ .ReleaseImage.topolvm_csi_resizer }}
image: '{{ .ReleaseImage.topolvm_csi_resizer }}'
name: csi-resizer
resources:
requests:
Expand All @@ -91,7 +91,7 @@ spec:
name: socket-dir
- args:
- --csi-address=/run/topolvm/csi-topolvm.sock
image: {{ .ReleaseImage.topolvm_csi_livenessprobe }}
image: '{{ .ReleaseImage.topolvm_csi_livenessprobe }}'
name: liveness-probe
resources:
requests:
Expand All @@ -106,7 +106,7 @@ spec:
- -c
- openssl req -nodes -x509 -newkey rsa:4096 -subj '/DC=self_signed_certificate'
-keyout /certs/tls.key -out /certs/tls.crt -days 3650
image: {{ .ReleaseImage.openssl }}
image: '{{ .ReleaseImage.openssl }}'
name: self-signed-cert-generator
resources: {}
volumeMounts:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ metadata:
name: topolvm-controller
namespace: openshift-storage
rules:
- apiGroups:
- ""
resources:
- configmaps
verbs:
- get
- watch
- list
- delete
- update
- create
- apiGroups:
- ""
resources:
- configmaps
verbs:
- get
- watch
- list
- delete
- update
- create
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ roleRef:
kind: Role
name: topolvm-controller
subjects:
- kind: ServiceAccount
name: topolvm-controller
namespace: openshift-storage
- kind: ServiceAccount
name: topolvm-controller
namespace: openshift-storage
5 changes: 2 additions & 3 deletions assets/components/lvms/topolvm-lvmd-config_configmap_v1.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Source: topolvm/templates/lvmd/configmap.yaml
apiVersion: v1
data:
lvmd.yaml: ""
kind: ConfigMap
metadata:
name: lvmd
namespace: openshift-storage
data:
lvmd.yaml: {{ .lvmd }}
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ allowHostPID: true
allowHostPorts: false
allowPrivilegeEscalation: true
allowPrivilegedContainer: true
allowedCapabilities:
allowedCapabilities: []
apiVersion: security.openshift.io/v1
defaultAddCapabilities:
defaultAddCapabilities: []
fsGroup:
type: RunAsAny
groups: []
kind: SecurityContextConstraints
metadata:
name: topolvm-node
priority:
priority: null
readOnlyRootFilesystem: false
requiredDropCapabilities: []
runAsUser:
Expand Down
36 changes: 18 additions & 18 deletions assets/components/lvms/topolvm-node_daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
template:
metadata:
annotations:
lvms.microshift.io/lvmd_config_sha256sum: "{{ Sha256sum .lvmd }}"
lvms.microshift.io/lvmd_config_sha256sum: '{{ Sha256sum .lvmd }}'
labels:
app.kubernetes.io/component: topolvm-node
app.kubernetes.io/managed-by: lvms-operator
Expand All @@ -30,16 +30,16 @@ spec:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: "kubernetes.io/os"
operator: In
values:
- "linux"
- key: kubernetes.io/os
operator: In
values:
- linux
containers:
- command:
- /lvmd
- --config=/etc/topolvm/lvmd.yaml
- --container=true
image: {{ .ReleaseImage.topolvm_csi }}
image: '{{ .ReleaseImage.topolvm_csi }}'
name: lvmd
resources:
requests:
Expand All @@ -49,7 +49,7 @@ spec:
privileged: true
runAsUser: 0
volumeMounts:
- mountPath: {{ Dir .SocketName }}
- mountPath: '{{ Dir .SocketName }}'
name: lvmd-socket-dir
- mountPath: /etc/topolvm
name: lvmd-config-dir
Expand All @@ -61,7 +61,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: {{ .ReleaseImage.topolvm_csi }}
image: '{{ .ReleaseImage.topolvm_csi }}'
livenessProbe:
failureThreshold: 3
httpGet:
Expand All @@ -85,7 +85,7 @@ spec:
volumeMounts:
- mountPath: /run/topolvm
name: node-plugin-dir
- mountPath: {{ Dir .SocketName }}
- mountPath: '{{ Dir .SocketName }}'
name: lvmd-socket-dir
- mountPath: /var/lib/kubelet/pods
mountPropagation: Bidirectional
Expand All @@ -96,7 +96,7 @@ spec:
- args:
- --csi-address=/run/topolvm/csi-topolvm.sock
- --kubelet-registration-path=/var/lib/kubelet/plugins/topolvm.io/node/csi-topolvm.sock
image: {{ .ReleaseImage.topolvm_csi_registrar }}
image: '{{ .ReleaseImage.topolvm_csi_registrar }}'
lifecycle:
preStop:
exec:
Expand All @@ -116,7 +116,7 @@ spec:
name: registration-dir
- args:
- --csi-address=/run/topolvm/csi-topolvm.sock
image: {{ .ReleaseImage.topolvm_csi_livenessprobe }}
image: '{{ .ReleaseImage.topolvm_csi_livenessprobe }}'
name: liveness-probe
resources:
requests:
Expand All @@ -132,7 +132,7 @@ spec:
- -c
- until [ -f /etc/topolvm/lvmd.yaml ]; do echo waiting for lvmd config file;
sleep 5; done
image: {{ .ReleaseImage.openssl }}
image: '{{ .ReleaseImage.openssl }}'
name: file-checker
resources: {}
volumeMounts:
Expand All @@ -156,14 +156,14 @@ spec:
path: /var/lib/kubelet/pods/
type: DirectoryOrCreate
name: pod-volumes-dir
- name: lvmd-config-dir
configMap:
name: lvmd
- configMap:
items:
- key: lvmd.yaml
path: lvmd.yaml
- key: lvmd.yaml
path: lvmd.yaml
name: lvmd
name: lvmd-config-dir
- emptyDir:
medium: Memory
name: lvmd-socket-dir
updateStrategy:
type: RollingUpdate
type: RollingUpdate
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apiVersion: v1
kind: Namespace
metadata:
name: openshift-storage
annotations:
openshift.io/node-selector: ""
workload.openshift.io/allowed: "management"
workload.openshift.io/allowed: management
labels:
openshift.io/run-level: "0"
pod-security.kubernetes.io/audit: privileged
pod-security.kubernetes.io/enforce: privileged
pod-security.kubernetes.io/warn: privileged
name: openshift-storage
4 changes: 2 additions & 2 deletions assets/components/openshift-dns/dns/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ spec:
requests:
cpu: 50m
memory: 70Mi
image: {{ .ReleaseImage.coredns }}
image: '{{ .ReleaseImage.coredns }}'
- name: kube-rbac-proxy
args:
- --logtostderr
Expand All @@ -70,7 +70,7 @@ spec:
- mountPath: /etc/tls/private
name: metrics-tls
readOnly: true
image: {{ .ReleaseImage.kube_rbac_proxy }}
image: '{{ .ReleaseImage.kube_rbac_proxy }}'
imagePullPolicy: IfNotPresent
dnsPolicy: Default
volumes:
Expand Down
2 changes: 1 addition & 1 deletion assets/components/openshift-dns/dns/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
port: 9154
targetPort: metrics
protocol: TCP
clusterIP: {{.ClusterIP}}
clusterIP: '{{.ClusterIP}}'
selector:
dns.operator.openshift.io/daemonset-dns: default
metadata:
Expand Down
2 changes: 1 addition & 1 deletion assets/components/openshift-router/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ spec:
- mountPath: /var/run/configmaps/service-ca
name: service-ca-bundle
readOnly: true
image: {{ .ReleaseImage.haproxy_router }}
image: '{{ .ReleaseImage.haproxy_router }}'
ports:
- name: http
containerPort: 80
Expand Down
6 changes: 3 additions & 3 deletions assets/components/service-ca/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
serviceAccountName: service-ca
containers:
- name: service-ca-controller
image: {{ .ReleaseImage.service_ca_operator }}
image: '{{ .ReleaseImage.service_ca_operator }}'
imagePullPolicy: IfNotPresent
command: ["service-ca-operator", "controller"]
ports:
Expand All @@ -46,10 +46,10 @@ spec:
volumes:
- name: signing-key
secret:
secretName: {{.TLSSecret}}
secretName: '{{.TLSSecret}}'
- name: signing-cabundle
configMap:
name: {{.CAConfigMap}}
name: '{{.CAConfigMap}}'
nodeSelector:
node-role.kubernetes.io/master: ""
priorityClassName: "system-cluster-critical"
Expand Down
8 changes: 4 additions & 4 deletions assets/release/release-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"release": {
"base": "4.13.0-0.nightly-arm64-2023-02-08-182807"
"base": "4.13.0-0.nightly-arm64-2023-02-14-014641"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a3f2aeab14f3819746aed14b508d78813a31be3f0fd1a4df5f1856c136509ebf",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07beaae8b400588948e1ff17240ea33a18a90fdc57aa39ad44f7aa25062c35e3",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b724ceae9beb0c03742ae176a8e99d1c5c54ab8a3c74e96a5638ef4246269703",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d591fd301c4af55e94e7ac63871c19feb8374428cc73607028fb08055626e2d1",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:16ba7ebb0d6129fe158bd66da6255ae77c0fa28c7293673da696224cf1728597",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc719b31695a0cef47943d4b6eb56c93e97b2d6dbb251a7f2cefbe34da802c3d",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:70768854bc132331a91fa03502b4d359ae367fd8ed70924869c3fa63a789cbf5",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:797de281835093960d495bfe5b174add9defd33271e5dcb40ced9c36bff74bc2",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fec9d55f90d23435514e8edb03521096e2b3f6e01f7b55c45a27c0835d5afe66",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5c0ca408a898e6acbc649a0473b1ea83aa7dc5fed305a3562100734243a0c9e8",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:a4319ff7c736ca9fe20500dc3e5862d6bb446f2428ea2eadfb5f042195f4f860",
Expand Down
8 changes: 4 additions & 4 deletions assets/release/release-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"release": {
"base": "4.13.0-0.nightly-2023-02-07-064924"
"base": "4.13.0-0.nightly-2023-02-13-194759"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:23a6b4c13b2610e9bed8205d59acea8a30e8503948633d7a02cc6a45e431b7d3",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31b8a600e8388e9e87197639e73a49da0f06f75fe67e702c8681ac83538919ad",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a3da42cc691d4d4fd293862a3036cd58a57001154468cd0b0a8a6e22aa9e5b7",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ed079be59e5686a18e2a86e3f0e093a63f2ba0493c62e651e742130200bf887",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec61024e2c37e5aba93593220b12ba91a3ba4f547b2562a36539ff1d9df74a23",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e21569ba6b2da124a92e516e50982d42c0942007dbe217570ee84ffcbca0cef0",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e7bbc5e71123aaa1c0f30197d61921306833eb6149ad874e41e09e76a50f451",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a7a419fee8663d69e992e930b32907766f869a9b294e9a009d54c5734e3f4ae",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:669a34ecb28ab5e515ad5e19bb53132eb54588af7282a33d5f54c6112ad42feb",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c14f0342eebce36041f0904e2a4bcccd933d51c036d9319caeb19e656cf0a350",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:a4319ff7c736ca9fe20500dc3e5862d6bb446f2428ea2eadfb5f042195f4f860",
Expand Down
Loading