* Delete jenkinsimages CRDs, old Jenkins CRD and CR and OpenShift Jenkins CR * Delete old, olm-related manifests * Delete Operator manifests that are covered by all-in-one
This commit is contained in:
parent
b3a4a6ca80
commit
b1a388b6d6
|
|
@ -1,85 +0,0 @@
|
||||||
apiVersion: apiextensions.k8s.io/v1beta1
|
|
||||||
kind: CustomResourceDefinition
|
|
||||||
metadata:
|
|
||||||
name: jenkinsimages.jenkins.io
|
|
||||||
spec:
|
|
||||||
group: jenkins.io
|
|
||||||
names:
|
|
||||||
kind: JenkinsImage
|
|
||||||
listKind: JenkinsImageList
|
|
||||||
plural: jenkinsimages
|
|
||||||
singular: jenkinsimage
|
|
||||||
scope: Namespaced
|
|
||||||
subresources:
|
|
||||||
status: {}
|
|
||||||
validation:
|
|
||||||
openAPIV3Schema:
|
|
||||||
description: JenkinsImage is the Schema for the jenkinsimages API
|
|
||||||
properties:
|
|
||||||
apiVersion:
|
|
||||||
description: 'APIVersion defines the versioned schema of this representation
|
|
||||||
of an object. Servers should convert recognized schemas to the latest
|
|
||||||
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
|
|
||||||
type: string
|
|
||||||
kind:
|
|
||||||
description: 'Kind is a string value representing the REST resource this
|
|
||||||
object represents. Servers may infer this from the endpoint the client
|
|
||||||
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
|
|
||||||
type: string
|
|
||||||
metadata:
|
|
||||||
type: object
|
|
||||||
spec:
|
|
||||||
description: JenkinsImageSpec defines the desired state of JenkinsImage
|
|
||||||
properties:
|
|
||||||
image:
|
|
||||||
description: Defines Jenkins Plugin structure
|
|
||||||
properties:
|
|
||||||
name:
|
|
||||||
type: string
|
|
||||||
version:
|
|
||||||
type: string
|
|
||||||
required:
|
|
||||||
- name
|
|
||||||
type: object
|
|
||||||
plugins:
|
|
||||||
items:
|
|
||||||
description: Defines Jenkins Plugin structure
|
|
||||||
properties:
|
|
||||||
name:
|
|
||||||
type: string
|
|
||||||
version:
|
|
||||||
type: string
|
|
||||||
required:
|
|
||||||
- name
|
|
||||||
type: object
|
|
||||||
type: array
|
|
||||||
required:
|
|
||||||
- image
|
|
||||||
- plugins
|
|
||||||
type: object
|
|
||||||
status:
|
|
||||||
description: JenkinsImageStatus defines the observed state of JenkinsImage
|
|
||||||
properties:
|
|
||||||
image:
|
|
||||||
type: string
|
|
||||||
installedPlugins:
|
|
||||||
items:
|
|
||||||
description: Defines Jenkins Plugin structure
|
|
||||||
properties:
|
|
||||||
name:
|
|
||||||
type: string
|
|
||||||
version:
|
|
||||||
type: string
|
|
||||||
required:
|
|
||||||
- name
|
|
||||||
type: object
|
|
||||||
type: array
|
|
||||||
md5sum:
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
type: object
|
|
||||||
version: v1alpha2
|
|
||||||
versions:
|
|
||||||
- name: v1alpha2
|
|
||||||
served: true
|
|
||||||
storage: true
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
apiVersion: jenkins.io/v1alpha2
|
|
||||||
kind: Jenkins
|
|
||||||
metadata:
|
|
||||||
name: example
|
|
||||||
spec:
|
|
||||||
master:
|
|
||||||
containers:
|
|
||||||
- name: jenkins-master
|
|
||||||
image: jenkins/jenkins:2.277.4-lts-alpine
|
|
||||||
seedJobs:
|
|
||||||
- id: jenkins-operator
|
|
||||||
targets: "cicd/jobs/*.jenkins"
|
|
||||||
description: "Jenkins Operator repository"
|
|
||||||
repositoryBranch: master
|
|
||||||
repositoryUrl: https://github.com/jenkinsci/kubernetes-operator.git
|
|
||||||
|
|
@ -1,106 +0,0 @@
|
||||||
apiVersion: apiextensions.k8s.io/v1beta1
|
|
||||||
kind: CustomResourceDefinition
|
|
||||||
metadata:
|
|
||||||
name: jenkins.jenkins.io
|
|
||||||
spec:
|
|
||||||
group: jenkins.io
|
|
||||||
names:
|
|
||||||
kind: Jenkins
|
|
||||||
listKind: JenkinsList
|
|
||||||
plural: jenkins
|
|
||||||
singular: jenkins
|
|
||||||
scope: Namespaced
|
|
||||||
versions:
|
|
||||||
- name : v1alpha2
|
|
||||||
served: true
|
|
||||||
storage: true
|
|
||||||
- name : v1alpha1
|
|
||||||
served: true
|
|
||||||
storage: false
|
|
||||||
---
|
|
||||||
apiVersion: apiextensions.k8s.io/v1beta1
|
|
||||||
kind: CustomResourceDefinition
|
|
||||||
metadata:
|
|
||||||
name: jenkinsimages.jenkins.io
|
|
||||||
spec:
|
|
||||||
group: jenkins.io
|
|
||||||
names:
|
|
||||||
kind: JenkinsImage
|
|
||||||
listKind: JenkinsImageList
|
|
||||||
plural: jenkinsimages
|
|
||||||
singular: jenkinsimage
|
|
||||||
scope: Namespaced
|
|
||||||
subresources:
|
|
||||||
status: {}
|
|
||||||
validation:
|
|
||||||
openAPIV3Schema:
|
|
||||||
description: JenkinsImage is the Schema for the jenkinsimages API
|
|
||||||
properties:
|
|
||||||
apiVersion:
|
|
||||||
description: 'APIVersion defines the versioned schema of this representation
|
|
||||||
of an object. Servers should convert recognized schemas to the latest
|
|
||||||
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
|
|
||||||
type: string
|
|
||||||
kind:
|
|
||||||
description: 'Kind is a string value representing the REST resource this
|
|
||||||
object represents. Servers may infer this from the endpoint the client
|
|
||||||
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
|
|
||||||
type: string
|
|
||||||
metadata:
|
|
||||||
type: object
|
|
||||||
spec:
|
|
||||||
description: JenkinsImageSpec defines the desired state of JenkinsImage
|
|
||||||
properties:
|
|
||||||
image:
|
|
||||||
description: Defines Jenkins Plugin structure
|
|
||||||
properties:
|
|
||||||
name:
|
|
||||||
type: string
|
|
||||||
version:
|
|
||||||
type: string
|
|
||||||
required:
|
|
||||||
- name
|
|
||||||
type: object
|
|
||||||
plugins:
|
|
||||||
items:
|
|
||||||
description: Defines Jenkins Plugin structure
|
|
||||||
properties:
|
|
||||||
name:
|
|
||||||
type: string
|
|
||||||
version:
|
|
||||||
type: string
|
|
||||||
required:
|
|
||||||
- name
|
|
||||||
type: object
|
|
||||||
type: array
|
|
||||||
required:
|
|
||||||
- image
|
|
||||||
- plugins
|
|
||||||
type: object
|
|
||||||
status:
|
|
||||||
description: JenkinsImageStatus defines the observed state of JenkinsImage
|
|
||||||
properties:
|
|
||||||
image:
|
|
||||||
type: string
|
|
||||||
installedPlugins:
|
|
||||||
items:
|
|
||||||
description: Defines Jenkins Plugin structure
|
|
||||||
properties:
|
|
||||||
name:
|
|
||||||
type: string
|
|
||||||
version:
|
|
||||||
type: string
|
|
||||||
required:
|
|
||||||
- name
|
|
||||||
type: object
|
|
||||||
type: array
|
|
||||||
md5sum:
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
type: object
|
|
||||||
version: v1alpha2
|
|
||||||
versions:
|
|
||||||
- name: v1alpha2
|
|
||||||
served: true
|
|
||||||
storage: true
|
|
||||||
|
|
||||||
|
|
@ -1,85 +0,0 @@
|
||||||
apiVersion: apiextensions.k8s.io/v1beta1
|
|
||||||
kind: CustomResourceDefinition
|
|
||||||
metadata:
|
|
||||||
name: jenkinsimages.jenkins.io
|
|
||||||
spec:
|
|
||||||
group: jenkins.io
|
|
||||||
names:
|
|
||||||
kind: JenkinsImage
|
|
||||||
listKind: JenkinsImageList
|
|
||||||
plural: jenkinsimages
|
|
||||||
singular: jenkinsimage
|
|
||||||
scope: Namespaced
|
|
||||||
subresources:
|
|
||||||
status: {}
|
|
||||||
validation:
|
|
||||||
openAPIV3Schema:
|
|
||||||
description: JenkinsImage is the Schema for the jenkinsimages API
|
|
||||||
properties:
|
|
||||||
apiVersion:
|
|
||||||
description: 'APIVersion defines the versioned schema of this representation
|
|
||||||
of an object. Servers should convert recognized schemas to the latest
|
|
||||||
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
|
|
||||||
type: string
|
|
||||||
kind:
|
|
||||||
description: 'Kind is a string value representing the REST resource this
|
|
||||||
object represents. Servers may infer this from the endpoint the client
|
|
||||||
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
|
|
||||||
type: string
|
|
||||||
metadata:
|
|
||||||
type: object
|
|
||||||
spec:
|
|
||||||
description: JenkinsImageSpec defines the desired state of JenkinsImage
|
|
||||||
properties:
|
|
||||||
image:
|
|
||||||
description: Defines Jenkins Plugin structure
|
|
||||||
properties:
|
|
||||||
name:
|
|
||||||
type: string
|
|
||||||
version:
|
|
||||||
type: string
|
|
||||||
required:
|
|
||||||
- name
|
|
||||||
type: object
|
|
||||||
plugins:
|
|
||||||
items:
|
|
||||||
description: Defines Jenkins Plugin structure
|
|
||||||
properties:
|
|
||||||
name:
|
|
||||||
type: string
|
|
||||||
version:
|
|
||||||
type: string
|
|
||||||
required:
|
|
||||||
- name
|
|
||||||
type: object
|
|
||||||
type: array
|
|
||||||
required:
|
|
||||||
- image
|
|
||||||
- plugins
|
|
||||||
type: object
|
|
||||||
status:
|
|
||||||
description: JenkinsImageStatus defines the observed state of JenkinsImage
|
|
||||||
properties:
|
|
||||||
image:
|
|
||||||
type: string
|
|
||||||
installedPlugins:
|
|
||||||
items:
|
|
||||||
description: Defines Jenkins Plugin structure
|
|
||||||
properties:
|
|
||||||
name:
|
|
||||||
type: string
|
|
||||||
version:
|
|
||||||
type: string
|
|
||||||
required:
|
|
||||||
- name
|
|
||||||
type: object
|
|
||||||
type: array
|
|
||||||
md5sum:
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
type: object
|
|
||||||
version: v1alpha2
|
|
||||||
versions:
|
|
||||||
- name: v1alpha2
|
|
||||||
served: true
|
|
||||||
storage: true
|
|
||||||
|
|
@ -1,72 +0,0 @@
|
||||||
apiVersion: jenkins.io/v1alpha2
|
|
||||||
kind: Jenkins
|
|
||||||
metadata:
|
|
||||||
annotations:
|
|
||||||
jenkins.io/openshift-mode: 'true'
|
|
||||||
name: jenkins
|
|
||||||
spec:
|
|
||||||
master:
|
|
||||||
containers:
|
|
||||||
- name: jenkins-master
|
|
||||||
command:
|
|
||||||
- /usr/bin/go-init
|
|
||||||
- '-main'
|
|
||||||
- /usr/libexec/s2i/run
|
|
||||||
env:
|
|
||||||
- name: OPENSHIFT_ENABLE_OAUTH
|
|
||||||
value: 'true'
|
|
||||||
- name: OPENSHIFT_ENABLE_REDIRECT_PROMPT
|
|
||||||
value: 'true'
|
|
||||||
- name: DISABLE_ADMINISTRATIVE_MONITORS
|
|
||||||
value: 'false'
|
|
||||||
- name: KUBERNETES_MASTER
|
|
||||||
value: 'https://kubernetes.default:443'
|
|
||||||
- name: KUBERNETES_TRUST_CERTIFICATES
|
|
||||||
value: 'true'
|
|
||||||
- name: JENKINS_SERVICE_NAME
|
|
||||||
value: jenkins-operator-http-jenkins
|
|
||||||
- name: JNLP_SERVICE_NAME
|
|
||||||
value: jenkins-operator-slave-jenkins
|
|
||||||
- name: JENKINS_UC_INSECURE
|
|
||||||
value: 'false'
|
|
||||||
- name: JENKINS_HOME
|
|
||||||
value: /var/lib/jenkins
|
|
||||||
- name: JAVA_OPTS
|
|
||||||
value: >-
|
|
||||||
-XX:MinRAMPercentage=50.0 -XX:MaxRAMPercentage=80.0
|
|
||||||
-Djenkins.install.runSetupWizard=false -Djava.awt.headless=true
|
|
||||||
image: 'quay.io/openshift/origin-jenkins:latest'
|
|
||||||
imagePullPolicy: Always
|
|
||||||
livenessProbe:
|
|
||||||
httpGet:
|
|
||||||
path: /login
|
|
||||||
port: 8080
|
|
||||||
scheme: HTTP
|
|
||||||
initialDelaySeconds: 420
|
|
||||||
periodSeconds: 360
|
|
||||||
timeoutSeconds: 240
|
|
||||||
readinessProbe:
|
|
||||||
httpGet:
|
|
||||||
path: /login
|
|
||||||
port: 8080
|
|
||||||
scheme: HTTP
|
|
||||||
initialDelaySeconds: 3
|
|
||||||
periodSeconds: 0
|
|
||||||
timeoutSeconds: 240
|
|
||||||
resources:
|
|
||||||
limits:
|
|
||||||
cpu: 600m
|
|
||||||
memory: 4Gi
|
|
||||||
requests:
|
|
||||||
cpu: 500m
|
|
||||||
memory: 3Gi
|
|
||||||
service:
|
|
||||||
port: 8080
|
|
||||||
type: ClusterIP
|
|
||||||
slaveService:
|
|
||||||
port: 50000
|
|
||||||
type: ClusterIP
|
|
||||||
serviceAccount:
|
|
||||||
annotations:
|
|
||||||
serviceaccounts.openshift.io/oauth-redirectreference.jenkins: '{"kind":"OAuthRedirectReference","apiVersion":"v1","reference":{"kind":"Route","name":"jenkins-operator"}}'
|
|
||||||
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -1,20 +0,0 @@
|
||||||
apiVersion: apiextensions.k8s.io/v1beta1
|
|
||||||
kind: CustomResourceDefinition
|
|
||||||
metadata:
|
|
||||||
name: jenkins.jenkins.io
|
|
||||||
spec:
|
|
||||||
group: jenkins.io
|
|
||||||
names:
|
|
||||||
kind: Jenkins
|
|
||||||
listKind: JenkinsList
|
|
||||||
plural: jenkins
|
|
||||||
singular: jenkins
|
|
||||||
scope: Namespaced
|
|
||||||
version: v1alpha2
|
|
||||||
versions:
|
|
||||||
- name : v1alpha2
|
|
||||||
served: true
|
|
||||||
storage: true
|
|
||||||
- name : v1alpha1
|
|
||||||
served: true
|
|
||||||
storage: false
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -1,20 +0,0 @@
|
||||||
apiVersion: apiextensions.k8s.io/v1beta1
|
|
||||||
kind: CustomResourceDefinition
|
|
||||||
metadata:
|
|
||||||
name: jenkins.jenkins.io
|
|
||||||
spec:
|
|
||||||
group: jenkins.io
|
|
||||||
names:
|
|
||||||
kind: Jenkins
|
|
||||||
listKind: JenkinsList
|
|
||||||
plural: jenkins
|
|
||||||
singular: jenkins
|
|
||||||
scope: Namespaced
|
|
||||||
version: v1alpha2
|
|
||||||
versions:
|
|
||||||
- name : v1alpha2
|
|
||||||
served: true
|
|
||||||
storage: true
|
|
||||||
- name : v1alpha1
|
|
||||||
served: true
|
|
||||||
storage: false
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
channels:
|
|
||||||
- currentCSV: jenkins-operator.v0.3.0
|
|
||||||
name: alpha
|
|
||||||
defaultChannel: alpha
|
|
||||||
packageName: jenkins-operator
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
---
|
|
||||||
apiVersion: apps/v1
|
|
||||||
kind: Deployment
|
|
||||||
metadata:
|
|
||||||
name: jenkins-operator
|
|
||||||
spec:
|
|
||||||
replicas: 1
|
|
||||||
selector:
|
|
||||||
matchLabels:
|
|
||||||
name: jenkins-operator
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
name: jenkins-operator
|
|
||||||
spec:
|
|
||||||
serviceAccountName: jenkins-operator
|
|
||||||
containers:
|
|
||||||
- name: jenkins-operator
|
|
||||||
image: virtuslab/jenkins-operator:v0.6.0
|
|
||||||
command:
|
|
||||||
- jenkins-operator
|
|
||||||
args: []
|
|
||||||
imagePullPolicy: IfNotPresent
|
|
||||||
env:
|
|
||||||
- name: WATCH_NAMESPACE
|
|
||||||
valueFrom:
|
|
||||||
fieldRef:
|
|
||||||
fieldPath: metadata.namespace
|
|
||||||
- name: POD_NAME
|
|
||||||
valueFrom:
|
|
||||||
fieldRef:
|
|
||||||
fieldPath: metadata.name
|
|
||||||
- name: OPERATOR_NAME
|
|
||||||
value: "jenkins-operator"
|
|
||||||
117
deploy/role.yaml
117
deploy/role.yaml
|
|
@ -1,117 +0,0 @@
|
||||||
---
|
|
||||||
kind: Role
|
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
|
||||||
metadata:
|
|
||||||
name: jenkins-operator
|
|
||||||
rules:
|
|
||||||
- apiGroups:
|
|
||||||
- ""
|
|
||||||
resources:
|
|
||||||
- services
|
|
||||||
- configmaps
|
|
||||||
- secrets
|
|
||||||
- serviceaccounts
|
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- create
|
|
||||||
- update
|
|
||||||
- list
|
|
||||||
- watch
|
|
||||||
- apiGroups:
|
|
||||||
- apps
|
|
||||||
resources:
|
|
||||||
- deployments
|
|
||||||
- daemonsets
|
|
||||||
- replicasets
|
|
||||||
- statefulsets
|
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- rbac.authorization.k8s.io
|
|
||||||
resources:
|
|
||||||
- roles
|
|
||||||
- rolebindings
|
|
||||||
verbs:
|
|
||||||
- create
|
|
||||||
- update
|
|
||||||
- list
|
|
||||||
- watch
|
|
||||||
- apiGroups:
|
|
||||||
- ""
|
|
||||||
resources:
|
|
||||||
- pods/portforward
|
|
||||||
verbs:
|
|
||||||
- create
|
|
||||||
- apiGroups:
|
|
||||||
- ""
|
|
||||||
resources:
|
|
||||||
- pods/log
|
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- list
|
|
||||||
- watch
|
|
||||||
- apiGroups:
|
|
||||||
- ""
|
|
||||||
resources:
|
|
||||||
- pods
|
|
||||||
- pods/exec
|
|
||||||
verbs:
|
|
||||||
- "*"
|
|
||||||
- apiGroups:
|
|
||||||
- ""
|
|
||||||
resources:
|
|
||||||
- events
|
|
||||||
verbs:
|
|
||||||
- watch
|
|
||||||
- list
|
|
||||||
- create
|
|
||||||
- patch
|
|
||||||
- apiGroups:
|
|
||||||
- apps
|
|
||||||
resourceNames:
|
|
||||||
- jenkins-operator
|
|
||||||
resources:
|
|
||||||
- deployments/finalizers
|
|
||||||
verbs:
|
|
||||||
- update
|
|
||||||
- apiGroups:
|
|
||||||
- jenkins.io
|
|
||||||
resources:
|
|
||||||
- '*'
|
|
||||||
verbs:
|
|
||||||
- '*'
|
|
||||||
- apiGroups:
|
|
||||||
- ""
|
|
||||||
resources:
|
|
||||||
- persistentvolumeclaims
|
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- list
|
|
||||||
- watch
|
|
||||||
- apiGroups:
|
|
||||||
- "route.openshift.io"
|
|
||||||
resources:
|
|
||||||
- routes
|
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- list
|
|
||||||
- watch
|
|
||||||
- create
|
|
||||||
- update
|
|
||||||
- apiGroups:
|
|
||||||
- "image.openshift.io"
|
|
||||||
resources:
|
|
||||||
- imagestreams
|
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- list
|
|
||||||
- watch
|
|
||||||
- apiGroups:
|
|
||||||
- "build.openshift.io"
|
|
||||||
resources:
|
|
||||||
- builds
|
|
||||||
- buildconfigs
|
|
||||||
verbs:
|
|
||||||
- get
|
|
||||||
- list
|
|
||||||
- watch
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
---
|
|
||||||
kind: RoleBinding
|
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
|
||||||
metadata:
|
|
||||||
name: jenkins-operator
|
|
||||||
subjects:
|
|
||||||
- kind: ServiceAccount
|
|
||||||
name: jenkins-operator
|
|
||||||
roleRef:
|
|
||||||
kind: Role
|
|
||||||
name: jenkins-operator
|
|
||||||
apiGroup: rbac.authorization.k8s.io
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
---
|
|
||||||
apiVersion: v1
|
|
||||||
kind: ServiceAccount
|
|
||||||
metadata:
|
|
||||||
name: jenkins-operator
|
|
||||||
Loading…
Reference in New Issue